diff --git a/ui-ngx/src/assets/help/en_US/notification/alarm.md b/ui-ngx/src/assets/help/en_US/notification/alarm.md
index 73a9cfdbe9..671f617bab 100644
--- a/ui-ngx/src/assets/help/en_US/notification/alarm.md
+++ b/ui-ngx/src/assets/help/en_US/notification/alarm.md
@@ -21,7 +21,7 @@ Available template parameters:
   * *alarmOriginatorId* - the alarm originator entity id as uuid string;
 
 Parameter names must be wrapped using `${...}`. For example: `${action}`. 
-You may also modify the value of the parameter with one of the sufixes:
+You may also modify the value of the parameter with one of the suffixes:
 
   * `upperCase`, for example - `${recipientFirstName:upperCase}`
   * `lowerCase`, for example - `${recipientFirstName:lowerCase}`
@@ -55,7 +55,7 @@ ${alarmOriginatorEntityType:capitalize} '${alarmOriginatorName}'
 will be transformed to:
 
 ```text
-DEVICE - Sensor A
+Device - Sensor A
 {:copy-code}
 ```
 
diff --git a/ui-ngx/src/assets/help/en_US/notification/alarm_assignment.md b/ui-ngx/src/assets/help/en_US/notification/alarm_assignment.md
index f8ca57fe08..c4ff27d333 100644
--- a/ui-ngx/src/assets/help/en_US/notification/alarm_assignment.md
+++ b/ui-ngx/src/assets/help/en_US/notification/alarm_assignment.md
@@ -22,10 +22,13 @@ Available template parameters:
   * *assigneeFirstName* - first name of the assignee;    
   * *assigneeLastName* - last name of the assignee;
   * *assigneeId* - the id of the assignee as uuid string;
+  * *userEmail* - email of the user who made the action;
+  * *userFirstName* - first name of the user who made the action;
+  * *userLastName* - last name of the user who made the action;
   * *action* - one of: 'assigned', 'unassigned';
 
 Parameter names must be wrapped using `${...}`. For example: `${action}`. 
-You may also modify the value of the parameter with one of the sufixes:
+You may also modify the value of the parameter with one of the suffixes:
 
   * `upperCase`, for example - `${recipientFirstName:upperCase}`
   * `lowerCase`, for example - `${recipientFirstName:lowerCase}`
diff --git a/ui-ngx/src/assets/help/en_US/notification/alarm_comment.md b/ui-ngx/src/assets/help/en_US/notification/alarm_comment.md
index 2f9783478d..8a008ecf27 100644
--- a/ui-ngx/src/assets/help/en_US/notification/alarm_comment.md
+++ b/ui-ngx/src/assets/help/en_US/notification/alarm_comment.md
@@ -19,11 +19,13 @@ Available template parameters:
   * *alarmOriginatorName* - the name of the alarm originator, e.g. 'Sensor T1';
   * *alarmOriginatorId* - the alarm originator entity id as uuid string;
   * *comment* - text of the comment;
-  * *userName* - name of the user who made the comment;
   * *action* - one of: 'added', 'updated';
+  * *userEmail* - email of the user who made the action;
+  * *userFirstName* - first name of the user who made the action;
+  * *userLastName* - last name of the user who made the action;
 
 Parameter names must be wrapped using `${...}`. For example: `${action}`. 
-You may also modify the value of the parameter with one of the sufixes:
+You may also modify the value of the parameter with one of the suffixes:
 
   * `upperCase`, for example - `${recipientFirstName:upperCase}`
   * `lowerCase`, for example - `${recipientFirstName:lowerCase}`
diff --git a/ui-ngx/src/assets/help/en_US/notification/device_inactivity.md b/ui-ngx/src/assets/help/en_US/notification/device_inactivity.md
index 5a616e7223..24b7510366 100644
--- a/ui-ngx/src/assets/help/en_US/notification/device_inactivity.md
+++ b/ui-ngx/src/assets/help/en_US/notification/device_inactivity.md
@@ -15,10 +15,10 @@ Available template parameters:
   * *deviceName* - the device name;    
   * *deviceLabel* - the device label;    
   * *deviceType* - the device type;
-  * *actionType* - one of: 'inactive', 'active';    
+  * *actionType* - one of: 'inactive', 'active';    // TODO: fix and rename the type
 
 Parameter names must be wrapped using `${...}`. For example: `${recipientFirstName}`. 
-You may also modify the value of the parameter with one of the sufixes:
+You may also modify the value of the parameter with one of the suffixes:
 
   * `upperCase`, for example - `${recipientFirstName:upperCase}`
   * `lowerCase`, for example - `${recipientFirstName:lowerCase}`
