Renaming some classes so they make a little more sense