Seconda part of renaming classes