Commit c9c41c7a used two different
naming patterns.  Standardize on the majority pattern, which was the
only pattern in the last reviewed version of that commit.