diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java
index 24beaf6a6..db8aaa5de 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java
@@ -22,20 +22,20 @@ public enum DistributionSetTagFields implements FieldNameProvider {
   /**
    * The id field.
    */
-  ID("id"),
+  ID(TagFields.ID.getFieldName()),
 
   /**
    * The name field.
    */
-  NAME("name"),
+  NAME(TagFields.NAME.getFieldName()),
   /**
    * The description field.
    */
-  DESCRIPTION("description"),
+  DESCRIPTION(TagFields.DESCRIPTION.getFieldName()),
   /**
    * The controllerId field.
    */
-  COLOUR("colour"),
+  COLOUR(TagFields.COLOUR.getFieldName()),
 
   /**
    * Distribution set fields
diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTagFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTagFields.java
index defc976cb..f042b4bb1 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTagFields.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTagFields.java
@@ -22,20 +22,20 @@ public enum TargetTagFields implements FieldNameProvider {
   /**
    * The id field.
    */
-  ID("id"),
+  ID(TagFields.ID.getFieldName()),
 
   /**
    * The name field.
    */
-  NAME("name"),
+  NAME(TagFields.NAME.getFieldName()),
   /**
    * The description field.
    */
-  DESCRIPTION("description"),
+  DESCRIPTION(TagFields.DESCRIPTION.getFieldName()),
   /**
    * The controllerId field.
    */
-  COLOUR("colour"),
+  COLOUR(TagFields.COLOUR.getFieldName()),
 
   /**
    * Target fields