diff --git a/dash-pipeline/SAI/sai_api_gen.py b/dash-pipeline/SAI/sai_api_gen.py
index 6c57ef880..690043178 100755
--- a/dash-pipeline/SAI/sai_api_gen.py
+++ b/dash-pipeline/SAI/sai_api_gen.py
@@ -175,7 +175,7 @@ def __init__(self):
         self.type = None
         self.isresourcetype = None
         self.isreadonly = None
-        self.objectName = None
+        self.object_name = None
         self.skipattr = None
         self.field = None
 
@@ -223,7 +223,7 @@ def _parse_sai_object_annotation(self, p4rt_anno_list):
                     elif kv['key'] == 'isreadonly':
                         self.isreadonly = kv['value']['stringValue']
                     elif kv['key'] == 'objects':
-                        self.objectName = kv['value']['stringValue']
+                        self.object_name = kv['value']['stringValue']
                     elif kv['key'] == 'skipattr':
                         self.skipattr = kv['value']['stringValue']
                     else:
@@ -239,7 +239,6 @@ class SAIEnumMember(SAIObject):
     '''
     def __init__(self):
         super().__init__()
-        self.sai_name = ""
         self.p4rt_value = ""
 
     def parse_p4rt(self, p4rt_member):
@@ -250,7 +249,6 @@ def parse_p4rt(self, p4rt_member):
 
             { "name": "INVALID", "value": "AAA=" }
         '''
-        self.sai_name = self.name
         self.p4rt_value = p4rt_member
 
 
@@ -413,7 +411,7 @@ def __init__(self):
         self.bitwidth = 0
         self.default = None
         self.ip_is_v6_field_id = 0
-        self.paramActions = []
+        self.param_actions = []
 
     def parse_p4rt(self, p4rt_table_action_param, sai_enums, ip_is_v6_param_ids):
         '''
@@ -568,11 +566,11 @@ def __merge_action_params_to_table_params(self, action):
             for table_action_param in self.action_params:
                 # Already have this param in the table.
                 if table_action_param.name == action_param.name:
-                    table_action_param.paramActions.append(action.name)
+                    table_action_param.param_actions.append(action.name)
                     break
             else:
                 # New param is found, add it to the table.
-                action_param.paramActions = [action.name]
+                action_param.param_actions = [action.name]
                 self.action_params.append(action_param)
 
 
@@ -646,7 +644,7 @@ def __update_table_param_object_name_reference(self):
                         table_ref = param.name[:-len("_id")]
                         for table_name in all_table_names:
                             if table_ref.endswith(table_name):
-                                param.objectName = table_name
+                                param.object_name = table_name
 
             # Update object name reference for keys
             for table in sai_api.tables:
@@ -656,7 +654,7 @@ def __update_table_param_object_name_reference(self):
                             table_ref = key.sai_key_name[:-len("_id")]
                             for table_name in all_table_names:
                                 if table_ref.endswith(table_name):
-                                    key.objectName = table_name
+                                    key.object_name = table_name
 
 
     def __parse_sai_table_action(self, p4rt_actions, sai_enums):
diff --git a/dash-pipeline/SAI/templates/saiapi.h.j2 b/dash-pipeline/SAI/templates/saiapi.h.j2
index 15dd5ad08..bf4df0c8e 100644
--- a/dash-pipeline/SAI/templates/saiapi.h.j2
+++ b/dash-pipeline/SAI/templates/saiapi.h.j2
@@ -67,7 +67,7 @@ typedef struct _sai_{{ table.name }}_t
      * @brief {{ key.match_type | capitalize | replace('Lpm', 'LPM') }} matched key {{ key.sai_key_name }}
 {% if key.type == 'sai_object_id_t' %}
      *
-     * @objects SAI_OBJECT_TYPE_{{ key.objectName | upper }}
+     * @objects SAI_OBJECT_TYPE_{{ key.object_name | upper }}
 {% endif %}
      */
     {{ key.type }} {{ key.sai_key_name | lower }};
@@ -159,7 +159,7 @@ typedef enum _sai_{{ table.name }}_attr_t
 {% if param.skipattr == 'true' %}
 {% else %}
     /**
-     * @brief Action {% for action in param.paramActions %}{{ action }}{{ ", " if not loop.last else "" }}{% endfor %} parameter {{ param.name | upper }}
+     * @brief Action {% for action in param.param_actions %}{{ action }}{{ ", " if not loop.last else "" }}{% endfor %} parameter {{ param.name | upper }}
      *
      * @type {{ param.type }}
 {% if param.isreadonly == 'true' %}
@@ -179,7 +179,7 @@ typedef enum _sai_{{ table.name }}_attr_t
 {% elif param.type == 'bool' %}
      * @default false
 {% elif param.type == 'sai_object_id_t' %}
-     * @objects SAI_OBJECT_TYPE_{{ param.objectName | upper }}
+     * @objects SAI_OBJECT_TYPE_{{ param.object_name | upper }}
      * @allownull true
      * @default SAI_NULL_OBJECT_ID
 {% elif param.field == 's32' %}
@@ -192,8 +192,8 @@ typedef enum _sai_{{ table.name }}_attr_t
 {% endif %}
 {% endif %}
 {% if table.actions | length > 1 %}
-{% if param.paramActions | length > 0 %}
-     * @validonly {% for action in param.paramActions %}SAI_{{ table.name | upper }}_ATTR_ACTION == SAI_{{ table.name | upper }}_ACTION_{{ action | upper }}{{ " or " if not loop.last else "" }}{% endfor %}
+{% if param.param_actions | length > 0 %}
+     * @validonly {% for action in param.param_actions %}SAI_{{ table.name | upper }}_ATTR_ACTION == SAI_{{ table.name | upper }}_ACTION_{{ action | upper }}{{ " or " if not loop.last else "" }}{% endfor %}
 
 {% endif %}
 {% endif %}
diff --git a/dash-pipeline/SAI/templates/saienums.j2 b/dash-pipeline/SAI/templates/saienums.j2
index fd47e261c..6401b8e15 100644
--- a/dash-pipeline/SAI/templates/saienums.j2
+++ b/dash-pipeline/SAI/templates/saienums.j2
@@ -2,7 +2,7 @@
 typedef enum _sai_{{ enum.name }}_t
 {
 {% for member in enum.members %}
-    SAI_{{ enum.name | upper }}_{{ member.sai_name | upper }},
+    SAI_{{ enum.name | upper }}_{{ member.name | upper }},
 
 {% endfor %}
 } sai_{{ enum.name }}_t;