Renamed all Class relationships to reflect the Class names (instead of arbitrary names) where possible