Revert "Merge pull request #2479"

This reverts commit c4c88036f88d74b90b68d217a8e1b0f9f988694b, reversing
changes made to 7893b99e37276119080acfd558d267862bc6c400.


This was a change nobody but the author wanted. The new names are awful, flavorless, and formatted improperly.