Renamed classes to reflect project name