Clean up project names

Removing various inconsistencies accumulated over time.