diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
index bd92d25f92..570beb83fa 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
@@ -77,7 +77,7 @@
         </div>
         <button toolbarSuffixButton
                 mat-icon-button
-                matTooltip="{{ 'calculated-fields.test-expression-function' | translate }}"
+                matTooltip="{{ 'calculated-fields.test-script-function' | translate }}"
                 matTooltipPosition="above"
                 class="tb-mat-32"
                 [disabled]="propagateConfiguration.get('arguments').invalid"
@@ -90,7 +90,7 @@
                 type="button"
                 (click)="onTestScript()"
                 [disabled]="propagateConfiguration.get('arguments').invalid">
-          {{ 'calculated-fields.test-expression-function' | translate }}
+          {{ 'calculated-fields.test-script-function' | translate }}
         </button>
       </div>
     </div>
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 54492e06b5..e078826853 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1121,7 +1121,6 @@
         "datasource": "Datasource",
         "add-argument": "Add argument",
         "test-script-function": "Test script function",
-        "test-expression-function": "Test expression function",
         "no-arguments": "At least one argument is required.",
         "argument-settings": "Argument settings",
         "argument-current": "Current entity",
@@ -1311,8 +1310,8 @@
             "offset-value-required": "Offset value is required",
             "offset-value-min": "Offset value must be a positive integer",
             "offset-value-max": "Offset value should be less than the aggregate interval value",
-            "wait-delay": "Wait for delayed telemetry",
-            "wait-delay-hint": "Waits for delayed telemetry after the interval ends",
+            "wait-delay": "Apply await timeout for delayed telemetry",
+            "wait-delay-hint": "Defines how long to wait for delayed telemetry after the interval ends. If such telemetry arrives, the result for that interval will be recalculated.\n",
             "duration": "Duration",
             "duration-required": "Duration is required",
             "duration-min": "Duration should be at least 1 minute",