diff --git a/components/knx_dali_gw/knxprod/DALI-GW-address.templ.xml b/components/knx_dali_gw/knxprod/DALI-GW-address.templ.xml
index 0699d2c..875885c 100644
--- a/components/knx_dali_gw/knxprod/DALI-GW-address.templ.xml
+++ b/components/knx_dali_gw/knxprod/DALI-GW-address.templ.xml
@@ -32,15 +32,15 @@
           </Static>
           <Dynamic>
             <ChannelIndependentBlock>
-              <ParameterBlock Id="%AID%_PB-ADR%CC%" Text="DALI address %C%" Inline="true" Layout="Grid">
+              <ParameterBlock Id="%AID%_PB-%TT%%CC%001" Text="DALI address %C%" Inline="true" Layout="Grid">
                 <Rows>
-                  <Row Id="%AID%_PB-ADR%CC%_R-1" />
+                  <Row Id="%AID%_PB-%TT%%CC%001_R-1" />
                 </Rows>
                 <Columns>
-                  <Column Id="%AID%_PB-ADR%CC%_C-1" Width="30%" />
-                  <Column Id="%AID%_PB-ADR%CC%_C-2" Width="70%" />
+                  <Column Id="%AID%_PB-%TT%%CC%001_C-1" Width="30%" />
+                  <Column Id="%AID%_PB-%TT%%CC%001_C-2" Width="70%" />
                 </Columns>
-                <ParameterSeparator Id="%AID%_PS-ADR%CC%" Text="DALI address %C%" Cell="1,1" />
+                <ParameterSeparator Id="%AID%_PS-%TT%%CC%001" Text="DALI address %C%" Cell="1,1" />
                 <ParameterRefRef RefId="%AID%_P-%TT%%CC%001_R-%TT%%CC%00101" Cell="1,2" />
               </ParameterBlock>
             </ChannelIndependentBlock>
diff --git a/components/knx_dali_gw/knxprod/DALI-GW-group.templ.xml b/components/knx_dali_gw/knxprod/DALI-GW-group.templ.xml
index 41335bd..94091f1 100644
--- a/components/knx_dali_gw/knxprod/DALI-GW-group.templ.xml
+++ b/components/knx_dali_gw/knxprod/DALI-GW-group.templ.xml
@@ -32,15 +32,15 @@
           </Static>
           <Dynamic>
             <ChannelIndependentBlock>
-              <ParameterBlock Id="%AID%_PB-GRP%CC%" Text="DALI group %C%" Inline="true" Layout="Grid">
+              <ParameterBlock Id="%AID%_PB-%TT%%CC%001" Text="DALI group %C%" Inline="true" Layout="Grid">
                 <Rows>
-                  <Row Id="%AID%_PB-GRP%CC%_R-1" />
+                  <Row Id="%AID%_PB-%TT%%CC%001_R-1" />
                 </Rows>
                 <Columns>
-                  <Column Id="%AID%_PB-GRP%CC%_C-1" Width="30%" />
-                  <Column Id="%AID%_PB-GRP%CC%_C-2" Width="70%" />
+                  <Column Id="%AID%_PB-%TT%%CC%001_C-1" Width="30%" />
+                  <Column Id="%AID%_PB-%TT%%CC%001_C-2" Width="70%" />
                 </Columns>
-                <ParameterSeparator Id="%AID%_PS-GRP%CC%" Text="DALI group %C%" Cell="1,1" />
+                <ParameterSeparator Id="%AID%_PS-%TT%%CC%001" Text="DALI group %C%" Cell="1,1" />
                 <ParameterRefRef RefId="%AID%_P-%TT%%CC%001_R-%TT%%CC%00101" Cell="1,2" />
               </ParameterBlock>
             </ChannelIndependentBlock>
diff --git a/components/knx_dali_gw/knxprod/DALI-GW-hcl.templ.xml b/components/knx_dali_gw/knxprod/DALI-GW-hcl.templ.xml
index c9b20b3..d64d931 100644
--- a/components/knx_dali_gw/knxprod/DALI-GW-hcl.templ.xml
+++ b/components/knx_dali_gw/knxprod/DALI-GW-hcl.templ.xml
@@ -16,15 +16,15 @@
           </Static>
           <Dynamic>
             <ChannelIndependentBlock>
-              <ParameterBlock Id="%AID%_PB-HCL%CC%" Text="HCL curve %C%" Inline="true" Layout="Grid">
+              <ParameterBlock Id="%AID%_PB-%TT%%CC%001" Text="HCL curve %C%" Inline="true" Layout="Grid">
                 <Rows>
-                  <Row Id="%AID%_PB-HCL%CC%_R-1" />
+                  <Row Id="%AID%_PB-%TT%%CC%001_R-1" />
                 </Rows>
                 <Columns>
-                  <Column Id="%AID%_PB-HCL%CC%_C-1" Width="30%" />
-                  <Column Id="%AID%_PB-HCL%CC%_C-2" Width="70%" />
+                  <Column Id="%AID%_PB-%TT%%CC%001_C-1" Width="30%" />
+                  <Column Id="%AID%_PB-%TT%%CC%001_C-2" Width="70%" />
                 </Columns>
-                <ParameterSeparator Id="%AID%_PS-HCL%CC%" Text="HCL curve %C%" Cell="1,1" />
+                <ParameterSeparator Id="%AID%_PS-%TT%%CC%001" Text="HCL curve %C%" Cell="1,1" />
                 <ParameterRefRef RefId="%AID%_P-%TT%%CC%001_R-%TT%%CC%00101" Cell="1,2" />
               </ParameterBlock>
             </ChannelIndependentBlock>
diff --git a/components/knx_dali_gw/knxprod/DALI-GW.share.xml b/components/knx_dali_gw/knxprod/DALI-GW.share.xml
index 3d73c77..82c1b23 100644
--- a/components/knx_dali_gw/knxprod/DALI-GW.share.xml
+++ b/components/knx_dali_gw/knxprod/DALI-GW.share.xml
@@ -35,14 +35,14 @@
           </Static>
           <Dynamic>
             <ChannelIndependentBlock>
-              <ParameterBlock Id="%AID%_PB-DALI-Main" Text="DALI Gateway" Inline="true" Layout="Grid">
+              <ParameterBlock Id="%AID%_PB-000001" Text="DALI Gateway" Inline="true" Layout="Grid">
                 <Rows>
-                  <Row Id="%AID%_PB-DALI-Main_R-1" />
+                  <Row Id="%AID%_PB-000001_R-1" />
                 </Rows>
                 <Columns>
-                  <Column Id="%AID%_PB-DALI-Main_C-1" Width="100%" />
+                  <Column Id="%AID%_PB-000001_C-1" Width="100%" />
                 </Columns>
-                <ParameterSeparator Id="%AID%_PS-DALI-Main" Text="DALI Gateway" Cell="1,1" />
+                <ParameterSeparator Id="%AID%_PS-000001" Text="DALI Gateway" Cell="1,1" />
               </ParameterBlock>
             </ChannelIndependentBlock>
           </Dynamic>