Updated to use new project names