Tidy up project names and fix the build