diff --git a/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
index 9ca75c1b2c..81c7c6623e 100644
--- a/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
@@ -34,7 +34,7 @@ import org.thingsboard.server.common.data.cf.configuration.SimpleCalculatedField
 import org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates;
 import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.geofencing.ZoneGroupConfiguration;
-import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationPathLevel;
@@ -176,13 +176,13 @@ public class CalculatedFieldControllerTest extends AbstractControllerTest {
         doGet("/api/calculatedField/" + savedCalculatedField.getId().getId()).andExpect(status().isNotFound());
     }
 
-    private CalculatedField getCalculatedField(DeviceId deviceId) {
-        return getCalculatedField(deviceId, getSimpleCalculatedFieldConfig());
+    private CalculatedField getCalculatedField(EntityId entityId) {
+        return getCalculatedField(entityId, getSimpleCalculatedFieldConfig());
     }
 
-    private CalculatedField getCalculatedField(DeviceId deviceId, CalculatedFieldConfiguration configuration) {
+    private CalculatedField getCalculatedField(EntityId entityId, CalculatedFieldConfiguration configuration) {
         CalculatedField calculatedField = new CalculatedField();
-        calculatedField.setEntityId(deviceId);
+        calculatedField.setEntityId(entityId);
         calculatedField.setType(CalculatedFieldType.SIMPLE);
         calculatedField.setName("Test Calculated Field");
         calculatedField.setConfigurationVersion(1);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java b/dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
index 254b557eb1..2efa32215a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
@@ -34,7 +34,8 @@ import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
-import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.validator.CalculatedFieldDataValidator;
+import org.thingsboard.server.dao.service.validator.CalculatedFieldLinkDataValidator;
 
 import java.util.EnumSet;
 import java.util.List;
@@ -55,8 +56,8 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
 
     private final CalculatedFieldDao calculatedFieldDao;
     private final CalculatedFieldLinkDao calculatedFieldLinkDao;
-    private final DataValidator<CalculatedField> calculatedFieldDataValidator;
-    private final DataValidator<CalculatedFieldLink> calculatedFieldLinkDataValidator;
+    private final CalculatedFieldDataValidator calculatedFieldDataValidator;
+    private final CalculatedFieldLinkDataValidator calculatedFieldLinkDataValidator;
 
     @Override
     public CalculatedField save(CalculatedField calculatedField) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbCalculatedFieldsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbCalculatedFieldsNode.java
index 049aa9e758..7c6d1884bb 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbCalculatedFieldsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbCalculatedFieldsNode.java
@@ -44,13 +44,13 @@ import static org.thingsboard.server.common.data.DataConstants.SCOPE;
 @Slf4j
 @RuleNode(
         type = ComponentType.ACTION,
-        name = "calculated fields", // TODO: rename to "alarms and calculated fields"
+        name = "calculated fields and alarm rules",
         configClazz = EmptyNodeConfiguration.class,
-        nodeDescription = "Pushes incoming messages to calculated fields service",
-        nodeDetails = "Node enables the processing of calculated fields without persisting incoming messages to the database. " +
-                "By default, the processing of calculated fields is triggered by the <b>save attributes</b> and <b>save time series</b> nodes. " +
+        nodeDescription = "Pushes incoming messages to calculated fields and alarm rules services",
+        nodeDetails = "Node enables the processing of calculated fields and alarm rules without persisting incoming messages to the database. " +
+                "By default, the processing of calculated fields and alarm rules is triggered by the <b>save attributes</b> and <b>save time series</b> nodes. " +
                 "This rule node accepts the same messages as these nodes but allows you to trigger the processing of calculated " +
-                "fields independently, ensuring that derived data can be computed and utilized in real time without storing the original message in the database.",
+                "fields or alarm rules independently, ensuring that derived data can be computed and utilized in real time without storing the original message in the database.",
         configDirective = "tbNodeEmptyConfig",
         icon = "published_with_changes"
 )