Renaming API classes