Renaming some of the classes