renaming some classes properly