Rename files, functions, and types. Oh my.

Changed the names of many things so that they will continue to make
sense going forward as the program expands.
Revert "Rename files, functions, and types. Oh my."

This reverts commit f465f2f9f190971d257bb9a1831b40f0c4a82500.