Clean up names