diff --git a/roles/openshift-apps/distgit-bugzilla-sync/files/cron.yml b/roles/openshift-apps/distgit-bugzilla-sync/files/cron.yml
index 916d49cb90..88435ccb9b 100644
--- a/roles/openshift-apps/distgit-bugzilla-sync/files/cron.yml
+++ b/roles/openshift-apps/distgit-bugzilla-sync/files/cron.yml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
-  name: distgit_bugzilla_sync
+  name: distgit-bugzilla-sync
 spec:
   successfulJobsHistoryLimit: 3
   failedJobsHistoryLimit: 1
@@ -12,19 +12,19 @@ spec:
       template:
         metadata:
           labels:
-            parent: "cronjobdistgit_bugzilla_sync"
+            parent: "cronjobdistgit-bugzilla-sync"
         spec:
           containers:
-          - name: distgit_bugzilla_sync
-            image: docker-registry.default.svc:5000/distgit_bugzilla_sync/mdapi:latest
+          - name: distgit-bugzilla-sync
+            image: docker-registry.default.svc:5000/distgit-bugzilla-sync/mdapi:latest
             command: ["distgit-bugzilla-sync --verbose --no-user-notifications"]
             volumeMounts:
             - name: config-volume
-              mountPath: /etc/distgit_bugzilla_sync
+              mountPath: /etc/distgit-bugzilla-sync
               readOnly: true
           restartPolicy: Never
           volumes:
           - name: config-volume
             configMap:
                 defaultMode: 420
-                name: distgit_bugzilla_sync-configmap
+                name: distgit-bugzilla-sync-configmap
diff --git a/roles/openshift-apps/distgit-bugzilla-sync/templates/buildconfig.yml b/roles/openshift-apps/distgit-bugzilla-sync/templates/buildconfig.yml
index b787afe28a..708ce90f45 100644
--- a/roles/openshift-apps/distgit-bugzilla-sync/templates/buildconfig.yml
+++ b/roles/openshift-apps/distgit-bugzilla-sync/templates/buildconfig.yml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: BuildConfig
 metadata:
-  name: distgit_bugzilla_sync-build
+  name: distgit-bugzilla-sync-build
   labels:
-    environment: "distgit_bugzilla_sync"
+    environment: "distgit-bugzilla-sync"
 spec:
   source:
     git:
@@ -21,4 +21,4 @@ spec:
   output:
     to:
       kind: ImageStreamTag
-      name: distgit_bugzilla_sync:latest
+      name: distgit-bugzilla-sync:latest
diff --git a/roles/openshift-apps/distgit-bugzilla-sync/templates/configmap.yml b/roles/openshift-apps/distgit-bugzilla-sync/templates/configmap.yml
index bb65f23915..481e161c2a 100644
--- a/roles/openshift-apps/distgit-bugzilla-sync/templates/configmap.yml
+++ b/roles/openshift-apps/distgit-bugzilla-sync/templates/configmap.yml
@@ -3,9 +3,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: distgit_bugzilla_sync-configmap
+  name: distgit-bugzilla-sync-configmap
   labels:
-    app: distgit_bugzilla_sync
+    app: distgit-bugzilla-sync
 data:
-  distgit_bugzilla_sync.cfg: |-
-    {{ load_file('distgit_bugzilla_sync.cfg') | indent }}
+  distgit-bugzilla-sync.cfg: |-
+    {{ load_file('distgit-bugzilla-sync.cfg') | indent }}
diff --git a/roles/openshift-apps/distgit-bugzilla-sync/templates/imagestream.yml b/roles/openshift-apps/distgit-bugzilla-sync/templates/imagestream.yml
index a7c2bea20c..a61a281395 100644
--- a/roles/openshift-apps/distgit-bugzilla-sync/templates/imagestream.yml
+++ b/roles/openshift-apps/distgit-bugzilla-sync/templates/imagestream.yml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: ImageStream
 metadata:
-   name: "distgit_bugzilla_sync"
+   name: "distgit-bugzilla-sync"