undo case changes in these files

I went overboard with changing strings to symbols and broke
a bunch of stuff. I dont know that this is a perfect solution
but it's a good direction.
fix tests to match updates to case changes

undoing some case changes also means undo changes
made to the tests.