Clean up naming.