mass renaming

I wasn't really liking the naming convention I had started using, so I
wanted to change it before I started doing anymore.