Lion still offers Airport Utility for their own devices. However, looks like they have removed just the name "AirPort" for wi-fi access. I agree, stick with Airport or remove it altogether.
They are still using AirPort elsewhere, though. Either change everything to "Wi-Fi" or stick with AirPort.