diff --git a/apack.json b/apack.json
index 30505b1279..85195410e1 100644
--- a/apack.json
+++ b/apack.json
@@ -4,7 +4,7 @@
   "description": "Graphical configuration tool for application and libraries based on Zigbee Cluster Library.",
   "path": [".", "node_modules/.bin/", "ZAP.app/Contents/MacOS"],
   "requiredFeatureLevel": "apack.core:9",
-  "featureLevel": 105,
+  "featureLevel": 106,
   "uc.triggerExtension": "zap",
   "executable": {
     "zap:win32.x86_64": {
diff --git a/docs/api.md b/docs/api.md
index 96748d9741..8d29c318e5 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -8448,7 +8448,7 @@ This module contains the API for templating. For more detailed instructions, rea
 * [Templating API: Attribute helpers](#module_Templating API_ Attribute helpers)
     * [~featureBits(options)](#module_Templating API_ Attribute helpers..featureBits) ⇒
     * [~attributeDefault()](#module_Templating API_ Attribute helpers..attributeDefault) ⇒
-    * [~as_underlying_atomic_identifier_for_attributeId(attributeId)](#module_Templating API_ Attribute helpers..as_underlying_atomic_identifier_for_attributeId)
+    * [~as_underlying_atomic_identifier_for_attribute_id(attributeId)](#module_Templating API_ Attribute helpers..as_underlying_atomic_identifier_for_attribute_id)
 
 <a name="module_Templating API_ Attribute helpers..featureBits"></a>
 
@@ -8469,9 +8469,9 @@ Valid within a cluster context, requires code.
 
 **Kind**: inner method of [<code>Templating API: Attribute helpers</code>](#module_Templating API_ Attribute helpers)  
 **Returns**: Produces attribute defaults.  
-<a name="module_Templating API_ Attribute helpers..as_underlying_atomic_identifier_for_attributeId"></a>
+<a name="module_Templating API_ Attribute helpers..as_underlying_atomic_identifier_for_attribute_id"></a>
 
-### Templating API: Attribute helpers~as\_underlying\_atomic\_identifier\_for\_attributeId(attributeId)
+### Templating API: Attribute helpers~as\_underlying\_atomic\_identifier\_for\_attribute\_id(attributeId)
 Given an attribute Id determine its corresponding atomic identifier from the
 atomic table.
 
diff --git a/docs/helpers.md b/docs/helpers.md
index 404815b27d..c86404f8f9 100644
--- a/docs/helpers.md
+++ b/docs/helpers.md
@@ -127,7 +127,7 @@ This module contains the API for templating. For more detailed instructions, rea
 * [Templating API: Attribute helpers](#module_Templating API_ Attribute helpers)
     * [~featureBits(options)](#module_Templating API_ Attribute helpers..featureBits) ⇒
     * [~attributeDefault()](#module_Templating API_ Attribute helpers..attributeDefault) ⇒
-    * [~as_underlying_atomic_identifier_for_attributeId(attributeId)](#module_Templating API_ Attribute helpers..as_underlying_atomic_identifier_for_attributeId)
+    * [~as_underlying_atomic_identifier_for_attribute_id(attributeId)](#module_Templating API_ Attribute helpers..as_underlying_atomic_identifier_for_attribute_id)
 
 <a name="module_Templating API_ Attribute helpers..featureBits"></a>
 
@@ -148,9 +148,9 @@ Valid within a cluster context, requires code.
 
 **Kind**: inner method of [<code>Templating API: Attribute helpers</code>](#module_Templating API_ Attribute helpers)  
 **Returns**: Produces attribute defaults.  
-<a name="module_Templating API_ Attribute helpers..as_underlying_atomic_identifier_for_attributeId"></a>
+<a name="module_Templating API_ Attribute helpers..as_underlying_atomic_identifier_for_attribute_id"></a>
 
-### Templating API: Attribute helpers~as\_underlying\_atomic\_identifier\_for\_attributeId(attributeId)
+### Templating API: Attribute helpers~as\_underlying\_atomic\_identifier\_for\_attribute\_id(attributeId)
 Given an attribute Id determine its corresponding atomic identifier from the
 atomic table.
 
diff --git a/src-electron/generator/helper-attribute.js b/src-electron/generator/helper-attribute.js
index cf51b259a4..0ac7f3720f 100644
--- a/src-electron/generator/helper-attribute.js
+++ b/src-electron/generator/helper-attribute.js
@@ -84,7 +84,7 @@ async function attributeDefault(options) {
  * atomic table.
  * @param {*} attributeId
  */
-async function as_underlying_atomic_identifier_for_attributeId(attributeId) {
+async function as_underlying_atomic_identifier_for_attribute_id(attributeId) {
   let attributeDetails =
     await queryZcl.selectAttributeByAttributeIdAndClusterRef(
       this.global.db,
@@ -164,5 +164,5 @@ async function as_underlying_atomic_identifier_for_attributeId(attributeId) {
 
 exports.global_attribute_default = attributeDefault
 exports.feature_bits = featureBits
-exports.as_underlying_atomic_identifier_for_attributeId =
-  as_underlying_atomic_identifier_for_attributeId
+exports.as_underlying_atomic_identifier_for_attribute_id =
+  as_underlying_atomic_identifier_for_attribute_id
diff --git a/test/gen-template/zigbee/zap-config-version-3.zapt b/test/gen-template/zigbee/zap-config-version-3.zapt
index c929dc47d4..71b514f029 100644
--- a/test/gen-template/zigbee/zap-config-version-3.zapt
+++ b/test/gen-template/zigbee/zap-config-version-3.zapt
@@ -298,7 +298,7 @@
 #define GENERATED_MULTI_PROTOCOL_ATTRIBUTE_MAPPING
 {
   {{#all_multi_protocol_attributes}}
-  { {{clusterCode1}}, {{clusterMfgCode1}}, {{clusterCode2}}, {{clusterMfgCode2}}, {{attributeCode1}}, {{attributeMfgCode1}}, {{as_underlying_atomic_identifier_for_attributeId attributeRef1}}, {{attributeCode2}}, {{attributeMfgCode2}}, {{as_underlying_atomic_identifier_for_attributeId attributeRef2}} },
+  { {{clusterCode1}}, {{clusterMfgCode1}}, {{clusterCode2}}, {{clusterMfgCode2}}, {{attributeCode1}}, {{attributeMfgCode1}}, {{as_underlying_atomic_identifier_for_attribute_id attributeRef1}}, {{attributeCode2}}, {{attributeMfgCode2}}, {{as_underlying_atomic_identifier_for_attributeId attributeRef2}} },
   {{/all_multi_protocol_attributes}}
 }
 {{/if_multi_protocol_attributes_enabled}}