fixed messed up names for class