Renaming classes to be more indicative of what they are