Clean up name changes