Fixed incorrect error message text. Closes #791.
Big OAuth class and variable rename