Clean up names of projects so they import properly into Eclipse