Renamed project and fixed up function names.