Naming changes for some classes