diff --git a/access_node/__main__.py b/access_node/__main__.py
index 0fcc2f6166dd2afeb94d9bee93e55c6deb5a46b7..755db6692045f65d2983710867185d894e17348c 100644
--- a/access_node/__main__.py
+++ b/access_node/__main__.py
@@ -12,7 +12,7 @@ import requests
 import psycopg2
 
 
-def SetupNestDB(postgres_username, postgres_password, port):
+def SetupNestTables(postgres_username, postgres_password, port):
 	con = psycopg2.connect(database="postgres", user=postgres_username,
                        password=postgres_password, host="database", port=str(port))
 	print("Database connection opened successfully!")
@@ -54,7 +54,7 @@ def SetupNestDB(postgres_username, postgres_password, port):
 
 def main():
 	# Connect to the Database and initalize basic Table structure
-	SetupNestDB('postgres', 'docker', 5432)
+	SetupNestTables('postgres', 'docker', 5432)
 
 	# get info node
 	with open('access_node//info_node.json', 'r') as f:
diff --git a/access_node/controllers/nest_controller.py b/access_node/controllers/nest_controller.py
index 17ec23efd0e33a7d4a0f061c2b81f273bbec7bd8..74de86e2adb6f596f9f7a92e1ac57212eea13cd8 100644
--- a/access_node/controllers/nest_controller.py
+++ b/access_node/controllers/nest_controller.py
@@ -188,15 +188,15 @@ def nest_get_neuron_properties(gids=None):  # noqa: E501
     properties = np.array(cur.fetchall())
     properties = np.delete(properties, [1,2], 1)
 
-    NestProps = []
+    nest_properties = []
     for k in range(len(properties[:,0])):
         props = {}
         id = properties[k,0]
         for i in range(1, len(colnames)):
             props.update({colnames[i]: properties[k,i]})
-        NestProps.extend(NestNeuronProperties(id, props))
+        nest_properties.extend(NestNeuronProperties(id, props))
 
-    return NestProps
+    return nest_properties
 
 
 def nest_get_populations():  # noqa: E501