diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index c2ad38a1ca..6e59e9cbd0 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -187,7 +187,7 @@ class ProjectTeam
           # group access is developers we need to provide
           # both group master, developers as devs
           if int_level == group_link.group_access
-            im.where("group_access >= ?)", group_link.group_access)
+            im.where("access_level >= ?)", group_link.group_access)
           else
             im.send(level)
           end
diff --git a/app/services/ldap_group_reset_service.rb b/app/services/ldap_group_reset_service.rb
index bb64e7410c..c54da103e5 100644
--- a/app/services/ldap_group_reset_service.rb
+++ b/app/services/ldap_group_reset_service.rb
@@ -8,7 +8,7 @@ class LdapGroupResetService
     a = group.members.with_ldap_dn.map do |member|
       # don't unauthorize the current user
       next if current_user == member.user
-      member.update_attribute :group_access, Gitlab::Access::GUEST
+      member.update_attribute :access_level, Gitlab::Access::GUEST
     end
 
     group.users.ldap.update_all last_credential_check_at: nil
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index cc7eddeb96..be5014ea1e 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -151,7 +151,7 @@ module Gitlab
       # Get the group_access for a give user.
       # Always respect the current level, never downgrade it.
       def fetch_group_access(group, user, active_group_links)
-        current_access_level = group.users_groups.where(user_id: user).maximum(:group_access)
+        current_access_level = group.group_members.where(user_id: user).maximum(:access_level)
         max_group_access_level = active_group_links.maximum(:group_access)
 
         # TODO: Test if nil value of current_access_level in handled properly
diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb
index ec03352341..27983a23c5 100644
--- a/spec/lib/gitlab/ldap/access_spec.rb
+++ b/spec/lib/gitlab/ldap/access_spec.rb
@@ -258,7 +258,7 @@ objectclass: posixGroup
 
     context "existing access as guest for group-1, allowed via ldap-group1 as DEVELOPER" do
       before do
-        gitlab_group_1.users_groups.guests.create(user_id: user.id)
+        gitlab_group_1.group_members.guests.create(user_id: user.id)
         gitlab_group_1.ldap_group_links.create cn: 'ldap-group1', group_access: Gitlab::Access::MASTER
       end
 
@@ -270,7 +270,7 @@ objectclass: posixGroup
 
     context "existing access as MASTER for group-1, allowed via ldap-group1 as DEVELOPER" do
       before do
-        gitlab_group_1.users_groups.masters.create(user_id: user.id)
+        gitlab_group_1.group_members.masters.create(user_id: user.id)
         gitlab_group_1.ldap_group_links.create cn: 'ldap-group1', group_access: Gitlab::Access::DEVELOPER
       end
 
@@ -282,7 +282,7 @@ objectclass: posixGroup
 
     context "existing access as master for group-1, not allowed" do
       before do
-        gitlab_group_1.users_groups.masters.create(user_id: user.id)
+        gitlab_group_1.group_members.masters.create(user_id: user.id)
         gitlab_group_1.ldap_group_links.create cn: 'ldap-group1', group_access: Gitlab::Access::MASTER
         access.stub(cns_with_access: ['ldap-group2'])
       end
diff --git a/spec/services/ldap_group_reset_service_spec.rb b/spec/services/ldap_group_reset_service_spec.rb
index 496cbbd939..133b532b43 100644
--- a/spec/services/ldap_group_reset_service_spec.rb
+++ b/spec/services/ldap_group_reset_service_spec.rb
@@ -37,6 +37,6 @@ describe LdapGroupResetService do
   end
 
   def member_access(user)
-    group.members.find_by(user_id: user).group_access
+    group.members.find_by(user_id: user).access_level
   end
 end