diff --git a/ui-ngx/src/assets/help/en_US/notification/entities_limit.md b/ui-ngx/src/assets/help/en_US/notification/entities_limit.md
index f7e6ba2b41..da351ad30f 100644
--- a/ui-ngx/src/assets/help/en_US/notification/entities_limit.md
+++ b/ui-ngx/src/assets/help/en_US/notification/entities_limit.md
@@ -15,9 +15,11 @@ Available template parameters:
   * *currentCount* - the current count of entities;
   * *limit* - the limit on number of entities;    
   * *percents* - the percent from the notification rule configuration;
+  * *tenantId* - id of the tenant;
+  * *tenantName* - name of the tenant;
 
 Parameter names must be wrapped using `${...}`. For example: `${recipientFirstName}`. 
-You may also modify the value of the parameter with one of the sufixes:
+You may also modify the value of the parameter with one of the suffixes:
 
   * `upperCase`, for example - `${recipientFirstName:upperCase}`
   * `lowerCase`, for example - `${recipientFirstName:lowerCase}`
diff --git a/ui-ngx/src/assets/help/en_US/notification/entity_action.md b/ui-ngx/src/assets/help/en_US/notification/entity_action.md
index ca1ed43e20..06e3fe2d4e 100644
--- a/ui-ngx/src/assets/help/en_US/notification/entity_action.md
+++ b/ui-ngx/src/assets/help/en_US/notification/entity_action.md
@@ -15,11 +15,13 @@ Available template parameters:
   * *entityId* - the entity id as uuid string;
   * *entityName* - the name of the entity;
   * *actionType* - one of: 'added', 'updated', 'deleted';    
-  * *originatorUserId* - the user who made the action;    
-  * *originatorUserName* - the user who made the action;    // WHY no EMAIL, first, last, entityLabel (if applicable)
+  * *userId* - id of the user who made the action;
+  * *userEmail* - email of the user who made the action;
+  * *userFirstName* - first name of the user who made the action;
+  * *userLastName* - last name of the user who made the action;
 
 Parameter names must be wrapped using `${...}`. For example: `${recipientFirstName}`. 
-You may also modify the value of the parameter with one of the sufixes:
+You may also modify the value of the parameter with one of the suffixes:
 
   * `upperCase`, for example - `${recipientFirstName:upperCase}`
   * `lowerCase`, for example - `${recipientFirstName:lowerCase}`
diff --git a/ui-ngx/src/assets/help/en_US/notification/general.md b/ui-ngx/src/assets/help/en_US/notification/general.md
index edb7b9cf70..44c8e6aafb 100644
--- a/ui-ngx/src/assets/help/en_US/notification/general.md
+++ b/ui-ngx/src/assets/help/en_US/notification/general.md
@@ -13,7 +13,7 @@ Available template parameters:
   * *recipientLastName* - last name of the recipient;
 
 Parameter names must be wrapped using `${...}`. For example: `${recipientFirstName}`. 
-You may also modify the value of the parameter with one of the sufixes:
+You may also modify the value of the parameter with one of the suffixes:
 
   * `upperCase`, for example - `${recipientFirstName:upperCase}`
   * `lowerCase`, for example - `${recipientFirstName:lowerCase}`
diff --git a/ui-ngx/src/assets/help/en_US/notification/rule_engine_lifecycle_event.md b/ui-ngx/src/assets/help/en_US/notification/rule_engine_lifecycle_event.md
index 9d8dcbf72c..1d22847bed 100644
--- a/ui-ngx/src/assets/help/en_US/notification/rule_engine_lifecycle_event.md
+++ b/ui-ngx/src/assets/help/en_US/notification/rule_engine_lifecycle_event.md
@@ -11,7 +11,7 @@ Available template parameters:
   * *recipientEmail* - email of the recipient;
   * *recipientFirstName* - first name of the recipient;
   * *recipientLastName* - last name of the recipient;
-  * *componentType* - one of: 'rule chain', 'rule node';
+  * *componentType* - one of: 'Rule chain', 'Rule node';
   * *componentId* - the component id as uuid string;
   * *componentName* - the rule chain or rule node name;    
   * *ruleChainId* - the rule chain id as uuid string;
@@ -21,7 +21,7 @@ Available template parameters:
   * *error* - the error text;
 
 Parameter names must be wrapped using `${...}`. For example: `${recipientFirstName}`. 
-You may also modify the value of the parameter with one of the sufixes:
+You may also modify the value of the parameter with one of the suffixes:
 
   * `upperCase`, for example - `${recipientFirstName:upperCase}`
   * `lowerCase`, for example - `${recipientFirstName:lowerCase}`