Renamed classes

See the new naming conventions in readme file.