Rename packages appropriate to airlift