Update OAuth types and etcd registry

It's a little picky, but how about having these mock objects keep up with the names instead of leaving them as relics of the past.