Cleans up naming conventions.