Renamed classes to new app name