renaming some classes