Merge "Current naming convention is uninformative."