Cleanup naming.