Renamed some classes to be more compliant and more rules of compliance.