Beginning to clean up naming in the Pocket OAuth authentication process

See commits for a rundown of changes