Revert "do a bunch of renaming"

This reverts commit 7133e124829b7aa12e35e7e0e18850cc294b7bb2.