Do a better job handling different project names