Clear up naming patterns and user verbs.