Renamed a bunch of stuff to have underscores