diff --git a/coldfront/config/core.py b/coldfront/config/core.py
index 4d94def95..90e3501bb 100644
--- a/coldfront/config/core.py
+++ b/coldfront/config/core.py
@@ -36,9 +36,9 @@
 INACTIVE_ALLOCATION_STATUSES = ['Denied', 'Expired', 'Inactive', 'Pending Deactivation']
 
 # Categorization of project manager permissions
-MANAGERS = ['General Manager', 'Access Manager', 'Data Manager']
+MANAGERS = ['General Manager', 'Access Manager', 'Storage Manager']
 ACCESS_MANAGERS = ['General Manager', 'Access Manager']
-DATA_MANAGERS = ['General Manager', 'Data Manager']
+DATA_MANAGERS = ['General Manager', 'Storage Manager']
 
 #------------------------------------------------------------------------------
 # DjangoQ settings
diff --git a/coldfront/core/project/management/commands/add_default_project_choices.py b/coldfront/core/project/management/commands/add_default_project_choices.py
index 9254c1681..d1e0e3620 100644
--- a/coldfront/core/project/management/commands/add_default_project_choices.py
+++ b/coldfront/core/project/management/commands/add_default_project_choices.py
@@ -18,7 +18,7 @@ def handle(self, *args, **options):
         for choice in ['Completed', 'Pending', ]:
             ProjectReviewStatusChoice.objects.get_or_create(name=choice)
 
-        for choice in ['User', 'General Manager', 'Data Manager', 'Access Manager']:
+        for choice in ['User', 'General Manager', 'Storage Manager', 'Access Manager']:
             ProjectUserRoleChoice.objects.get_or_create(name=choice)
 
         for choice in ['Active', 'Pending - Add', 'Pending - Remove', 'Denied', 'Removed', ]:
diff --git a/coldfront/core/project/templates/project/project_user_detail.html b/coldfront/core/project/templates/project/project_user_detail.html
index 7c6ae8cb2..0005e1a4b 100644
--- a/coldfront/core/project/templates/project/project_user_detail.html
+++ b/coldfront/core/project/templates/project/project_user_detail.html
@@ -56,7 +56,7 @@ <h3>Project: {{project.title}}</h3>
               <td>{{project_user_update_form.role}}<br/><br/>
                 <b>Users</b> can view information about their project and the project's related allocations.<br/>
                 <b>Access Managers</b> have the permissions to manage group membership and permissions.<br/>
-                <b>Data Managers</b> have the permissions to make allocation requests.<br/>
+                <b>Storage Managers</b> have the permissions to make allocation requests.<br/>
                 <b>General Managers</b> have all the permissions of a PI.<br/>
                 <b>PIs</b> have permissions to manage the project and its related allocations, regardless of their assigned projectuser role.<br/>
               </td>
diff --git a/coldfront/core/project/utils.py b/coldfront/core/project/utils.py
index 836787f77..835593e50 100644
--- a/coldfront/core/project/utils.py
+++ b/coldfront/core/project/utils.py
@@ -16,7 +16,7 @@ def add_project_status_choices(apps, schema_editor):
 def add_project_user_role_choices(apps, schema_editor):
     ProjectUserRoleChoice = apps.get_model('project', 'ProjectUserRoleChoice')
 
-    for choice in ['User', 'Data Manager', 'General Manager', 'Access Manager']:
+    for choice in ['User', 'Storage Manager', 'General Manager', 'Access Manager']:
         ProjectUserRoleChoice.objects.get_or_create(name=choice)
 
 
diff --git a/coldfront/core/test_helpers/factories.py b/coldfront/core/test_helpers/factories.py
index ffb336ea8..cfd2d03da 100644
--- a/coldfront/core/test_helpers/factories.py
+++ b/coldfront/core/test_helpers/factories.py
@@ -40,7 +40,7 @@
 ### Default values and Faker provider setup ###
 
 project_status_choice_names = ['New', 'Active', 'Archived']
-project_user_role_choice_names = ['User', 'Access Manager', 'General Manager', 'Data Manager']
+project_user_role_choice_names = ['User', 'Access Manager', 'General Manager', 'Storage Manager']
 field_of_science_names = ['Physics', 'Chemistry', 'Economics', 'Biology', 'Sociology']
 attr_types = ['Date', 'Int', 'Float', 'Text', 'Boolean']
 
@@ -399,7 +399,7 @@ def setup_models(test_case):
 
     for user, role in {
         test_case.pi_user:'General Manager',
-        test_case.proj_datamanager: 'Data Manager',
+        test_case.proj_datamanager: 'Storage Manager',
         test_case.proj_accessmanager: 'Access Manager',
         test_case.proj_nonallocation_user: 'User',
     }.items():