Renaming some classes