Renamed class for required syntax and cleaned up namespaces