Finished quick rebuild of project to fix issues caused by rename