Some renaming and stripping of APIs