Renamed classes to fit uppercase-style