Renaming classes to follow convension