IAP renaming and other stuff.