Changing a few name and also working on Third Party OAuth.