Cleanup naming conventions.