Adjusted names of classes to make more sense