diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index cfa8692659d..b04f5b4ac37 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -1,4 +1,4 @@
-require 'gitlab/oauth/user'
+require 'gitlab/o_auth/user'
 
 # LDAP extension for User model
 #
diff --git a/lib/gitlab/oauth/auth_hash.rb b/lib/gitlab/o_auth/auth_hash.rb
similarity index 100%
rename from lib/gitlab/oauth/auth_hash.rb
rename to lib/gitlab/o_auth/auth_hash.rb
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/o_auth/user.rb
similarity index 100%
rename from lib/gitlab/oauth/user.rb
rename to lib/gitlab/o_auth/user.rb
diff --git a/spec/lib/gitlab/oauth/auth_hash_spec.rb b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
similarity index 100%
rename from spec/lib/gitlab/oauth/auth_hash_spec.rb
rename to spec/lib/gitlab/o_auth/auth_hash_spec.rb
diff --git a/spec/lib/gitlab/oauth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb
similarity index 100%
rename from spec/lib/gitlab/oauth/user_spec.rb
rename to spec/lib/gitlab/o_auth/user_spec.rb