Renamed Classes

Minor changes to naming of classes.