diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index e8b9620969..25610561ff 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -43,11 +43,11 @@
                         <ConditionEdit :condition-identifier="conditionIdentifier"
                                        :current-condition-identifier="currentConditionIdentifier"
                                        :condition-index="index"
-                                       @update-current-condition="updateCurrentCondition"
-                                       @remove-condition="removeCondition"
-                                       @clone-condition="cloneCondition"
-                                       @condition-result-updated="handleConditionResult"
-                                       @set-move-index="setMoveIndex"
+                                       @updateCurrentCondition="updateCurrentCondition"
+                                       @removeCondition="removeCondition"
+                                       @cloneCondition="cloneCondition"
+                                       @conditionResultUpdated="handleConditionResult"
+                                       @setMoveIndex="setMoveIndex"
                         />
                     </div>
                     <div v-else>
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 447643a4e3..d5bc206e54 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -216,19 +216,19 @@ export default {
     },
     methods: {
         dragStart(e) {
-            this.$emit('set-move-index', Number(e.target.getAttribute('data-condition-index')));
+            this.$emit('setMoveIndex', Number(e.target.getAttribute('data-condition-index')));
         },
         handleConditionResult(args) {
-            this.$emit('condition-result-updated', {
+            this.$emit('conditionResultUpdated', {
                 id: this.conditionIdentifier,
                 result: args.data.result
             })
         },
         removeCondition(ev) {
-            this.$emit('remove-condition', this.conditionIdentifier);
+            this.$emit('removeCondition', this.conditionIdentifier);
         },
         cloneCondition(ev) {
-            this.$emit('clone-condition', {
+            this.$emit('cloneCondition', {
                 identifier: this.conditionIdentifier,
                 index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
             });
@@ -294,7 +294,7 @@ export default {
             //find the criterion being updated and set the input property
         },
         updateCurrentCondition() {
-            this.$emit('update-current-condition', this.conditionIdentifier);
+            this.$emit('updateCurrentCondition', this.conditionIdentifier);
         }
     }
 }