Clean up the names.