diff --git a/spec/OAuth.spec.js b/spec/OAuth.spec.js
index 47e4349d..48f22ace 100644
--- a/spec/OAuth.spec.js
+++ b/spec/OAuth.spec.js
@@ -1,4 +1,4 @@
-var OAuth = require("../src/oauth/OAuth1Client");
+var OAuth = require("../src/authDataManager/OAuth1Client");
 var request = require('request');
 
 describe('OAuth', function() {
@@ -138,7 +138,7 @@ describe('OAuth', function() {
 
   ["facebook", "github", "instagram", "google", "linkedin", "meetup", "twitter"].map(function(providerName){
     it("Should validate structure of "+providerName, (done) => {
-      var provider = require("../src/oauth/"+providerName);
+      var provider = require("../src/authDataManager/"+providerName);
       jequal(typeof provider.validateAuthData, "function");
       jequal(typeof provider.validateAppId, "function");
       jequal(provider.validateAuthData({}, {}).constructor, Promise.prototype.constructor); 
diff --git a/spec/RestCreate.spec.js b/spec/RestCreate.spec.js
index f593e221..7af4e346 100644
--- a/spec/RestCreate.spec.js
+++ b/spec/RestCreate.spec.js
@@ -149,7 +149,7 @@ describe('rest create', () => {
   
   it('handles no anonymous users config', (done) => {
      var NoAnnonConfig = Object.assign({}, config);
-     NoAnnonConfig.oauth.setEnableAnonymousUsers(false);
+     NoAnnonConfig.authDataManager.setEnableAnonymousUsers(false);
      var data1 = {
       authData: {
         anonymous: {
diff --git a/spec/helper.js b/spec/helper.js
index 8ed9fe26..6c7c9414 100644
--- a/spec/helper.js
+++ b/spec/helper.js
@@ -5,7 +5,7 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 2000;
 var cache = require('../src/cache').default;
 var DatabaseAdapter = require('../src/DatabaseAdapter');
 var express = require('express');
-var facebook = require('../src/oauth/facebook');
+var facebook = require('../src/authDataManager/facebook');
 var ParseServer = require('../src/index').ParseServer;
 var path = require('path');
 
diff --git a/src/Config.js b/src/Config.js
index f65b17d7..e80c3b28 100644
--- a/src/Config.js
+++ b/src/Config.js
@@ -33,7 +33,7 @@ export class Config {
     this.pushController = cacheInfo.pushController;
     this.loggerController = cacheInfo.loggerController;
     this.userController = cacheInfo.userController;
-    this.oauth = cacheInfo.oauth;
+    this.authDataManager = cacheInfo.authDataManager;
     this.customPages = cacheInfo.customPages || {};
     this.mount = mount;
   }
diff --git a/src/RestWrite.js b/src/RestWrite.js
index b0719975..d51d61ad 100644
--- a/src/RestWrite.js
+++ b/src/RestWrite.js
@@ -231,7 +231,7 @@ RestWrite.prototype.handleOAuthAuthData = function(provider) {
     return;
   }
 
-  let validateAuthData = this.config.oauth.getValidatorForProvider(provider);
+  let validateAuthData = this.config.authDataManager.getValidatorForProvider(provider);
 
   if (!validateAuthData) {
     throw new Parse.Error(Parse.Error.UNSUPPORTED_SERVICE,
diff --git a/src/oauth/OAuth1Client.js b/src/authDataManager/OAuth1Client.js
similarity index 100%
rename from src/oauth/OAuth1Client.js
rename to src/authDataManager/OAuth1Client.js
diff --git a/src/oauth/facebook.js b/src/authDataManager/facebook.js
similarity index 100%
rename from src/oauth/facebook.js
rename to src/authDataManager/facebook.js
diff --git a/src/oauth/github.js b/src/authDataManager/github.js
similarity index 100%
rename from src/oauth/github.js
rename to src/authDataManager/github.js
diff --git a/src/oauth/google.js b/src/authDataManager/google.js
similarity index 100%
rename from src/oauth/google.js
rename to src/authDataManager/google.js
diff --git a/src/oauth/index.js b/src/authDataManager/index.js
similarity index 100%
rename from src/oauth/index.js
rename to src/authDataManager/index.js
diff --git a/src/oauth/instagram.js b/src/authDataManager/instagram.js
similarity index 100%
rename from src/oauth/instagram.js
rename to src/authDataManager/instagram.js
diff --git a/src/oauth/linkedin.js b/src/authDataManager/linkedin.js
similarity index 100%
rename from src/oauth/linkedin.js
rename to src/authDataManager/linkedin.js
diff --git a/src/oauth/meetup.js b/src/authDataManager/meetup.js
similarity index 100%
rename from src/oauth/meetup.js
rename to src/authDataManager/meetup.js
diff --git a/src/oauth/twitter.js b/src/authDataManager/twitter.js
similarity index 100%
rename from src/oauth/twitter.js
rename to src/authDataManager/twitter.js
diff --git a/src/index.js b/src/index.js
index 5c53a413..d496d161 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,7 +9,7 @@ var batch = require('./batch'),
     middlewares = require('./middlewares'),
     multer = require('multer'),
     Parse = require('parse/node').Parse,
-    oauthManager = require('./oauth');
+    authDataManager = require('./authDataManager');
 
 //import passwordReset           from './passwordReset';
 import cache                   from './cache';
@@ -165,7 +165,7 @@ function ParseServer({
     userController: userController,
     verifyUserEmails: verifyUserEmails,
     allowClientClassCreation: allowClientClassCreation,
-    oauth: oauthManager(oauth, enableAnonymousUsers),
+    authDataManager: authDataManager(oauth, enableAnonymousUsers),
     appName: appName,
     publicServerURL: publicServerURL,
     customPages: customPages,