Clean up the names