diff --git a/bin/get_admins.py b/bin/get_admins.py
index b30a418..88586ac 100755
--- a/bin/get_admins.py
+++ b/bin/get_admins.py
@@ -3,7 +3,7 @@
 # For description and usage, see the argparse options at the end of the file
 
 from ldap3 import Server, Connection, ALL
-from get_roles import get_roles, get_roles_of_one_server
+from get_roles import get_roles, get_roles_of_one_minion
 import argparse
 import os
 import sys
@@ -25,12 +25,12 @@ def get_admins_of_a_role(admins, role):
         return results
 
     for sls in os.listdir('pillar/id'):
-        server = sls.split('_')[0]
-        roles = get_roles_of_one_server(server)
+        minion = sls.split('_')[0]
+        roles = get_roles_of_one_minion(minion)
         if role in roles:
             for member in members:
                 results[member] = admins[member]
-                results[member]['roles'].append('%s (%s)' % (server, role))
+                results[member]['roles'].append('%s (%s)' % (minion, role))
 
     return results
 
@@ -39,7 +39,7 @@ def get_admins_of_a_server(admins, server):
     results = {}
 
     try:
-        roles = get_roles_of_one_server(server)
+        roles = get_roles_of_one_minion(server)
     except FileNotFoundError:
         print('Server not found')
         sys.exit(1)
diff --git a/bin/get_roles.py b/bin/get_roles.py
index b980fd9..b88512b 100755
--- a/bin/get_roles.py
+++ b/bin/get_roles.py
@@ -20,10 +20,10 @@ def read_file_skip_jinja(filename):
     return '\n'.join(non_jinja_lines)
 
 
-def get_roles_of_one_server(server):
-    if not server.endswith('_infra_opensuse_org.sls'):
-        server += '_infra_opensuse_org.sls'
-    content = read_file_skip_jinja("pillar/id/%s" % server)
+def get_roles_of_one_minion(minion):
+    if not minion.endswith('_infra_opensuse_org.sls'):
+        minion += '_infra_opensuse_org.sls'
+    content = read_file_skip_jinja("pillar/id/%s" % minion)
     try:
         roles = yaml.load(content)['grains']['roles']
     except KeyError:
@@ -36,7 +36,7 @@ def get_roles(append=[]):
     roles = copy(append)
 
     for sls in os.listdir('pillar/id'):
-        _roles = get_roles_of_one_server(sls)
+        _roles = get_roles_of_one_minion(sls)
         for item in _roles:
             roles.append(item)
 
diff --git a/bin/test_roles.py b/bin/test_roles.py
index 5a3532a..16d863b 100755
--- a/bin/test_roles.py
+++ b/bin/test_roles.py
@@ -9,7 +9,7 @@
 
 import os
 import sys
-from get_roles import get_roles, get_roles_of_one_server
+from get_roles import get_roles, get_roles_of_one_minion
 
 status = 0
 special_roles = ['base', 'web']
@@ -32,7 +32,7 @@ roles = get_roles()
 for special_role in special_roles:
     if special_role in roles:
         for sls in os.listdir('pillar/id/'):
-            _roles = get_roles_of_one_server(sls)
+            _roles = get_roles_of_one_minion(sls)
             if special_role in _roles:
                 print('%s role should not be included in pillar/id/%s file' % (special_role, sls))
                 status = 1