Changed some vocabulary to be in sync with the revised OAuth spec.