diff --git a/views/view11.yml b/views/view11.yml
index a6217a7115ec566db2de25cebf5454307ec17366..cef43a23dcc202785edb846b0463b1655407c6b5 100644
--- a/views/view11.yml
+++ b/views/view11.yml
@@ -7,31 +7,31 @@ dawn_view_11:ev000:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11
+    - ./bin/make_dawn_views -t view11_ev000 -d scripts/view11
 dawn_view_11:ev001:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 1
+    - ./bin/make_dawn_views -t view11_ev001 -d scripts/view11 -s 1
 dawn_view_11:ev002:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 2
+    - ./bin/make_dawn_views -t view11_ev002 -d scripts/view11 -s 2
 dawn_view_11:ev003:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 3
+    - ./bin/make_dawn_views -t view11_ev003 -d scripts/view11 -s 3
 dawn_view_11:ev004:
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   extends: .views
   script:
-    - ./bin/make_dawn_views -t view11 -d scripts/view11 -s 4
+    - ./bin/make_dawn_views -t view11_ev004 -d scripts/view11 -s 4
 
 view_11:
   stage: test
diff --git a/views/view7.yml b/views/view7.yml
index c59d1a42bf31e965fe80e44cdfe38b49bedd7d74..444140dd36462c800e6abb1e6535b5417abd9f71 100644
--- a/views/view7.yml
+++ b/views/view7.yml
@@ -1,19 +1,19 @@
 dawn_view_07:detector:
   extends: .views
   script:
-    - ./bin/make_dawn_views -t view07 -d scripts/view2 -D
+    - ./bin/make_dawn_views -t view07 -d scripts/view7 -D
 dawn_view_07:ev002:
   extends: .views
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view07_ev002 -d scripts/view2 -s 2
+    - ./bin/make_dawn_views -t view07_ev002 -d scripts/view7 -s 2
 dawn_view_07:ev003:
   extends: .views
   rules:
     - if: '$DETECTOR_EVENT_VIEWS == "ON"'
   script:
-    - ./bin/make_dawn_views -t view07_ev003 -d scripts/view2 -s 3
+    - ./bin/make_dawn_views -t view07_ev003 -d scripts/view7 -s 3
 
 view_07:
   stage: test