Merge "update classpath to point to new project names"