Improve internal consistency of naming conventions.