fix casing and naming of classes for consistency