Revert "Revert "Rename files, functions, and types. Oh my.""

This reverts commit ff04d7c0bebe43e9dbcbfa76fe38023a1c1dc5b4.