Renamed a bunch of stuff to reflect the addition of OAuth2