Renaming classes to make more sense