Renaming some more classes