diff --git a/openstack_dashboard/dashboards/admin/info/tests.py b/openstack_dashboard/dashboards/admin/info/tests.py
index 45000cf6ec..2604a3aea6 100644
--- a/openstack_dashboard/dashboards/admin/info/tests.py
+++ b/openstack_dashboard/dashboards/admin/info/tests.py
@@ -73,7 +73,7 @@ class SystemInfoViewTests(test.BaseAdminViewTests):
              '<Service: metering>',
              '<Service: orchestration>',
              '<Service: database>',
-             '<Service: data_processing>', ])
+             '<Service: data-processing>', ])
 
         self.mox.VerifyAll()
 
diff --git a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/panel.py b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/panel.py
index b4ce2040c6..91f25b0b86 100644
--- a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/panel.py
@@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
 class ClusterTemplatesPanel(horizon.Panel):
     name = _("Cluster Templates")
     slug = 'data_processing.cluster_templates'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 
 dashboard.Project.register(ClusterTemplatesPanel)
diff --git a/openstack_dashboard/dashboards/project/data_processing/clusters/panel.py b/openstack_dashboard/dashboards/project/data_processing/clusters/panel.py
index 90c908e46c..9f125da4f6 100644
--- a/openstack_dashboard/dashboards/project/data_processing/clusters/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/clusters/panel.py
@@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
 class ClustersPanel(horizon.Panel):
     name = _("Clusters")
     slug = 'data_processing.clusters'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 
 dashboard.Project.register(ClustersPanel)
diff --git a/openstack_dashboard/dashboards/project/data_processing/data_image_registry/panel.py b/openstack_dashboard/dashboards/project/data_processing/data_image_registry/panel.py
index b2153d3e49..b4e51e4ec5 100644
--- a/openstack_dashboard/dashboards/project/data_processing/data_image_registry/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/data_image_registry/panel.py
@@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
 class ImageRegistryPanel(horizon.Panel):
     name = _("Image Registry")
     slug = 'data_processing.data_image_registry'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 
 dashboard.Project.register(ImageRegistryPanel)
diff --git a/openstack_dashboard/dashboards/project/data_processing/data_plugins/panel.py b/openstack_dashboard/dashboards/project/data_processing/data_plugins/panel.py
index c3ef6edb91..9554faf95d 100644
--- a/openstack_dashboard/dashboards/project/data_processing/data_plugins/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/data_plugins/panel.py
@@ -21,6 +21,6 @@ from openstack_dashboard.dashboards.project import dashboard
 class PluginsPanel(horizon.Panel):
     name = _("Plugins")
     slug = 'data_processing.data_plugins'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 dashboard.Project.register(PluginsPanel)
diff --git a/openstack_dashboard/dashboards/project/data_processing/data_sources/panel.py b/openstack_dashboard/dashboards/project/data_processing/data_sources/panel.py
index 8b3c532afa..c5d79c89cb 100644
--- a/openstack_dashboard/dashboards/project/data_processing/data_sources/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/data_sources/panel.py
@@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
 class DataSourcesPanel(horizon.Panel):
     name = _("Data Sources")
     slug = 'data_processing.data_sources'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 
 dashboard.Project.register(DataSourcesPanel)
diff --git a/openstack_dashboard/dashboards/project/data_processing/job_binaries/panel.py b/openstack_dashboard/dashboards/project/data_processing/job_binaries/panel.py
index bdbec37d1c..a66fead2b7 100644
--- a/openstack_dashboard/dashboards/project/data_processing/job_binaries/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/job_binaries/panel.py
@@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
 class JobBinariesPanel(horizon.Panel):
     name = _("Job Binaries")
     slug = 'data_processing.job_binaries'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 
 dashboard.Project.register(JobBinariesPanel)
diff --git a/openstack_dashboard/dashboards/project/data_processing/job_executions/panel.py b/openstack_dashboard/dashboards/project/data_processing/job_executions/panel.py
index db34b8daa0..9b861b12f9 100644
--- a/openstack_dashboard/dashboards/project/data_processing/job_executions/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/job_executions/panel.py
@@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
 class JobExecutionsPanel(horizon.Panel):
     name = _("Job Executions")
     slug = 'data_processing.job_executions'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 
 dashboard.Project.register(JobExecutionsPanel)
diff --git a/openstack_dashboard/dashboards/project/data_processing/jobs/panel.py b/openstack_dashboard/dashboards/project/data_processing/jobs/panel.py
index d56d896f75..861a90a876 100644
--- a/openstack_dashboard/dashboards/project/data_processing/jobs/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/jobs/panel.py
@@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
 class JobsPanel(horizon.Panel):
     name = _("Jobs")
     slug = 'data_processing.jobs'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 
 dashboard.Project.register(JobsPanel)
diff --git a/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/panel.py b/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/panel.py
index 6f0e54414d..c3f31576af 100644
--- a/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/panel.py
+++ b/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/panel.py
@@ -21,7 +21,7 @@ from openstack_dashboard.dashboards.project import dashboard
 class NodegroupTemplatesPanel(horizon.Panel):
     name = _("Node Group Templates")
     slug = 'data_processing.nodegroup_templates'
-    permissions = ('openstack.services.data_processing',)
+    permissions = ('openstack.services.data-processing',)
 
 
 dashboard.Project.register(NodegroupTemplatesPanel)
diff --git a/openstack_dashboard/test/api_tests/base_tests.py b/openstack_dashboard/test/api_tests/base_tests.py
index 3481041031..a037e8af82 100644
--- a/openstack_dashboard/test/api_tests/base_tests.py
+++ b/openstack_dashboard/test/api_tests/base_tests.py
@@ -157,7 +157,7 @@ class ApiVersionTests(test.TestCase):
         super(ApiVersionTests, self).setUp()
         self.previous_settings = settings.OPENSTACK_API_VERSIONS
         settings.OPENSTACK_API_VERSIONS = {
-            "data_processing": 1.1,
+            "data-processing": 1.1,
             "identity": "2.0",
             "volume": 1
         }
diff --git a/openstack_dashboard/test/test_data/keystone_data.py b/openstack_dashboard/test/test_data/keystone_data.py
index 17b435d31d..82450384f3 100644
--- a/openstack_dashboard/test/test_data/keystone_data.py
+++ b/openstack_dashboard/test/test_data/keystone_data.py
@@ -136,7 +136,7 @@ SERVICE_CATALOG = [
           "adminURL": "http://admin.trove.example.com:8779/v1.0",
           "publicURL": "http://public.trove.example.com:8779/v1.0",
           "internalURL": "http://int.trove.example.com:8779/v1.0"}]},
-    {"type": "data_processing",
+    {"type": "data-processing",
      "name": "Sahara",
      "endpoints_links": [],
      "endpoints": [