Renamed classes to make them java-style