Revert some names to Haskell-unapproved snake_case