Rename base classes and files