Changed names of the classes to more "professional" names