Renamed stuff to reflect project name