diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
index bf790982..0dae8a3a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
@@ -51,7 +51,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
index 8cd2da3c..5be59925 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
@@ -51,7 +51,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
index 0040073f..e3e53cbb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
index 14a1328f..a5e9e2a1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
index 34225f5d..e68d24b4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
index e17eb798..e6458615 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
index 8914566b..7b4daa66 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
index 42b5dcac..bf0fbe89 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
index f68be56c..84f22010 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
index 2d0e49b6..fd7cd332 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
index e543c883..696fb35f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
index 93b6a871..e0ab9518 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
index 531c7da5..3047c537 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
index da61e8e6..bd5b4819 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
index a35cd43e..1ae13094 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="128" page-size="128" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="54">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="54" page-size="128" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="54" page-size="128" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
index dc1ffb21..36052c67 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
index e65bb9fa..faba1a21 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
index d3724c24..5285705a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
index 466c3739..579012f1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
index 9f036aa0..7726066f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
index e0c875c0..ef23d80a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
index 8d862950..0962f3f6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
index e53a168a..97bd732d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
index b27260e4..54728baf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
index a6c6dad1..1a1441aa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
index 2507f3c5..08b282c1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
index 750069a9..8d10e9c3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
index 0e19b282..9024983f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
index 7608cf01..cfe949b1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
index e2e28958..d0437adb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
index e2e6d15d..52eb7ae4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
index 28e6d688..1376f52b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="128" page-size="128" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="54">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="54" page-size="128" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="54" page-size="128" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
index bb2d389d..a4401f51 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
index 733d814a..9cd2aeea 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="512" page-size="512" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="512" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
index 46d7f125..101a9ca4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
@@ -51,7 +51,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
index fb539455..b7047e1c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
@@ -51,7 +51,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
index 405ff765..66bda1ef 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
index 0c35f928..c0b81197 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
index d5e9e94c..f34f81db 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
index 9908f99d..39b3ef93 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
index cc89c791..5b1b374d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
index f177998d..2869e253 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
index 8e46739a..98bb94cf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
@@ -50,7 +50,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="52">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="52" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
index dfd49b7c..eb089e32 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="256" page-size="256" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="64">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="64" page-size="256" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
index 6adfeee6..be97176b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
@@ -49,7 +49,7 @@
             <memory-segment key="user_signatures" name="User Signatures" type="user_signatures" start="0x00000000" size="128" page-size="128" rw="RW"/>
         </address-space>
         <address-space key="prod_signatures" start="0x00000000" size="54">
-            <memory-segment key="prod_signatures" name="Production Signatures" type="signatures" start="0x00000000" size="54" page-size="128" rw="R"/>
+            <memory-segment key="prod_signatures" name="Production Signatures" type="production_signatures" start="0x00000000" size="54" page-size="128" rw="R"/>
         </address-space>
     </address-spaces>
     <physical-interfaces>