From 387dce347efdd1ca66fb73d6e44c26e1aa6d93e0 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 21 Oct 2007 04:06:23 +0000
Subject: [PATCH] 2007-10-21  Jim Evins  <evins@snaught.com>

	* data/dtd/glabels-2.2.dtd:
		Forgot to replace Alias name attribute with brand and part attributes.
	* data/templates/avery-iso-templates.xml:
	* data/templates/avery-other-templates.xml:
	* data/templates/avery-us-templates.xml:
	* data/templates/misc-iso-templates.xml:
	* data/templates/misc-other-templates.xml:
	* data/templates/misc-us-templates.xml:
	* data/templates/zweckform-iso-templates.xml:
		Replaced all name attributes with brand/part attribute pairs.



git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@683 f5e0f49d-192f-0410-a22d-a8d8700d0965
---
 glabels2/ChangeLog                            |  13 +
 glabels2/data/dtd/glabels-2.2.dtd             |   4 +-
 .../data/templates/avery-iso-templates.xml    | 108 ++--
 .../data/templates/avery-other-templates.xml  |   2 +-
 .../data/templates/avery-us-templates.xml     | 606 +++++++++---------
 .../data/templates/misc-iso-templates.xml     | 125 ++--
 .../data/templates/misc-other-templates.xml   |   4 +-
 glabels2/data/templates/misc-us-templates.xml |  36 +-
 .../templates/zweckform-iso-templates.xml     |  44 +-
 9 files changed, 477 insertions(+), 465 deletions(-)

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index bc1f9fd1..21ecbd91 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,16 @@
+2007-10-21  Jim Evins  <evins@snaught.com>
+
+	* data/dtd/glabels-2.2.dtd:
+		Forgot to replace Alias name attribute with brand and part attributes.
+	* data/templates/avery-iso-templates.xml:
+	* data/templates/avery-other-templates.xml:
+	* data/templates/avery-us-templates.xml:
+	* data/templates/misc-iso-templates.xml:
+	* data/templates/misc-other-templates.xml:
+	* data/templates/misc-us-templates.xml:
+	* data/templates/zweckform-iso-templates.xml:
+		Replaced all name attributes with brand/part attribute pairs.
+
 2007-10-20  Jim Evins  <evins@snaught.com>
 
 	* src/stock-pixmaps/*.png
diff --git a/glabels2/data/dtd/glabels-2.2.dtd b/glabels2/data/dtd/glabels-2.2.dtd
index 4565d812..183df8b6 100644
--- a/glabels2/data/dtd/glabels-2.2.dtd
+++ b/glabels2/data/dtd/glabels-2.2.dtd
@@ -207,7 +207,9 @@
 
 <!ELEMENT Alias EMPTY>
 <!ATTLIST Alias
-                 name            %STRING_TYPE;           #REQUIRED
+                 brand           %STRING_TYPE;           #REQUIRED
+                 part            %STRING_TYPE;           #REQUIRED
+                 name            %STRING_TYPE;           #IMPLIED
 >
 
 <!-- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
diff --git a/glabels2/data/templates/avery-iso-templates.xml b/glabels2/data/templates/avery-iso-templates.xml
index d701b627..23fc5918 100644
--- a/glabels2/data/templates/avery-iso-templates.xml
+++ b/glabels2/data/templates/avery-iso-templates.xml
@@ -9,7 +9,7 @@
   <!-- =================================================================== -->
   <!-- Avery L6015 family: CD/DVD Labels, 2 per sheet                      -->
   <!-- =================================================================== -->
-  <Template name="Avery L6015" size="A4" _description="CD/DVD Labels">
+  <Template brand="Avery" part="L6015" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.827pt" hole="58.1102pt" waste="9.07087pt">
@@ -21,132 +21,132 @@
   <!-- =================================================================== -->
   <!-- Avery 7160 family: Mailing labels, 63.5 x 38.1 mm, 21 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery   7160" size="A4" _description="Mailing labels">
+  <Template brand="Avery" part="7160" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="181.4" height="108.0" round="5">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="7" x0="21.2" y0="43.9" dx="187.2" dy="108.0"/>
     </Label-rectangle>
-    <Alias name="Avery  L7160"/>
-    <Alias name="Avery  J8160"/>
-    <Alias name="DECAdry DLW-1731"/>
-    <Alias name="DECAdry OLW-4731"/>
-    <Alias name="DECAdry OLW-7131"/>
+    <Alias brand="Avery" part="L7160"/>
+    <Alias brand="Avery" part="J8160"/>
+    <Alias brand="DECAdry" part="DLW-1731"/>
+    <Alias brand="DECAdry" part="OLW-4731"/>
+    <Alias brand="DECAdry" part="OLW-7131"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7161 family: Mailing labels, 63.5 x 46.6 mm, 18 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery   7161" size="A4" _description="Mailing labels">
+  <Template brand="Avery" part="7161" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="180.2" height="132.6" round="7">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="6" x0="21" y0="23" dx="186.9" dy="132.5"/>
     </Label-rectangle>
-    <Alias name="Avery  L7161"/>
-    <Alias name="Avery  J8161"/>
+    <Alias brand="Avery" part="L7161"/>
+    <Alias brand="Avery" part="J8161"/>
   </Template>
 
   <!-- ================================================================== -->  
   <!-- Avery 7162 family: Mailing labels, 99.1 x 33.9 mm, 16 per sheet    -->  
   <!-- ================================================================== -->  
-  <Template name="Avery   7162" size="A4" _description="Mailing labels">  
+  <Template brand="Avery" part="7162" size="A4" _description="Mailing labels">  
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="280.9" height="96.1" round="5">  
       <Markup-margin size="5"/>
       <Layout nx="2" ny="8" x0="11.3" y0="36.8" dx="290.5" dy="96.1"/>  
     </Label-rectangle>  
-    <Alias name="Avery  L7162"/>  
+    <Alias brand="Avery" part="L7162"/>  
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7163 family: Mailing labels, 99.1 x 38.1 mm, 14 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery   7163" size="A4" _description="Mailing labels">
+  <Template brand="Avery" part="7163" size="A4" _description="Mailing labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="280.9" height="108" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="7" x0="9.5" y0="43" dx="292" dy="108"/>
     </Label-rectangle>
-    <Alias name="Avery  L7163"/>
+    <Alias brand="Avery" part="L7163"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7164 family: Address labels, 63.50 x 71.98 mm, 12 per sheet   -->
   <!-- =================================================================== -->
-  <Template name="Avery   7164" size="A4" _description="Address labels">
+  <Template brand="Avery" part="7164" size="A4" _description="Address labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="180" height="204.038" round="8.5">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="4" x0="20.84" y0="10" dx="187.08" dy="204.038"/>
     </Label-rectangle>
-    <Alias name="Avery  J8164"/>
-    <Alias name="Avery  L7164"/>
-    <Alias name="Biltema 23-756"/>
+    <Alias brand="Avery" part="J8164"/>
+    <Alias brand="Avery" part="L7164"/>
+    <Alias brand="Biltema" part="23-756"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7165 family: Address labels                                   -->
   <!-- =================================================================== -->
-  <Template name="Avery  7165" size="A4" description="Address Labels">
+  <Template brand="Avery" part="7165" size="A4" description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="280.8pt" height="191.991pt" round="0pt" waste="0pt">
       <Markup-margin size="5.66929pt"/>
       <Layout nx="2" ny="4" x0="13.2378pt" y0="36.9638pt" dx="288.113pt" dy="191.991pt"/>
     </Label-rectangle>
-    <Alias name="Avery  J8165"/>
-    <Alias name="Avery  L7165"/>
+    <Alias brand="Avery" part="J8165"/>
+    <Alias brand="Avery" part="L7165"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7169 family: shipping labels, 99.1 x 139.0 mm, 4 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Avery   7169" size="A4" _description="Shipping labels">
+  <Template brand="Avery" part="7169" size="A4" _description="Shipping labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="280.9" height="394.0" round="6">
       <Markup-margin size="6"/>
       <Layout nx="2" ny="2" x0="14.2" y0="20.0" dx="287.7" dy="394.0"/>
     </Label-rectangle>
-    <Alias name="Avery  L7169"/>
+    <Alias brand="Avery" part="L7169"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7414 family: Business Cards, 52mm x 90mm, 10 per sheet        -->
   <!-- =================================================================== -->
-  <Template name="Avery   7414" size="A4" _description="Business Cards">
+  <Template brand="Avery" part="7414" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="255.1" height="147.4" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="42.51" y0="52.44" dx="255.1" dy="147.4"/>
     </Label-rectangle>
-    <Alias name="Avery  L7414"/>
+    <Alias brand="Avery" part="L7414"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 7664 family: Diskette Labels, 70mm x 71.9 mm, 8 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery   7664" size="A4" description="Diskette Labels">
+  <Template brand="Avery" part="7664" size="A4" description="Diskette Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="70mm" height="71.9mm" round="2.5mm">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="4" x0="17mm" y0="5mm" dx="104.5mm" dy="72mm"/> 
     </Label-rectangle>
-    <Alias name="Avery  L7664"/>
+    <Alias brand="Avery" part="L7664"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery L7676 family: CD/DVD Labels, 2 per sheet                      -->
   <!-- =================================================================== -->
-  <Template name="Avery L7676" size="A4" _description="CD/DVD Labels">
+  <Template brand="Avery" part="L7676" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.827pt" hole="24.9449pt" waste="5.66929pt">
@@ -158,36 +158,36 @@
   <!-- =================================================================== -->
   <!-- Avery 8414 family: Business Cards, 50.8 x 87.0 mm, 10 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery   8414" size="A4" _description="Business Cards">
+  <Template brand="Avery" part="8414" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="246.6" height="144" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="42" y0="57.890" dx="264" dy="144"/>
     </Label-rectangle>
-    <Alias name="Avery  J8414"/>
+    <Alias brand="Avery" part="J8414"/>
   </Template>
 
   <!-- =============================================================== -->
   <!-- Avery J8435: CD Inlets Booklet part                         -->
   <!-- =============================================================== -->
-  <Template name="Avery   8435A" size="A4" _description="CD Booklet">
+  <Template brand="Avery" part="8435A" size="A4" _description="CD Booklet">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="125mm" round="0">
       <Markup-margin size="2mm"/>
       <Markup-line x1="32mm" y1="0mm" x2="32mm" y2="125mm"/>
       <Layout nx="1" ny="1" x0="27.5mm" y0="22mm" dx="155mm" dy="125mm"/>
     </Label-rectangle>
-    <Alias name="Avery  J8435A"/>
-    <Alias name="Avery  32250A"/>
-    <Alias name="Zweckform 32250A"/>
-    <Alias name="Zweckform J8435A"/>
+    <Alias brand="Avery" part="J8435A"/>
+    <Alias brand="Avery" part="32250A"/>
+    <Alias brand="Zweckform" part="32250A"/>
+    <Alias brand="Zweckform" part="J8435A"/>
   </Template>
 
   <!-- =============================================================== -->
   <!-- Avery J8435: CD Inlets Inlet part                           -->
   <!-- =============================================================== -->
-  <Template name="Avery   8435B" size="A4" _description="CD Inlet">
+  <Template brand="Avery" part="8435B" size="A4" _description="CD Inlet">
     <Meta category="media"/>
     <Label-rectangle id="0" width="155mm" height="122mm" round="0">
       <Markup-margin size="2mm"/>
@@ -195,59 +195,59 @@
       <Markup-line x1="146.5mm" y1="0mm" x2="146.5mm" y2="122mm"/>
       <Layout nx="1" ny="1" x0="27.5mm" y0="21mm" dx="155mm" dy="122mm"/>
     </Label-rectangle>
-    <Alias name="Avery  J8435B"/>
-    <Alias name="Avery  32250B"/>
-    <Alias name="Zweckform 32250B"/>
-    <Alias name="Zweckform J8435B"/>
+    <Alias brand="Avery" part="J8435B"/>
+    <Alias brand="Avery" part="32250B"/>
+    <Alias brand="Zweckform" part="32250B"/>
+    <Alias brand="Zweckform" part="J8435B"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 8651 family: Mailing labels, 38.1 x 21.2 mm, 65 per sheet     -->
   <!-- =================================================================== -->
-  <Template name="Avery   8651" size="A4" _description="Mini Address Labels">
+  <Template brand="Avery" part="8651" size="A4" _description="Mini Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="108" height="60.09" round="5">
       <Markup-margin size="5"/>
       <Layout nx="5" ny="13" x0="13.32" y0="30.90" dx="115.09" dy="60.09"/>
     </Label-rectangle>
-    <Alias name="Avery  L8651"/>
-    <Alias name="Avery  J8651"/>
-    <Alias name="Avery  J8551"/>
-    <Alias name="Avery  L7651"/>
-    <Alias name="Avery  L7551"/>
+    <Alias brand="Avery" part="L8651"/>
+    <Alias brand="Avery" part="J8651"/>
+    <Alias brand="Avery" part="J8551"/>
+    <Alias brand="Avery" part="L7651"/>
+    <Alias brand="Avery" part="L7551"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 8666 family: Diskette labels (face only), 70 x 52 mm, 10 per  -->
   <!-- =================================================================== -->
-  <Template name="Avery   8666" size="A4" _description="Diskette labels">
+  <Template brand="Avery" part="8666" size="A4" _description="Diskette labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="198.4" height="147.4" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="66" y0="53" dx="264" dy="147"/>
     </Label-rectangle>
-    <Alias name="Avery  J8666"/>
+    <Alias brand="Avery" part="J8666"/>
   </Template>
 
   <!-- =============================================================== -->
   <!-- Avery J8676A: CD/DVD Labels 2 per sheet                         -->
   <!-- =============================================================== -->
-  <Template name="Avery   8676" size="A4" _description="CD/DVD Labels">
+  <Template brand="Avery" part="8676" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="17" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="130" y0="59.5" dx="0" dy="388"/>        
     </Label-cd>
-    <Alias name="Avery  J8676"/>
+    <Alias brand="Avery" part="J8676"/>
   </Template>
 
   <!-- =============================================================== -->
   <!-- Avery 18036 Mailing Labels, 70mm x 32mm, 27 per sheet           -->
   <!-- =============================================================== -->
-  <Template name="Avery  18036" size="A4" _description="Mailing Labels">
+  <Template brand="Avery" part="18036" size="A4" _description="Mailing Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="198" height="91" round="0">
@@ -259,15 +259,15 @@
   <!-- ============================================================ -->
   <!-- Avery 32015: Business Cards                                  -->
   <!-- ============================================================ -->
-  <Template name="Avery 32015" size="A4" _description="Business Cards">
+  <Template brand="Avery" part="32015" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="85mm" height="54mm" round="0mm">
       <Markup-margin size="5mm"/>
       <Layout nx="2" ny="4" x0="17mm" y0="31.5mm" dx="91mm" dy="60mm"/>
     </Label-rectangle>
-    <Alias name="Avery C32015"/>
-    <Alias name="Zwekform 32015"/>
+    <Alias brand="Avery" part="C32015"/>
+    <Alias brand="Zweckform" part="32015"/>
   </Template>
 
 
diff --git a/glabels2/data/templates/avery-other-templates.xml b/glabels2/data/templates/avery-other-templates.xml
index 542e0eeb..cc320dcc 100644
--- a/glabels2/data/templates/avery-other-templates.xml
+++ b/glabels2/data/templates/avery-other-templates.xml
@@ -9,7 +9,7 @@
   <!-- =================================================================== -->
   <!-- Avery 06141 family: File Folder Labels, 5/8'' x 2_3/4'', 7 per sheet-->
   <!-- =================================================================== -->
-  <Template name="Avery 06141" size="Other" width="207pt" height="351pt"
+  <Template brand="Avery" part="06141" size="Other" width="207pt" height="351pt"
             description="File Folder Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198pt" height="45pt" round="4.5pt" waste="0pt">
diff --git a/glabels2/data/templates/avery-us-templates.xml b/glabels2/data/templates/avery-us-templates.xml
index 9d3cdc57..11ada790 100644
--- a/glabels2/data/templates/avery-us-templates.xml
+++ b/glabels2/data/templates/avery-us-templates.xml
@@ -13,71 +13,71 @@
   <!-- =================================================================== -->
   <!-- Avery 5160 family: Address Labels, 1'' x 2_5/8'', 30 per sheet    x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5160" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5160" size="US-Letter" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="2.625in" height="1in" round="0.0625in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="3" ny="10" x0="0.1875in" y0="0.5in" dx="2.75in" dy="1in"/>
     </Label-rectangle>
-    <Alias name="Avery  5260"/>
-    <Alias name="Avery  5510"/>
-    <Alias name="Avery  5520"/>
-    <Alias name="Avery  5560"/>
-    <Alias name="Avery  5810"/>
-    <Alias name="Avery  5920"/>
-    <Alias name="Avery  5960"/>
-    <Alias name="Avery  5970"/>
-    <Alias name="Avery  5971"/>
-    <Alias name="Avery  5972"/>
-    <Alias name="Avery  5979"/>
-    <Alias name="Avery  5980"/>
-    <Alias name="Avery  6231"/>
-    <Alias name="Avery  6233"/>
-    <Alias name="Avery  6245"/>
-    <Alias name="Avery  6460"/>
-    <Alias name="Avery  6498"/>
-    <Alias name="Avery  8160"/>
-    <Alias name="Avery  8250"/>
-    <Alias name="Avery  8460"/>
-    <Alias name="Avery  8560"/>
-    <Alias name="Avery  8620"/>
-    <Alias name="Avery  8660"/>
-    <Alias name="Avery  8810"/>
-    <Alias name="Avery  8920"/>
-    <Alias name="Avery  8930"/>
-    <Alias name="Avery 15160"/>
-    <Alias name="Avery 18160"/>
-    <Alias name="Avery 18660"/>
-    <Alias name="Avery 25160"/>
+    <Alias brand="Avery" part="5260"/>
+    <Alias brand="Avery" part="5510"/>
+    <Alias brand="Avery" part="5520"/>
+    <Alias brand="Avery" part="5560"/>
+    <Alias brand="Avery" part="5810"/>
+    <Alias brand="Avery" part="5920"/>
+    <Alias brand="Avery" part="5960"/>
+    <Alias brand="Avery" part="5970"/>
+    <Alias brand="Avery" part="5971"/>
+    <Alias brand="Avery" part="5972"/>
+    <Alias brand="Avery" part="5979"/>
+    <Alias brand="Avery" part="5980"/>
+    <Alias brand="Avery" part="6231"/>
+    <Alias brand="Avery" part="6233"/>
+    <Alias brand="Avery" part="6245"/>
+    <Alias brand="Avery" part="6460"/>
+    <Alias brand="Avery" part="6498"/>
+    <Alias brand="Avery" part="8160"/>
+    <Alias brand="Avery" part="8250"/>
+    <Alias brand="Avery" part="8460"/>
+    <Alias brand="Avery" part="8560"/>
+    <Alias brand="Avery" part="8620"/>
+    <Alias brand="Avery" part="8660"/>
+    <Alias brand="Avery" part="8810"/>
+    <Alias brand="Avery" part="8920"/>
+    <Alias brand="Avery" part="8930"/>
+    <Alias brand="Avery" part="15160"/>
+    <Alias brand="Avery" part="18160"/>
+    <Alias brand="Avery" part="18660"/>
+    <Alias brand="Avery" part="25160"/>
     <!-- Look alikes -->
-    <Alias name="Maco ll5805"/>
-    <Alias name="Worldlabel OL875"/>
+    <Alias brand="Maco" part="ll5805"/>
+    <Alias brand="Worldlabel" part="OL875"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5161 family: Address Labels, 1'' x 4'', 20 per sheet        x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5161" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5161" size="US-Letter" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1in" round="0.0625in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="2" ny="10" x0="0.15625in" y0="0.5in" dx="4.1875in" dy="1in"/>
     </Label-rectangle>
-    <Alias name="Avery  5261"/>
-    <Alias name="Avery  5961"/>
-    <Alias name="Avery  8161"/>
-    <Alias name="Avery  8461"/>
-    <Alias name="Avery 18161"/>
+    <Alias brand="Avery" part="5261"/>
+    <Alias brand="Avery" part="5961"/>
+    <Alias brand="Avery" part="8161"/>
+    <Alias brand="Avery" part="8461"/>
+    <Alias brand="Avery" part="18161"/>
     <!-- Look alikes -->
-    <Alias name="Worldlabel OL75"/>
+    <Alias brand="Worldlabel" part="OL75"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5162 family: Address Labels, 1_1/3'' x 4'', 14 per sheet    x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5162" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="5162" size="US-Letter" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.333333333in" round="0.0625in">
@@ -85,41 +85,41 @@
       <Layout nx="2" ny="7"
               x0="0.15625in" y0="0.833333333in" dx="4.1875in" dy="1.333333333in"/>
     </Label-rectangle>
-    <Alias name="Avery  5262"/>
-    <Alias name="Avery  5512"/>
-    <Alias name="Avery  5522"/>
-    <Alias name="Avery  5922"/>
-    <Alias name="Avery  5962"/>
-    <Alias name="Avery  8162"/>
-    <Alias name="Avery  8252"/>
-    <Alias name="Avery  8462"/>
-    <Alias name="Avery  8662"/>
-    <Alias name="Avery  8922"/>
-    <Alias name="Avery  8932"/>
-    <Alias name="Avery 15162"/>
-    <Alias name="Avery 18162"/>
-    <Alias name="Avery 18662"/>
+    <Alias brand="Avery" part="5262"/>
+    <Alias brand="Avery" part="5512"/>
+    <Alias brand="Avery" part="5522"/>
+    <Alias brand="Avery" part="5922"/>
+    <Alias brand="Avery" part="5962"/>
+    <Alias brand="Avery" part="8162"/>
+    <Alias brand="Avery" part="8252"/>
+    <Alias brand="Avery" part="8462"/>
+    <Alias brand="Avery" part="8662"/>
+    <Alias brand="Avery" part="8922"/>
+    <Alias brand="Avery" part="8932"/>
+    <Alias brand="Avery" part="15162"/>
+    <Alias brand="Avery" part="18162"/>
+    <Alias brand="Avery" part="18662"/>
     <!-- Look alikes -->
-    <Alias name="Worldlabel OL100"/>
+    <Alias brand="Worldlabel" part="OL100"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 6879 family: Address Labels, 1_1/4'' x 3_3/4'', 12 per sheetx -->
   <!-- =================================================================== -->
-  <Template name="Avery  6879" size="US-Letter" _description="Address Labels">
+  <Template brand="Avery" part="6879" size="US-Letter" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.75in" height="1.25in" round="0.0625in" waste="5pt">
       <Markup-margin size="0.0625in"/>
       <Layout nx="2" ny="6" x0="0.375in" y0="1.125in" dx="4in" dy="1.5in"/>
     </Label-rectangle>
-    <Alias name="Avery  8769"/>
+    <Alias brand="Avery" part="8769"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5159 family: Address Labels, 1_1/2'' x 4'', 14 per sheet      -->
   <!-- =================================================================== -->
-  <Template name="Avery  5159" size="US-Letter" description="Address Labels">
+  <Template brand="Avery" part="5159" size="US-Letter" description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="1.5in" round="0.0625in" waste="0in">
@@ -131,59 +131,59 @@
   <!-- =================================================================== -->
   <!-- Avery 5163 family: Shipping Labels, 4'' x 2'', 10 per sheet       x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5163" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="5163" size="US-Letter" _description="Shipping Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="2in" round="0.125in">
       <Markup-margin size="0.125in"/>
       <Layout nx="2" ny="5" x0="0.1625in" y0="0.5in" dx="4.1875in" dy="2in"/>
     </Label-rectangle>
-    <Alias name="Avery  5263"/>
-    <Alias name="Avery  5513"/>
-    <Alias name="Avery  5523"/>
-    <Alias name="Avery  5795"/>
-    <Alias name="Avery  5923"/>
-    <Alias name="Avery  5963"/>
-    <Alias name="Avery  5978"/>
-    <Alias name="Avery  8163"/>
-    <Alias name="Avery  8253"/>
-    <Alias name="Avery  8463"/>
-    <Alias name="Avery  8663"/>
-    <Alias name="Avery  8763"/>
-    <Alias name="Avery  8923"/>
-    <Alias name="Avery 15163"/>
-    <Alias name="Avery 18163"/>
-    <Alias name="Avery 18663"/>
+    <Alias brand="Avery" part="5263"/>
+    <Alias brand="Avery" part="5513"/>
+    <Alias brand="Avery" part="5523"/>
+    <Alias brand="Avery" part="5795"/>
+    <Alias brand="Avery" part="5923"/>
+    <Alias brand="Avery" part="5963"/>
+    <Alias brand="Avery" part="5978"/>
+    <Alias brand="Avery" part="8163"/>
+    <Alias brand="Avery" part="8253"/>
+    <Alias brand="Avery" part="8463"/>
+    <Alias brand="Avery" part="8663"/>
+    <Alias brand="Avery" part="8763"/>
+    <Alias brand="Avery" part="8923"/>
+    <Alias brand="Avery" part="15163"/>
+    <Alias brand="Avery" part="18163"/>
+    <Alias brand="Avery" part="18663"/>
     <!-- Look alikes -->
-    <Alias name="Worldlabel OL125"/>
+    <Alias brand="Worldlabel" part="OL125"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5164 family: Shipping Labels. 4'' x 3_1/3'', 6 per sheet    x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5164" size="US-Letter" _description="Shipping Labels">
+  <Template brand="Avery" part="5164" size="US-Letter" _description="Shipping Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="4in" height="3.333333333in" round="0.125in">
       <Markup-margin size="0.125in"/>
       <Layout nx="2" ny="3" x0="0.15625in" y0="0.5in" dx="4.1875in" dy="3.333333333in"/>
     </Label-rectangle>
-    <Alias name="Avery  5264"/>
-    <Alias name="Avery  5514"/>
-    <Alias name="Avery  5524"/>
-    <Alias name="Avery  6464"/>
-    <Alias name="Avery  6499"/>
-    <Alias name="Avery  8164"/>
-    <Alias name="Avery  8254"/>
-    <Alias name="Avery  8464"/>
+    <Alias brand="Avery" part="5264"/>
+    <Alias brand="Avery" part="5514"/>
+    <Alias brand="Avery" part="5524"/>
+    <Alias brand="Avery" part="6464"/>
+    <Alias brand="Avery" part="6499"/>
+    <Alias brand="Avery" part="8164"/>
+    <Alias brand="Avery" part="8254"/>
+    <Alias brand="Avery" part="8464"/>
     <!-- Look alikes -->
-    <Alias name="Worldlabel OL150"/>
+    <Alias brand="Worldlabel" part="OL150"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5168 family:  Shipping Labels 5'' x 3_1/2'', 4 per sheet      -->
   <!-- =================================================================== -->
-  <Template name="Avery  5168" size="US-Letter" description="Shipping Labels">
+  <Template brand="Avery" part="5168" size="US-Letter" description="Shipping Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="3.5in" height="5in" round="0.0625in" waste="0in">
@@ -195,177 +195,177 @@
   <!-- =================================================================== -->
   <!-- Avery 5167 family: Address Labels, 1_3/4'' x 1/2'', 80 per sheet  x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5167" size="US-Letter" _description="Return Address Labels">
+  <Template brand="Avery" part="5167" size="US-Letter" _description="Return Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="1.75in" height="0.5in" round="0.0625in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="4" ny="20" x0="0.28125in" y0="0.5in" dx="2.0625in" dy="0.5in"/>
     </Label-rectangle>
-    <Alias name="Avery  5267"/>
-    <Alias name="Avery  5667"/>
-    <Alias name="Avery  5927"/>
-    <Alias name="Avery  6467"/>
-    <Alias name="Avery  6504"/>
-    <Alias name="Avery  8167"/>
-    <Alias name="Avery  8567"/>
-    <Alias name="Avery  8667"/>
-    <Alias name="Avery  8927"/>
-    <Alias name="Avery 15167"/>
-    <Alias name="Avery 15267"/>
-    <Alias name="Avery 18167"/>
-    <Alias name="Avery 18667"/>
+    <Alias brand="Avery" part="5267"/>
+    <Alias brand="Avery" part="5667"/>
+    <Alias brand="Avery" part="5927"/>
+    <Alias brand="Avery" part="6467"/>
+    <Alias brand="Avery" part="6504"/>
+    <Alias brand="Avery" part="8167"/>
+    <Alias brand="Avery" part="8567"/>
+    <Alias brand="Avery" part="8667"/>
+    <Alias brand="Avery" part="8927"/>
+    <Alias brand="Avery" part="15167"/>
+    <Alias brand="Avery" part="15267"/>
+    <Alias brand="Avery" part="18167"/>
+    <Alias brand="Avery" part="18667"/>
     <!-- Look alikes -->
-    <Alias name="Worldlabel OL25"/>
+    <Alias brand="Worldlabel" part="OL25"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5196 family: Diskette Labels, 2_3/4'' x 2_3/4'', 9 per sheetx -->
   <!-- =================================================================== -->
-  <Template name="Avery  5196" size="US-Letter" _description="Diskette Labels">
+  <Template brand="Avery" part="5196" size="US-Letter" _description="Diskette Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="2.75in" height="2.75in" round="0.0625in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="3" ny="3" x0="0.125in" y0="0.5in" dx="2.75in" dy="3in"/>
     </Label-rectangle>
-    <Alias name="Avery  5096"/>
-    <Alias name="Avery  5896"/>
-    <Alias name="Avery  5996"/>
-    <Alias name="Avery  8196"/>
-    <Alias name="Avery  8197"/>
+    <Alias brand="Avery" part="5096"/>
+    <Alias brand="Avery" part="5896"/>
+    <Alias brand="Avery" part="5996"/>
+    <Alias brand="Avery" part="8196"/>
+    <Alias brand="Avery" part="8197"/>
     <!-- Look alikes -->
-    <Alias name="Worldlabel OL225"/>
+    <Alias brand="Worldlabel" part="OL225"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5294 family: Round Labels, 12 per sheet.                      -->
   <!-- =================================================================== -->
-  <Template name="Avery  5294" size="US-Letter" description="Round Labels">
+  <Template brand="Avery" part="5294" size="US-Letter" description="Round Labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="90pt" waste="0pt">
       <Markup-margin size="7.2pt"/>
       <Layout nx="3" ny="4" x0="15.12pt" y0="30.6pt" dx="198pt" dy="181.08pt"/>
     </Label-round>
-    <Alias name="Maco ML-1225"/>
+    <Alias brand="Maco" part="ML-1225"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 6490 family: Diskette Labels, 2_11/16'' x 2'', 15 per sheet x -->
   <!-- =================================================================== -->
-  <Template name="Avery  6490" size="US-Letter" _description="Diskette Labels">
+  <Template brand="Avery" part="6490" size="US-Letter" _description="Diskette Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="2.6875in" height="2in" round="0.0625in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="3" ny="5" x0="0.125in" y0="0.5in" dx="2.78125in" dy="2in"/>
     </Label-rectangle>
-    <Alias name="Avery  6501"/>
-    <Alias name="Avery  6861"/>
-    <Alias name="Avery  8096"/>
+    <Alias brand="Avery" part="6501"/>
+    <Alias brand="Avery" part="6861"/>
+    <Alias brand="Avery" part="8096"/>
   </Template> 
 
   <!-- =================================================================== -->
   <!-- Avery 5366 family: Filing Labels, 2/3'' x 3_7/16'', 30 per sheet  x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5366" size="US-Letter" _description="Filing Labels">
+  <Template brand="Avery" part="5366" size="US-Letter" _description="Filing Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="3.4375in" height="0.666666667in" round="0.0625in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="2" ny="15" x0="0.53125in" y0="0.5in" dx="4in" dy="0.666666667in"/>
     </Label-rectangle>
-    <Alias name="Avery  5066"/>
-    <Alias name="Avery  5166"/>
-    <Alias name="Avery  5266"/>
-    <Alias name="Avery  5268"/>
-    <Alias name="Avery  5368"/>
-    <Alias name="Avery  5378"/>
-    <Alias name="Avery  5666"/>
-    <Alias name="Avery  5766"/>
-    <Alias name="Avery  5866"/>
-    <Alias name="Avery  5966"/>
-    <Alias name="Avery  6368"/>
-    <Alias name="Avery  6466"/>
-    <Alias name="Avery  6468"/>
-    <Alias name="Avery  6500"/>
-    <Alias name="Avery  6505"/>
-    <Alias name="Avery  6865"/>
-    <Alias name="Avery  8066"/>
-    <Alias name="Avery  8166"/>
-    <Alias name="Avery  8366"/>
-    <Alias name="Avery  8478"/>
+    <Alias brand="Avery" part="5066"/>
+    <Alias brand="Avery" part="5166"/>
+    <Alias brand="Avery" part="5266"/>
+    <Alias brand="Avery" part="5268"/>
+    <Alias brand="Avery" part="5368"/>
+    <Alias brand="Avery" part="5378"/>
+    <Alias brand="Avery" part="5666"/>
+    <Alias brand="Avery" part="5766"/>
+    <Alias brand="Avery" part="5866"/>
+    <Alias brand="Avery" part="5966"/>
+    <Alias brand="Avery" part="6368"/>
+    <Alias brand="Avery" part="6466"/>
+    <Alias brand="Avery" part="6468"/>
+    <Alias brand="Avery" part="6500"/>
+    <Alias brand="Avery" part="6505"/>
+    <Alias brand="Avery" part="6865"/>
+    <Alias brand="Avery" part="8066"/>
+    <Alias brand="Avery" part="8166"/>
+    <Alias brand="Avery" part="8366"/>
+    <Alias brand="Avery" part="8478"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5371 family: Business Cards, 2'' x 3_1/2'', 10 per sheet    x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5371" size="US-Letter" _description="Business Cards">
+  <Template brand="Avery" part="5371" size="US-Letter" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="3.5in" height="2in" round="0">
       <Markup-margin size="0.0625in"/>
       <Layout nx="2" ny="5" x0="0.75in" y0="0.5in" dx="3.5in" dy="2in"/>
     </Label-rectangle>
-    <Alias name="Avery  5372"/>
-    <Alias name="Avery  5376"/>
-    <Alias name="Avery  5377"/>
-    <Alias name="Avery  5871"/>
-    <Alias name="Avery  5872"/>
-    <Alias name="Avery  5873"/>
-    <Alias name="Avery  5876"/>
-    <Alias name="Avery  5877"/>
-    <Alias name="Avery  5878"/>
-    <Alias name="Avery  5911"/>
-    <Alias name="Avery  6235"/>
-    <Alias name="Avery  8271"/>
-    <Alias name="Avery  8371"/>
-    <Alias name="Avery  8372"/>
-    <Alias name="Avery  8374"/>
-    <Alias name="Avery  8376"/>
-    <Alias name="Avery  8377"/>
-    <Alias name="Avery  8379"/>
-    <Alias name="Avery  8471"/>
-    <Alias name="Avery  8476"/>
-    <Alias name="Avery  8571"/>
-    <Alias name="Avery  8871"/>
-    <Alias name="Avery  8872"/>
-    <Alias name="Avery  8873"/>
-    <Alias name="Avery  8876"/>
-    <Alias name="Avery  8877"/>
-    <Alias name="Avery  8878"/>
-    <Alias name="Avery  8879"/>
-    <Alias name="Avery 25371"/>
-    <Alias name="Avery 26550"/>
-    <Alias name="Avery 26551"/>
-    <Alias name="Avery 27870"/>
-    <Alias name="Avery 27876"/>
-    <Alias name="Avery 27871"/>
-    <Alias name="Avery 27881"/>
-    <Alias name="Avery 27882"/>
-    <Alias name="Avery 28371"/>
-    <Alias name="Avery 28373"/>
-    <Alias name="Avery 28876"/>
-    <Alias name="Avery 28877"/>
+    <Alias brand="Avery" part="5372"/>
+    <Alias brand="Avery" part="5376"/>
+    <Alias brand="Avery" part="5377"/>
+    <Alias brand="Avery" part="5871"/>
+    <Alias brand="Avery" part="5872"/>
+    <Alias brand="Avery" part="5873"/>
+    <Alias brand="Avery" part="5876"/>
+    <Alias brand="Avery" part="5877"/>
+    <Alias brand="Avery" part="5878"/>
+    <Alias brand="Avery" part="5911"/>
+    <Alias brand="Avery" part="6235"/>
+    <Alias brand="Avery" part="8271"/>
+    <Alias brand="Avery" part="8371"/>
+    <Alias brand="Avery" part="8372"/>
+    <Alias brand="Avery" part="8374"/>
+    <Alias brand="Avery" part="8376"/>
+    <Alias brand="Avery" part="8377"/>
+    <Alias brand="Avery" part="8379"/>
+    <Alias brand="Avery" part="8471"/>
+    <Alias brand="Avery" part="8476"/>
+    <Alias brand="Avery" part="8571"/>
+    <Alias brand="Avery" part="8871"/>
+    <Alias brand="Avery" part="8872"/>
+    <Alias brand="Avery" part="8873"/>
+    <Alias brand="Avery" part="8876"/>
+    <Alias brand="Avery" part="8877"/>
+    <Alias brand="Avery" part="8878"/>
+    <Alias brand="Avery" part="8879"/>
+    <Alias brand="Avery" part="25371"/>
+    <Alias brand="Avery" part="26550"/>
+    <Alias brand="Avery" part="26551"/>
+    <Alias brand="Avery" part="27870"/>
+    <Alias brand="Avery" part="27876"/>
+    <Alias brand="Avery" part="27871"/>
+    <Alias brand="Avery" part="27881"/>
+    <Alias brand="Avery" part="27882"/>
+    <Alias brand="Avery" part="28371"/>
+    <Alias brand="Avery" part="28373"/>
+    <Alias brand="Avery" part="28876"/>
+    <Alias brand="Avery" part="28877"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5388 family: Index Cards, 5'' x 3'', 3 per sheet              -->
   <!-- =================================================================== -->
-  <Template name="Avery  5388" size="US-Letter" description="Index Cards">
+  <Template brand="Avery" part="5388" size="US-Letter" description="Index Cards">
     <Meta category="card"/>
     <Label-rectangle id="0" width="5in" height="3in" round="0pt" waste="0pt">
       <Markup-margin size="0.125in"/>
       <Layout nx="1" ny="3" x0="1.75in" y0="1in" dx="5in" dy="3in"/>
     </Label-rectangle>
-    <Alias name="Avery  5386"/>
-    <Alias name="Avery  8388"/>
+    <Alias brand="Avery" part="5386"/>
+    <Alias brand="Avery" part="8388"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5389 family: Post Cards, 6'' x 4'', 2 per sheet               -->
   <!-- =================================================================== -->
-  <Template name="Avery  5389" size="US-Letter" description="Post cards">
+  <Template brand="Avery" part="5389" size="US-Letter" description="Post cards">
     <Meta category="card"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="6in" height="4in" round="0pt" waste="0pt">
@@ -377,37 +377,37 @@
   <!-- =================================================================== -->
   <!-- Avery 8373 family: Business Cards, 2'' x 3_1/2'', 8 per sheet     x -->
   <!-- =================================================================== -->
-  <Template name="Avery  8373" size="US-Letter" _description="Business Cards">
+  <Template brand="Avery" part="8373" size="US-Letter" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="3.5in" height="2in" round="0" waste="0.0625in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="2" ny="4" x0="0.5in" y0="0.75in" dx="4in" dy="2.5in"/>
     </Label-rectangle>
-    <Alias name="Avery  3612"/>
-    <Alias name="Avery  5881"/>
-    <Alias name="Avery 28373"/>
+    <Alias brand="Avery" part="3612"/>
+    <Alias brand="Avery" part="5881"/>
+    <Alias brand="Avery" part="28373"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5395 family: Name Badge Labels, 2_1/3'' x 3_3/8'', 8 per sheetx -->
   <!-- =================================================================== -->
-  <Template name="Avery  5395" size="US-Letter" _description="Name Badge Labels">
+  <Template brand="Avery" part="5395" size="US-Letter" _description="Name Badge Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="3.375in" height="2.333333333in" round="0.1875in" waste="0.0625in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="2" ny="4" x0="0.6875in" y0="0.583333333in" dx="3.75in" dy="2.5in"/>
     </Label-rectangle>
-    <Alias name="Avery  5095"/>
-    <Alias name="Avery  5895"/>
-    <Alias name="Avery  8395"/>
-    <Alias name="Avery 15395"/>
+    <Alias brand="Avery" part="5095"/>
+    <Alias brand="Avery" part="5895"/>
+    <Alias brand="Avery" part="8395"/>
+    <Alias brand="Avery" part="15395"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5824 family: CD/DVD Labels (face only), 2 per sheet         * -->
   <!-- =================================================================== -->
-  <Template name="Avery  5824" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="Avery" part="5824" size="US-Letter" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -419,7 +419,7 @@
   <!-- =================================================================== -->
   <!-- Avery 5931 family: CD/DVD Labels (face only), 2 per sheet         x -->
   <!-- =================================================================== -->
-  <Template name="Avery  5931-Disc" size="US-Letter"
+  <Template brand="Avery" part="5931-Disc" size="US-Letter"
          _description="CD/DVD Labels (Disc Labels)">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -431,64 +431,64 @@
       <Markup-line x1="2.3125in" y1="3.125in" x2="2.3125in" y2="4.625in"/>
       <Layout nx="1" ny="2" x0="1.9375in" y0="0.6875in" dx="0" dy="5in"/>
     </Label-cd>
-    <Alias name="Avery  5691-Disc"/>
-    <Alias name="Avery  5692-Disc"/>
-    <Alias name="Avery  5694-Disc"/>
-    <Alias name="Avery  5698-Disc"/>
-    <Alias name="Avery  6692-Disc"/>
-    <Alias name="Avery  8536-Disc"/>
-    <Alias name="Avery  8691-Disc"/>
-    <Alias name="Avery  8692-Disc"/>
-    <Alias name="Avery  8694-Disc"/>
-    <Alias name="Avery  8695-Disc"/>
-    <Alias name="Avery  8699-Disc"/>
-    <Alias name="Avery  8831-Disc"/>
-    <Alias name="Avery  8832-Disc"/>
-    <Alias name="Avery  8842-Disc"/>
-    <Alias name="Avery  8844-Disc"/>
-    <Alias name="Avery  8846-Disc"/>
-    <Alias name="Avery  8847-Disc"/>
-    <Alias name="Avery  8931-Disc"/>
-    <Alias name="Avery  8941-Disc"/>
-    <Alias name="Avery  8942-Disc"/>
+    <Alias brand="Avery" part="5691-Disc"/>
+    <Alias brand="Avery" part="5692-Disc"/>
+    <Alias brand="Avery" part="5694-Disc"/>
+    <Alias brand="Avery" part="5698-Disc"/>
+    <Alias brand="Avery" part="6692-Disc"/>
+    <Alias brand="Avery" part="8536-Disc"/>
+    <Alias brand="Avery" part="8691-Disc"/>
+    <Alias brand="Avery" part="8692-Disc"/>
+    <Alias brand="Avery" part="8694-Disc"/>
+    <Alias brand="Avery" part="8695-Disc"/>
+    <Alias brand="Avery" part="8699-Disc"/>
+    <Alias brand="Avery" part="8831-Disc"/>
+    <Alias brand="Avery" part="8832-Disc"/>
+    <Alias brand="Avery" part="8842-Disc"/>
+    <Alias brand="Avery" part="8844-Disc"/>
+    <Alias brand="Avery" part="8846-Disc"/>
+    <Alias brand="Avery" part="8847-Disc"/>
+    <Alias brand="Avery" part="8931-Disc"/>
+    <Alias brand="Avery" part="8941-Disc"/>
+    <Alias brand="Avery" part="8942-Disc"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5931 family: CD/DVD Labels (spine only), 4 per sheet        x -->
   <!-- =================================================================== -->
-  <Template name="Avery 5931-Spine" size="US-Letter" 
+  <Template brand="Avery" part="5931-Spine" size="US-Letter" 
          _description="CD/DVD Labels (Spine Labels)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="0.21875in" height="4.6875in" round="0.0625in" waste="0.0625in">
       <Layout nx="2" ny="2" x0="0.5in" y0="0.734375in" dx="0.46875in" dy="4.84375in"/>
     </Label-rectangle>
-    <Alias name="Avery  5691-Spine"/>
-    <Alias name="Avery  5692-Spine"/>
-    <Alias name="Avery  5694-Spine"/>
-    <Alias name="Avery  5698-Spine"/>
-    <Alias name="Avery  6692-Spine"/>
-    <Alias name="Avery  8536-Spine"/>
-    <Alias name="Avery  8691-Spine"/>
-    <Alias name="Avery  8692-Spine"/>
-    <Alias name="Avery  8694-Spine"/>
-    <Alias name="Avery  8695-Spine"/>
-    <Alias name="Avery  8699-Spine"/>
-    <Alias name="Avery  8831-Spine"/>
-    <Alias name="Avery  8832-Spine"/>
-    <Alias name="Avery  8842-Spine"/>
-    <Alias name="Avery  8844-Spine"/>
-    <Alias name="Avery  8846-Spine"/>
-    <Alias name="Avery  8847-Spine"/>
-    <Alias name="Avery  8931-Spine"/>
-    <Alias name="Avery  8941-Spine"/>
-    <Alias name="Avery  8942-Spine"/>
+    <Alias brand="Avery" part="5691-Spine"/>
+    <Alias brand="Avery" part="5692-Spine"/>
+    <Alias brand="Avery" part="5694-Spine"/>
+    <Alias brand="Avery" part="5698-Spine"/>
+    <Alias brand="Avery" part="6692-Spine"/>
+    <Alias brand="Avery" part="8536-Spine"/>
+    <Alias brand="Avery" part="8691-Spine"/>
+    <Alias brand="Avery" part="8692-Spine"/>
+    <Alias brand="Avery" part="8694-Spine"/>
+    <Alias brand="Avery" part="8695-Spine"/>
+    <Alias brand="Avery" part="8699-Spine"/>
+    <Alias brand="Avery" part="8831-Spine"/>
+    <Alias brand="Avery" part="8832-Spine"/>
+    <Alias brand="Avery" part="8842-Spine"/>
+    <Alias brand="Avery" part="8844-Spine"/>
+    <Alias brand="Avery" part="8846-Spine"/>
+    <Alias brand="Avery" part="8847-Spine"/>
+    <Alias brand="Avery" part="8931-Spine"/>
+    <Alias brand="Avery" part="8941-Spine"/>
+    <Alias brand="Avery" part="8942-Spine"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5997face family: VCR Labels, 1_7/8'' x 3_1/16'', 10 per sheet -->
   <!-- =================================================================== -->
-  <Template name="Avery  5997-Face" size="US-Letter"
+  <Template brand="Avery" part="5997-Face" size="US-Letter"
          _description="Video Tape Face Labels">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -496,15 +496,15 @@
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="80" y0="60.5" dx="236" dy="133"/>
     </Label-rectangle>
-    <Alias name="Avery  5199-Face"/>
+    <Alias brand="Avery" part="5199-Face"/>
     <!-- Look alikes -->
-    <Alias name="Worldlabel OL1125"/>
+    <Alias brand="Worldlabel" part="OL1125"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 5997spine family: VCR Labels, 2/3'' x 5_3/4'',15 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Avery  5997-Spine" size="US-Letter"
+  <Template brand="Avery" part="5997-Spine" size="US-Letter"
         _description="Video Tape Spine Labels">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -512,15 +512,15 @@
       <Markup-margin size="5"/>
       <Layout nx="1" ny="15" x0="99" y0="36" dx="0" dy="48"/>
     </Label-rectangle>
-    <Alias name="Avery  5199-Spine"/>
+    <Alias brand="Avery" part="5199-Spine"/>
     <!-- Look alikes -->
-    <Alias name="Worldlabel OL1150"/>
+    <Alias brand="Worldlabel" part="OL1150"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 6570 family: ID Labels.                                       -->
   <!-- =================================================================== -->
-  <Template name="Avery  6570" size="US-Letter" _description="ID Labels">
+  <Template brand="Avery" part="6570" size="US-Letter" _description="ID Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="126pt" height="90pt" round="4.464pt" x_waste="6.768pt" y_waste="0pt">
       <Markup-margin size="9pt"/>
@@ -531,67 +531,67 @@
   <!-- =================================================================== -->
   <!-- Avery 8165 family: Full-page label, 8_1/2'' x 11'', 1 per sheet   x -->
   <!-- =================================================================== -->
-  <Template name="Avery  8165" size="US-Letter" _description="Full Sheet Labels">
+  <Template brand="Avery" part="8165" size="US-Letter" _description="Full Sheet Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="8.5in" height="11.in" round="0">
       <Markup-margin size="0.0625in"/>
       <Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
     </Label-rectangle>
-    <Alias name="Avery  3114"/>
-    <Alias name="Avery  3121"/>
-    <Alias name="Avery  3123"/>
-    <Alias name="Avery  3131"/>
-    <Alias name="Avery  3132"/>
-    <Alias name="Avery  3133"/>
-    <Alias name="Avery  3141"/>
-    <Alias name="Avery  3142"/>
-    <Alias name="Avery  3145"/>
-    <Alias name="Avery  3245"/>
-    <Alias name="Avery  3246"/>
-    <Alias name="Avery  3247"/>
-    <Alias name="Avery  3255"/>
-    <Alias name="Avery  3267"/>
-    <Alias name="Avery  3270"/>
-    <Alias name="Avery  3271"/>
-    <Alias name="Avery  3272"/>
-    <Alias name="Avery  3275"/>
-    <Alias name="Avery  3276"/>
-    <Alias name="Avery  3277"/>
-    <Alias name="Avery  3614"/>
-    <Alias name="Avery  3625"/>
-    <Alias name="Avery  3641"/>
-    <Alias name="Avery  3651"/>
-    <Alias name="Avery  5165"/>
-    <Alias name="Avery  5177"/>
-    <Alias name="Avery  5182"/>
-    <Alias name="Avery  5265"/>
-    <Alias name="Avery  5277"/>
-    <Alias name="Avery  5282"/>
-    <Alias name="Avery  5884"/>
-    <Alias name="Avery  5975"/>
-    <Alias name="Avery  6465"/>
-    <Alias name="Avery  6503"/>
-    <Alias name="Avery  8255"/>
-    <Alias name="Avery  8314"/>
-    <Alias name="Avery  8324"/>
-    <Alias name="Avery  8384"/>
-    <Alias name="Avery  8465"/>
-    <Alias name="Avery  8665"/>
-    <Alias name="Avery 53205"/>
-    <Alias name="Avery 53211"/>
-    <Alias name="Avery 53230"/>
-    <Alias name="Avery 53240"/>
-    <Alias name="Avery 75287"/>
-    <Alias name="Avery 75299"/>
+    <Alias brand="Avery" part="3114"/>
+    <Alias brand="Avery" part="3121"/>
+    <Alias brand="Avery" part="3123"/>
+    <Alias brand="Avery" part="3131"/>
+    <Alias brand="Avery" part="3132"/>
+    <Alias brand="Avery" part="3133"/>
+    <Alias brand="Avery" part="3141"/>
+    <Alias brand="Avery" part="3142"/>
+    <Alias brand="Avery" part="3145"/>
+    <Alias brand="Avery" part="3245"/>
+    <Alias brand="Avery" part="3246"/>
+    <Alias brand="Avery" part="3247"/>
+    <Alias brand="Avery" part="3255"/>
+    <Alias brand="Avery" part="3267"/>
+    <Alias brand="Avery" part="3270"/>
+    <Alias brand="Avery" part="3271"/>
+    <Alias brand="Avery" part="3272"/>
+    <Alias brand="Avery" part="3275"/>
+    <Alias brand="Avery" part="3276"/>
+    <Alias brand="Avery" part="3277"/>
+    <Alias brand="Avery" part="3614"/>
+    <Alias brand="Avery" part="3625"/>
+    <Alias brand="Avery" part="3641"/>
+    <Alias brand="Avery" part="3651"/>
+    <Alias brand="Avery" part="5165"/>
+    <Alias brand="Avery" part="5177"/>
+    <Alias brand="Avery" part="5182"/>
+    <Alias brand="Avery" part="5265"/>
+    <Alias brand="Avery" part="5277"/>
+    <Alias brand="Avery" part="5282"/>
+    <Alias brand="Avery" part="5884"/>
+    <Alias brand="Avery" part="5975"/>
+    <Alias brand="Avery" part="6465"/>
+    <Alias brand="Avery" part="6503"/>
+    <Alias brand="Avery" part="8255"/>
+    <Alias brand="Avery" part="8314"/>
+    <Alias brand="Avery" part="8324"/>
+    <Alias brand="Avery" part="8384"/>
+    <Alias brand="Avery" part="8465"/>
+    <Alias brand="Avery" part="8665"/>
+    <Alias brand="Avery" part="53205"/>
+    <Alias brand="Avery" part="53211"/>
+    <Alias brand="Avery" part="53230"/>
+    <Alias brand="Avery" part="53240"/>
+    <Alias brand="Avery" part="75287"/>
+    <Alias brand="Avery" part="75299"/>
     <!-- Look alikes -->
-    <Alias name="IP Invent It! #00064-3"/>
-    <Alias name="Worldlabel OL175"/>
+    <Alias brand="IP Invent It!" part="#00064-3"/>
+    <Alias brand="Worldlabel" part="OL175"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 8960 family: CD/DVD Labels.                                   -->
   <!-- =================================================================== -->
-  <Template name="Avery  8960" size="US-Letter" _description="CD/DVD Labels">
+  <Template brand="Avery" part="8960" size="US-Letter" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="14.1732pt" waste="9.07087pt">
@@ -603,7 +603,7 @@
   <!-- =================================================================== -->
   <!-- Avery 3274.1 family: Square stickers, 2_1/2'' x 2_1/2, 9 per sheetx  -->
   <!-- =================================================================== -->
-  <Template name="Avery  3274.1" size="US-Letter" _description="Square Labels">
+  <Template brand="Avery" part="3274.1" size="US-Letter" _description="Square Labels">
     <Meta category="label"/>
     <Meta category="square-label"/>
     <Meta category="rectangle-label"/>
@@ -611,27 +611,27 @@
       <Markup-margin size="0.0625in"/>
       <Layout nx="3" ny="3" x0="0.3125in" y0="1.25in" dx="2.6875in" dy="3in"/>
     </Label-rectangle>
-    <Alias name="Avery  3111"/>
+    <Alias brand="Avery" part="3111"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 3274.2 family: Small round stickers, 1_1/2'', 20 per sheet  x -->
   <!-- =================================================================== -->
-  <Template name="Avery  3274.2" size="US-Letter" _description="Small Round Labels">
+  <Template brand="Avery" part="3274.2" size="US-Letter" _description="Small Round Labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="0.75in">
       <Markup-margin size="0.0625in"/>
       <Layout nx="4" ny="5" x0="0.5in" y0="0.75in" dx="2in" dy="2in"/>
     </Label-round>
-    <Alias name="Avery  3112"/>
-    <Alias name="Avery  8293"/>
+    <Alias brand="Avery" part="3112"/>
+    <Alias brand="Avery" part="8293"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Avery 3274.3 family: Large round stickers, 2_1/2'', 9 per sheet   x -->
   <!-- =================================================================== -->
-  <Template name="Avery  3274.3" size="US-Letter" _description="Large Round Labels">
+  <Template brand="Avery" part="3274.3" size="US-Letter" _description="Large Round Labels">
     <Meta category="label"/>
     <Meta category="round-label"/>
     <Label-round id="0" radius="1.25in">
@@ -645,7 +645,7 @@
   <!-- Avery labels in tech builitin 152 				    -->
   <!-- http://www.avery.com/help/tech_bulletin.jsp?tech_bull_code=152       -->
   <!-- ******************************************************************** -->
-  <Template name="Avery LSK-8" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-8" size="US-Letter" description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="1.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -653,14 +653,14 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template name="Avery LSK-8.5" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-8.5" size="US-Letter" description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="1" width="1.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="20" x0="0.5in" y0="0.5in" dx="2.13in" dy="0.5in"/>
     </Label-rectangle>
   </Template>
-  <Template name="Avery LSK-5" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-5" size="US-Letter" description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="2" width="1.75in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -668,14 +668,14 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template name="Avery LSK-5.5" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-5.5" size="US-Letter" description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="3" width="1.75in" height="0.5in" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="20" x0="0.5in" y0="0.3in" dx="2.05in" dy="0.5in"/>
     </Label-rectangle>
   </Template>
-  <Template name="Avery LSK-3" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-3" size="US-Letter" description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="4" width="3.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
@@ -683,7 +683,7 @@
     </Label-rectangle>
   </Template>
   <!-- the LSK labels can be torn in half down the center -->
-  <Template name="Avery LSK-3.5" size="US-Letter" description="Divider Labels">
+  <Template brand="Avery" part="LSK-3.5" size="US-Letter" description="Divider Labels">
     <Meta category="label"/>
     <Label-rectangle id="5" width="3.13in" height="0.5in" round="5">
       <Markup-margin size="5"/>
diff --git a/glabels2/data/templates/misc-iso-templates.xml b/glabels2/data/templates/misc-iso-templates.xml
index 10c61eb7..720a7dce 100644
--- a/glabels2/data/templates/misc-iso-templates.xml
+++ b/glabels2/data/templates/misc-iso-templates.xml
@@ -9,33 +9,34 @@
   <!-- =================================================================== -->
   <!-- Sigel LP 800/LP 801/LP 802: Business Cards, 55.0 x 85.0 mm, 10 per sheet   -->
   <!-- =================================================================== -->
-  <Template name="Sigel LP 800" size="A4" _description="Business Cards">
+  <Template brand="Sigel" part="LP 800" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="85.0mm" height="55.0mm" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="15.0mm" y0="10.0mm" dx="95.0mm" dy="55.0mm"/>
     </Label-rectangle>
-    <Alias name="Sigel LP 801"/>
-    <Alias name="Sigel LP 802"/>
+    <Alias brand="Sigel" part="LP 801"/>
+    <Alias brand="Sigel" part="LP 802"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Sigel DP 830/DP 930: Business Cards, 55.0 x 85.0 mm, 10 per sheet   -->
   <!-- =================================================================== -->
-  <Template name="Sigel DP 830/DP 930" size="A4" _description="Business Cards">
+  <Template brand="Sigel" part="DP 830" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="240.9" height="155.9" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="40" y0="31" dx="269" dy="156"/>
     </Label-rectangle>
+    <Alias brand="Sigel" part="DP 930"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Ascom A4/24/MKII: Rectangular Labels, 24 per sheet                  -->
   <!-- =================================================================== -->
-  <Template name="Ascom A4/24/MKII" size="A4" _description="Rectangular Labels">
+  <Template brand="Ascom" part="A4/24/MKII" size="A4" _description="Rectangular Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="181" height="96" round="10">
       <Markup-margin size="5"/>
@@ -46,8 +47,7 @@
   <!-- =================================================================== -->
   <!-- Agipa 119488: Business Cards, 50 x 90 mm, 10 per sheet              -->
   <!-- =================================================================== -->
-  <Template name="Agipa 119488" size="A4"
-	 _description="Agipa 119488: Business Cards">
+  <Template brand="Agipa" part="119488" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="255" height="142" round="0">
@@ -59,7 +59,7 @@
   <!-- =================================================================== -->
   <!-- Ednet BC: Business Cards, 51 x 89 mm, 10 per sheet                  -->
   <!-- =================================================================== -->
-  <Template name="Ednet BC" size="A4" _description="Business Cards">
+  <Template brand="Ednet" part="BC" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="253" height="145" round="0">
@@ -71,7 +71,7 @@
   <!-- =================================================================== -->
   <!-- Ednet 45021: Inkjet/Laser Labels 70x37mm                            -->
   <!-- =================================================================== -->
-  <Template name="Ednet 45021" size="A4" description="Inkjet/Laser Labels 70x37mm">
+  <Template brand="Ednet" part="45021" size="A4" description="Inkjet/Laser Labels 70x37mm">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198.425pt" height="104.882pt" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
@@ -82,7 +82,7 @@
   <!-- =================================================================== -->
   <!-- Herma 4620: Mailing Labels - 2 columns, 107 x 37 mm, 16 per sheet   -->
   <!-- =================================================================== -->
-  <Template name="Herma 4620" size="A4" _description="Mailing Labels-2 columns">
+  <Template brand="Herma" part="4620" size="A4" _description="Mailing Labels-2 columns">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="298" height="105" round="0">
@@ -94,7 +94,7 @@
   <!-- =================================================================== -->
   <!-- Herma 4464: Mailing Labels - 3 columns, 70 x 37.125 mm, 24 per sheet-->
   <!-- =================================================================== -->
-  <Template name="Herma 4464" size="A4" _description="Mailing Labels-3 columns">
+  <Template brand="Herma" part="4464" size="A4" _description="Mailing Labels-3 columns">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="199" height="105" round="0">
@@ -106,7 +106,7 @@
   <!-- =================================================================== -->
   <!-- Herma 5079: CD/DVD Labels, 2 per sheet                              -->
   <!-- =================================================================== -->
-  <Template name="Herma 5079" size="A4" description="CD/DVD Labels">
+  <Template brand="Herma" part="5079" size="A4" description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="164.409pt" hole="58.1102pt" waste="9pt">
@@ -118,7 +118,7 @@
   <!-- ===================================================================-->
   <!-- Neato brand CD/DVD Labels (face only), 2 per sheet                 -->
   <!-- ===================================================================-->
-  <Template name="Neato A4 CD" size="A4" _description="CD/DVD Labels (face only)">
+  <Template brand="Neato" part="A4 CD" size="A4" _description="CD/DVD Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -130,7 +130,7 @@
   <!-- =================================================================== -->
   <!-- DATA BECKER: Business Cards, 50 x 90 mm, 10 per sheet               -->
   <!-- =================================================================== -->
-  <Template name="DataBecker" size="A4" _description="Business Cards">
+  <Template brand="DataBecker" part="BC?" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="255" height="142" round="0">
@@ -142,7 +142,7 @@
   <!-- =================================================================== -->
   <!-- DATA BECKER 0491 Business Cards, 50 x 90 mm, 10 per sheet           -->
   <!-- =================================================================== -->
-  <Template name="DataBecker 0491" size="A4" _description="Business Cards">
+  <Template brand="DataBecker" part="0491" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="90mm" height="50mm" round="0">
@@ -154,7 +154,7 @@
   <!-- =================================================================== -->
   <!-- DATA BECKER 0526 Address Labels.                                    -->
   <!-- =================================================================== -->
-  <Template name="Databecker 0526" size="A4" _description="Address Labels">
+  <Template brand="DataBecker" part="0526" size="A4" _description="Address Labels">
     <Label-rectangle id="0" width="198.425pt" height="102.047pt" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="9pt"/>
       <Layout nx="3" ny="8" x0="3.93386e-16pt" y0="15.5906pt" dx="198.425pt" dy="102.047pt"/>
@@ -164,7 +164,7 @@
   <!-- =================================================================== -->
   <!-- DATA BECKER 0598 Address Labels.                                    -->
   <!-- =================================================================== -->
-  <Template name="Databecker 0598" size="A4" _description="Address Labels">
+  <Template brand="DataBecker" part="0598" size="A4" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="274.961pt" height="119.906pt" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -176,7 +176,7 @@
   <!-- =================================================================== -->
   <!-- Dataline 57125: Business Cards, 54.0 x 86.0 mm, 10 per sheet        -->
   <!-- =================================================================== -->
-  <Template name="Dataline 57125" size="A4" _description="Business Cards">
+  <Template brand="Dataline" part="57125" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="86.00mm" height="54.00mm" round="0">
@@ -188,7 +188,7 @@
   <!-- =================================================================== -->
   <!-- Hema Etiketten: 65 x 38 mm, 21 per sheet                            -->
   <!-- =================================================================== -->
-  <Template name="Hema Etiketten" size="A4" _description="Rectangular Labels">
+  <Template brand="Hema" part="Etiketten" size="A4" _description="Rectangular Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="178" height="108" round="5">
       <Markup-margin size="5"/>
@@ -199,7 +199,7 @@
   <!-- ====================================================== -->
   <!-- Alpi 02793: Business Cards, 50,8 x 90 mm, 10 per sheet -->
   <!-- ====================================================== -->
-  <Template name="Alpi 02793" size="A4" _description="Business Cards">
+  <Template brand="Alpi" part="02793" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="255.118" height="144" round="0">
@@ -211,7 +211,7 @@
   <!-- =================================================================== -->
   <!-- APLI 1999:  Mailing Labels, 9,9cm x 6,8cm, 8 per sheet              -->
   <!-- =================================================================== -->
-  <Template name="APLI 1999" size="A4" _description="Mailing Labels">
+  <Template brand="APLI" part="1999" size="A4" _description="Mailing Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="281" height="193" round="5">
@@ -223,148 +223,148 @@
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Ordnerrucken, 192 x 61,5 mm, 4 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Herma 4284" size="A4" _description="Arch File Labels (large)">
+  <Template brand="Herma" part="4284" size="A4" _description="Arch File Labels (large)">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252" height="174.331" round="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="4" x0="25.5118" y0="38.2677" dx="544.252" dy="197.008"/>
     </Label-rectangle>
-    <Alias name="Herma 5095"/>
-    <Alias name="Herma 5096"/>
+    <Alias brand="Herma" part="5095"/>
+    <Alias brand="Herma" part="5096"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Ordnerrucken, 192 x 39 mm, 6 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Herma 4283" size="A4" _description="Arch File Labels (small)">
+  <Template brand="Herma" part="4283" size="A4" _description="Arch File Labels (small)">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252" height="110.551" round="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="6" x0="25.5118" y0="32.5984" dx="544.252" dy="133.228"/>
     </Label-rectangle>
-    <Alias name="Herma 5090"/>
-    <Alias name="Herma 5091"/>
+    <Alias brand="Herma" part="5090"/>
+    <Alias brand="Herma" part="5091"/>
   </Template>
   
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Video Etiketten, 78,7 x 46,5 mm, 12 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Herma 4828" size="A4" _description="Video Labels (face only)">
+  <Template brand="Herma" part="4828" size="A4" _description="Video Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="223.086" height="131.811" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="6" x0="38.5512" y0="24.9449" dx="295.086" dy="131.811"/>
     </Label-rectangle>
-    <Alias name="Herma 5070"/>
+    <Alias brand="Herma" part="5070"/>
   </Template>
   
   <!-- =================================================================== -->
   <!-- Data Becker Etiketten Paket: Disketten Etiketten, 70 x 50,8 mm, 10 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Herma 8803" size="A4" _description="Diskette Labels (face only)">
+  <Template brand="Herma" part="8803" size="A4" _description="Diskette Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="198.425" height="144" round="5">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="60.9448" y0="60.9448" dx="270.425" dy="144"/>
     </Label-rectangle>
-    <Alias name="Herma 8839"/>
+    <Alias brand="Herma" part="8839"/>
   </Template>
   
   <!-- =================================================================== -->
   <!-- Otto Versand: Allzweck Etiketten, 38 x 21,2 mm, 65 per sheet        -->
   <!-- =================================================================== -->
-  <Template name="Herma 4606" size="A4" _description="Allround Labels">
+  <Template brand="Herma" part="4606" size="A4" _description="Allround Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="107.716" height="60.0945" round="0">
       <Markup-margin size="5"/>
       <Layout nx="5" ny="13" x0="26.9291" y0="29.7638" dx="107.716" dy="60.0945"/>
     </Label-rectangle>
-    <Alias name="Herma 4270"/>
+    <Alias brand="Herma" part="4270"/>
   </Template>
   
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Allzweck Etiketten, 48,3 x 16,9 mm           -->
   <!-- =================================================================== -->
-  <Template name="Herma 4607" size="A4" _description="Allround Labels">
+  <Template brand="Herma" part="4607" size="A4" _description="Allround Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="136.913" height="47.9055" round="0">
       <Markup-margin size="5"/>
       <Layout nx="4" ny="16" x0="24.0945" y0="39.6853" dx="136.913" dy="47.9055"/>
     </Label-rectangle>
-    <Alias name="Herma 4271"/>
+    <Alias brand="Herma" part="4271"/>
   </Template>
   
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Allzweck Etiketten, 48,3 x 25,4 mm, 44 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Herma 4608" size="A4" _description="Allround Labels">
+  <Template brand="Herma" part="4608" size="A4" _description="Allround Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="136.913" height="72" round="0">
       <Markup-margin size="5"/>
       <Layout nx="4" ny="11" x0="24.0945" y0="24.0945" dx="136.913" dy="72"/>
     </Label-rectangle>
-    <Alias name="Herma 4272"/>
-    <Alias name="Herma 5051"/>
+    <Alias brand="Herma" part="4272"/>
+    <Alias brand="Herma" part="5051"/>
   </Template>
   
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Allzweck Etiketten, 66 x 33,8 mm, 24 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Herma 4614" size="A4" _description="Allround Labels">
+  <Template brand="Herma" part="4614" size="A4" _description="Allround Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="187.086" height="95.811" round="0">
       <Markup-margin size="5"/>
       <Layout nx="3" ny="8" x0="16.1575" y0="36.8504" dx="187.086" dy="95.811"/>
     </Label-rectangle>
-    <Alias name="Herma 4670"/>
-    <Alias name="Herma 5053"/>
+    <Alias brand="Herma" part="4670"/>
+    <Alias brand="Herma" part="5053"/>
   </Template>
   
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Adress Etiketten, 105 x 42,3 mm, 24 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Herma 4625" size="A4" _description="Mailing Labels">
+  <Template brand="Herma" part="4625" size="A4" _description="Mailing Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="297.638" height="119.905" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="7" x0="0" y0="0" dx="297.638" dy="119.905"/>
     </Label-rectangle>
-    <Alias name="Herma 4674"/>
-    <Alias name="Herma 5057"/>
+    <Alias brand="Herma" part="4674"/>
+    <Alias brand="Herma" part="5057"/>
   </Template>
   
   <!-- =================================================================== -->
   <!-- Herma Musteretiketten: Ordnerrucken, 192 x 38 mm, 7 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Herma 4293" size="A4" _description="Arch File Labels">
+  <Template brand="Herma" part="4293" size="A4" _description="Arch File Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252" height="107.716" round="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="7" x0="25.5118" y0="42.5197" dx="544.252" dy="107.716"/>
     </Label-rectangle>
-    <Alias name="Herma 5092"/>
+    <Alias brand="Herma" part="5092"/>
   </Template>
   
   <!-- ===================================================================-->
   <!-- Data Becker CD/DVD Labels (face only), 2 per sheet                 -->
   <!-- ===================================================================-->
-  <Template name="DataBecker 0335" size="A4" _description="CD/DVD Labels Standard Format (face only)">
+  <Template brand="DataBecker" part="0335" size="A4" _description="CD/DVD Labels Standard Format (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="164.409" hole="58.1102" waste="5">
       <Markup-margin size="5"/>
       <Layout nx="1" ny="2" x0="133.228" y0="46.7716" dx="0" dy="419.527"/>
     </Label-cd>
-    <Alias name="DataBecker 0368"/>
+    <Alias brand="DataBecker" part="0368"/>
   </Template>
 
   <!-- ===================================================================-->
   <!-- LeLabel 2001.018 CD/DVD Labels, 1 per sheet                        -->
   <!-- ===================================================================-->
-  <Template name="LeLabel 2001.018" size="A4" _description="CD/DVD Labels">
+  <Template brand="LeLabel" part="2001.018" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="168.08" hole="54.69" waste="5">
@@ -376,7 +376,7 @@
   <!-- ===================================================================-->
   <!-- Viking 02204 Etiketten, 21 per sheet                               -->
   <!-- ===================================================================-->
-  <Template name="Viking 02204" size="A4" _description="Etiketten">
+  <Template brand="Viking" part="02204" size="A4" _description="Etiketten">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198" height="120" round="0">
       <Markup-margin size="5"/>
@@ -387,7 +387,7 @@
   <!-- ===================================================================-->
   <!-- Media Line CD/DVD Labels (face only), 2 per sheet                  -->
   <!-- ===================================================================-->
-  <Template name="MediaLine 760-50475 A4 CD" size="A4" description="CD/DVD Labels (face only)">
+  <Template brand="MediaLine" part="760-50475 A4 CD" size="A4" description="CD/DVD Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -399,7 +399,7 @@
   <!-- ===================================================================-->
   <!-- Encre.com Business Cards, 10 per sheet                             -->
   <!-- ===================================================================-->
-  <Template name="Encre.com BCV10" size="A4" description="Business Cards">  
+  <Template brand="Encre.com" part="BCV10" size="A4" description="Business Cards">  
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="243.78" height="153.07">  
@@ -411,7 +411,7 @@
   <!-- =================================================================== -->
   <!-- Celcast IJ37: Fridge magnet (stickers), 52 x 90 mm, 10 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Celcast IJ37" size="A4" _description="Fridge Magnet Stickers">
+  <Template brand="Celcast" part="IJ37" size="A4" _description="Fridge Magnet Stickers">
     <Meta category="label"/>
     <Label-rectangle id="0" width="255" height="147.5" round="0">
       <Markup-margin size="5"/>
@@ -422,8 +422,7 @@
   <!-- =================================================================== -->
   <!-- CD STOMPER PRO CD Label Refills, (Face Only) ISO Version            -->
   <!-- =================================================================== -->
-  <Template name="Stomper PRO A4" size="A4"
-         _description="PRO CD Labels 2-up (face only)">
+  <Template brand="Stomper" part="PRO A4" size="A4" _description="PRO CD Labels 2-up (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58" waste="10">
@@ -436,7 +435,7 @@
   <!-- =================================================================== -->
   <!-- Pressit CD Labels/                                                  -->
   <!-- =================================================================== -->
-  <Template name="Pressit  50blank" size="A4" _description="CD Labels">
+  <Template brand="Pressit" part="50blank" size="A4" _description="CD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -449,7 +448,7 @@
   <!-- =================================================================== -->
   <!-- Ryman Standard CD/DVD Labels.                                       -->
   <!-- =================================================================== -->
-  <Template name="Ryman Standard CD/DVD" size="A4" _description="CD/DVD Labels">
+  <Template brand="Ryman" part="Standard CD/DVD" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.827pt" hole="58.1102pt" waste="9pt">
@@ -461,7 +460,7 @@
   <!-- =================================================================== -->
   <!-- Fellows 04715 CD/DVD Labels (Face only).                            -->
   <!-- =================================================================== -->
-  <Template name="Fellows 04715" size="A4" description="CD Labels">
+  <Template brand="Fellows" part="04715" size="A4" description="CD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5pt" hole="58.5pt" waste="9pt">
@@ -473,7 +472,7 @@
   <!-- =================================================================== -->
   <!-- Staples EU Business Cards Supreme.                                  -->
   <!-- =================================================================== -->
-  <Template name="Staples EU BC Supreme" size="A4" _description="Business Cards">
+  <Template brand="Staples" part="EU BC Supreme" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="240.945pt" height="155.906pt" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -486,7 +485,7 @@
   <!-- =================================================================== -->
   <!-- DECAdry OCC 3342 Business Cards.                                    -->
   <!-- =================================================================== -->
-  <Template name="DECAdry OCC 3342" size="A4" _description="Business Cards">
+  <Template brand="DECAdry" part="OCC 3342" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="240.945pt" height="153.071pt" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -504,7 +503,7 @@
   <!-- =================================================================== -->
   <!-- EPSON Photo Stickers, 17 x 24 mm, 16 per sheet                      -->
   <!-- =================================================================== -->
-  <Template name="Epson S041144" size="A6" _description="EPSON Photo Stickers 16">
+  <Template brand="Epson" part="S041144" size="A6" _description="EPSON Photo Stickers 16">
     <Meta category="label"/>
     <Label-rectangle id="0" width="48" height="68" round="7">
       <Markup-margin size="5"/>
@@ -518,7 +517,7 @@
   <!-- Templates for A4 and A3 media, size 50 x 90 mm                       -->
   <!-- ******************************************************************** -->
   
-  <Template name="Russian A3 5x9" size="A3" description="Business Cards">
+  <Template brand="Russian" part="A3 5x9" size="A3" description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="90mm" height="50mm" round="0">
@@ -527,7 +526,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template name="Russian A4 5x9" size="A4" description="Business Cards">
+  <Template brand="Russian" part="A4 5x9" size="A4" description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="50mm" height="90mm" round="0">
diff --git a/glabels2/data/templates/misc-other-templates.xml b/glabels2/data/templates/misc-other-templates.xml
index c32c8fe0..ac5cc808 100644
--- a/glabels2/data/templates/misc-other-templates.xml
+++ b/glabels2/data/templates/misc-other-templates.xml
@@ -9,7 +9,7 @@
   <!-- =================================================================== -->
   <!-- OfficeMax 86112: Multi-Purpose Labels, 2'' x 4'', 3 per sheet       -->
   <!-- =================================================================== -->
-  <Template name="OfficeMax 86112" size="Other" width="297pt" height="450pt"
+  <Template brand="OfficeMax" part="86112" size="Other" width="297pt" height="450pt"
             description="Multi-Purpose Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="288pt" height="144pt" round="9pt" waste="0pt">
@@ -21,7 +21,7 @@
   <!-- =================================================================== -->
   <!-- Dymo 99102 Large Address labels.                                    -->
   <!-- =================================================================== -->
-  <Template name="Dymo 99012" size="Other" width="102.047pt" height="252.283pt" _description="Large Address Labels">
+  <Template brand="Dymo" part="99012" size="Other" width="102.047pt" height="252.283pt" _description="Large Address Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="102.047pt" height="252.283pt" round="0pt" x_waste="0pt" y_waste="0pt">
       <Markup-margin size="0pt"/>
diff --git a/glabels2/data/templates/misc-us-templates.xml b/glabels2/data/templates/misc-us-templates.xml
index e2c1779c..887eb927 100644
--- a/glabels2/data/templates/misc-us-templates.xml
+++ b/glabels2/data/templates/misc-us-templates.xml
@@ -10,7 +10,7 @@
   <!-- =================================================================== -->
   <!-- Southworth BC: Business Cards, 2'' x 3_1/2'', 10 per sheet          -->
   <!-- =================================================================== -->
-  <Template name="Southworth BC" size="US-Letter" _description="Business Cards">
+  <Template brand="Southworth" part="BC" size="US-Letter" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="252" height="144" round="0">
@@ -22,8 +22,7 @@
   <!-- =================================================================== -->
   <!-- Memorex CD Labels                                                 * -->
   <!-- =================================================================== -->
-  <Template name="Memorex CD Labels" size="US-Letter"
-	 _description="CD/DVD Labels">
+  <Template brand="Memorex" part="CD Labels" size="US-Letter" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -36,7 +35,7 @@
   <!-- =================================================================== -->
   <!-- Neato USCD2lbl.NTT: CD/DVD Labels (face only), 2 per sheet          -->
   <!-- =================================================================== -->
-  <Template name="Neato USCD2lbl.NTT" size="US-Letter"
+  <Template brand="Neato" part="USCD2lbl.NTT" size="US-Letter"
          _description="CD/DVD Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -49,7 +48,7 @@
   <!-- =================================================================== -->
   <!-- Neato USCD2lbl.NTT: CD/DVD Labels (rectangles), 2 per sheet         -->
   <!-- =================================================================== -->
-  <Template name="Neato USCD2lbl Rectangles" size="US-Letter"
+  <Template brand="Neato" part="USCD2lbl Rectangles" size="US-Letter"
 	 _description="CD Template Rectangles">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -62,7 +61,7 @@
   <!-- =================================================================== -->
   <!-- Neato CLP-192328/26: HandiCD-R 50MB, 3" x 2_1/8'', 9 per sheet      -->
   <!-- =================================================================== -->
-  <Template name="Neato HandiCD-R" size="US-Letter"
+  <Template brand="Neato" part="HandiCD-R" size="US-Letter"
 	 _description="Business Card CD">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -75,7 +74,7 @@
   <!-- =================================================================== -->
   <!-- CD STOMPER PRO CD Label Refills, (Face Only)                      * -->
   <!-- =================================================================== -->
-  <Template name="Stomper PRO CD" size="US-Letter"
+  <Template brand="Stomper" part="PRO CD" size="US-Letter"
          _description="PRO CD Labels 2-up (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -86,7 +85,7 @@
     </Label-cd>
   </Template>
 
-  <Template name="Stomper PRO Zip" size="US-Letter"
+  <Template brand="Stomper" part="PRO Zip" size="US-Letter"
          _description="PRO CD Labels 2-up (Face only)">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -97,7 +96,7 @@
     </Label-rectangle>
   </Template>
 
-  <Template name="Stomper PRO Spine" size="US-Letter"
+  <Template brand="Stomper" part="PRO Spine" size="US-Letter"
          _description="PRO CD Labels 2-up (CD spine only)">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -110,8 +109,7 @@
   <!-- ===================================================================-->
   <!-- Meritline Mini CD/DVD Labels (face only), 5 per sheet              -->
   <!-- ===================================================================-->
-  <Template name="Meritline Mini-CD" size="US-Letter"
-   _description="Mini-CD Labels">
+  <Template brand="Meritline" part="Mini-CD" size="US-Letter" _description="Mini-CD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="110.5" hole="57.5" waste="5">
@@ -127,7 +125,7 @@
   <!-- To write text on spine, use "upside down" template, "rotated",     -->
   <!-- spine is bottom margin, print label sheet BOTTOM FIRST.            -->
   <!-- ===================================================================-->
-  <Template name="Neato Slimline CD Case" size="US-Letter"
+  <Template brand="Neato" part="Slimline CD Case" size="US-Letter"
          _description="Slimline CD Case (rightside up)">
     <Meta category="card"/>
     <Meta category="media"/>
@@ -136,7 +134,7 @@
       <Layout nx="1" ny="2" x0="130" y0="41.9" dx="0" dy="363"/>
     </Label-rectangle>
   </Template>
-  <Template name="Neato Slimline CD Case, spine" size="US-Letter"
+  <Template brand="Neato" part="Slimline CD Case, spine" size="US-Letter"
          _description="Slimline CD Case (upside down)">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -149,8 +147,8 @@
   <!-- =================================================================== -->
   <!-- Great Gizmos : CD/DVD Labels (face only), 2 per sheet             * -->
   <!-- =================================================================== -->
-  <Template name="Great Gizmos" size="US-Letter"
-         _description="CD/DVD Labels (face only)">
+  <Template brand="Great Gizmos" part="CD/DVD" size="US-Letter"
+          _description="CD/DVD Labels (face only)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="166.5" hole="58.5" waste="5">
@@ -162,7 +160,7 @@
   <!-- =================================================================== -->
   <!-- Imation-SoniX CD/DVD Labels  (Face Only)                          * -->
   <!-- =================================================================== -->
-  <Template name="Imation-SoniX No.5112 15954" size="US-Letter"
+  <Template brand="Imation-SoniX" part="No.5112 15954" size="US-Letter"
          _description="CD/DVD Labels (Face Only)">
     <Meta category="label"/>
     <Meta category="media"/>
@@ -175,7 +173,7 @@
   <!-- =================================================================== -->
   <!-- Netc Label Stock: DLT Labels, (www.netclabels.com), 30 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Netc 749303-70001 " size="US-Letter" _description="DLT Labels">
+  <Template brand="Netc" part="749303-70001 " size="US-Letter" _description="DLT Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="162" height="59.4" round="0">
@@ -187,7 +185,7 @@
   <!-- =================================================================== -->
   <!-- Tough-Tags TTLW-2016 Microtube labels, 85 per sheet.                -->
   <!-- =================================================================== -->
-  <Template name="Tough-Tags TTLW-2016" size="US-Letter" _description="Microtube labels">
+  <Template brand="Tough-Tags" part="TTLW-2016" size="US-Letter" _description="Microtube labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="92.16" height="36" round="5">
       <Markup-margin size="5"/>
@@ -198,7 +196,7 @@
   <!-- =================================================================== -->
   <!-- Kingdom L Cassette Labels, 12 per sheet.                            -->
   <!-- =================================================================== -->
-  <Template name="Kingdom L" size="US-Letter" _description="Cassette Labels">
+  <Template brand="Kingdom" part="L" size="US-Letter" _description="Cassette Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="252pt" height="117pt" round="9pt" x_waste="2.376pt" y_waste="2.376pt">
diff --git a/glabels2/data/templates/zweckform-iso-templates.xml b/glabels2/data/templates/zweckform-iso-templates.xml
index 412662aa..f6b2c581 100644
--- a/glabels2/data/templates/zweckform-iso-templates.xml
+++ b/glabels2/data/templates/zweckform-iso-templates.xml
@@ -9,7 +9,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4761: Lever Arch File Labels, 192 x 61 mm, 4 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  4761" size="A4" _description="Lever Arch File Labels">
+  <Template brand="Zweckform" part="4761" size="A4" _description="Lever Arch File Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.25" height="172.9" round="5">
       <Markup-margin size="5"/>
@@ -20,7 +20,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3651: Rectangular Labels, 52 x 29.5 mm, 40 per sheet      -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  3651" size="A4" _description="Rectangular Labels">
+  <Template brand="Zweckform" part="3651" size="A4" _description="Rectangular Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="147.4016" height="83.6220" round="0">  
       <Markup-margin size="5"/>
@@ -31,7 +31,7 @@
   <!-- ====================================================================-->
   <!-- Zweckform 3654: CD Labels  2 per Template                              -->
   <!-- ====================================================================-->
-  <Template name="Zweckform  3654" size="A4" _description="CD/DVD Labels">
+  <Template brand="Zweckform" part="3654" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-cd id="0" radius="165.78" hole="58.09" waste="5">
@@ -43,7 +43,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3659: Rectangular Labels, 97 x 42.125 mm, 12 per sheet    -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  3659" size="A4" _description="Mailing Labels">
+  <Template brand="Zweckform" part="3659" size="A4" _description="Mailing Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="274" height="120.5" round="0">  
@@ -55,7 +55,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3669:  Rectangular Labels, 70 x 50.8mm, 15 per sheet      -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  3669" size="A4" _description="QSL-Karten Etiketten 70mm x 50,8mm">
+  <Template brand="Zweckform" part="3669" size="A4" _description="QSL-Karten Etiketten 70mm x 50,8mm">
     <Meta category="label"/>
     <Label-rectangle id="0" width="198.425" height="144" round="0">
       <Markup-margin size="5"/>
@@ -66,7 +66,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3688: Ordnerruecken Labels                                -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  3688" size="A4" description="File Back Labels">
+  <Template brand="Zweckform" part="3688" size="A4" description="File Back Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252pt" height="172.913pt" round="0pt" waste="0pt">
       <Markup-margin size="9.07087pt"/>
@@ -77,7 +77,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4732: Multi-purpose Stick+Lift labels                     -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  4732" size="A4" description="Multi-purpose Stick+Lift Labels">
+  <Template brand="Zweckform" part="4732" size="A4" description="Multi-purpose Stick+Lift Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="102.047pt" height="48.189pt" round="5.66929pt" waste="0pt">
       <Markup-margin size="5.66929pt"/>
@@ -88,7 +88,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4746: Video Labels, 147,32 x 20 mm, 13 per sheet          -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  4746" size="A4" _description="Video Labels (back)">
+  <Template brand="Zweckform" part="4746" size="A4" _description="Video Labels (back)">
     <Meta category="label"/>
     <Meta category="media"/>
     <Label-rectangle id="0" width="416.6" height="56.6929" round="5">
@@ -100,7 +100,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4780: Allround Labels, 48,5 x 25,4 mm, 40 per sheet       -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  4780" size="A4" _description="Allround Labels">
+  <Template brand="Zweckform" part="4780" size="A4" _description="Allround Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="137.48" height="72" round="0">
       <Markup-margin size="5"/>
@@ -111,7 +111,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3474: Address Labels, 70 x 37 mm, 24 per sheet            -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  3474" size="A4" _description="Address Labels">
+  <Template brand="Zweckform" part="3474" size="A4" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="70mm" height="37mm" round="0">
@@ -123,7 +123,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3475: Address Labels, 70 x 30 mm, 24 per sheet            -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  3475" size="A4" _description="Address Labels">
+  <Template brand="Zweckform" part="3475" size="A4" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="198.570" height="102.121" round="0">
@@ -135,7 +135,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3490: Rectangular Labels, 70 x 36 mm, 24 per sheet        -->
   <!-- =================================================================== -->
-   <Template name="Zweckform  3490" size="A4" _description="Rectangular Copier Labels">
+   <Template brand="Zweckform" part="3490" size="A4" _description="Rectangular Copier Labels">
      <Meta category="label"/>
      <Label-rectangle id="0" width="198.425" height="102.047" round="0">
       <Markup-margin size="5"/>
@@ -146,7 +146,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 4781: Rectangular Labels, 97 x 42.3 mm, 12 per sheet      -->
   <!-- =================================================================== -->
-   <Template name="Zweckform  4781" size="A4" _description="Rectangular Copier Labels">
+   <Template brand="Zweckform" part="4781" size="A4" _description="Rectangular Copier Labels">
      <Meta category="label"/>
      <Label-rectangle id="0" width="274.960" height="119.905" round="0">
       <Markup-margin size="5"/>
@@ -157,7 +157,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 6091: Correction and Cover, 64.6 x 33.8 mm, 24 per sheet  -->
   <!-- =================================================================== -->
-   <Template name="Zweckform  6091" size="A4" _description="Correction and Cover-up Labels">
+   <Template brand="Zweckform" part="6091" size="A4" _description="Correction and Cover-up Labels">
      <Meta category="label"/>
      <Label-rectangle id="0" width="183.118" height="95.811" round="0">
       <Markup-margin size="5"/>
@@ -168,7 +168,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 6015: CD Labels, 2 per Template                           -->
   <!-- =================================================================== -->
-   <Template name="Zweckform  6015" size="A4" _description="CD/DVD Labels">
+   <Template brand="Zweckform" part="6015" size="A4" _description="CD/DVD Labels">
     <Meta category="label"/>
     <Meta category="media"/>
      <Label-cd id="0" radius="165.827" hole="58.110" waste="5">
@@ -180,7 +180,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 6021: Allround Labels                                     -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  6021" size="A4" description="Allround Labels">
+  <Template brand="Zweckform" part="6021" size="A4" description="Allround Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="130.392pt" height="47.9055pt" round="0pt" waste="0pt">
       <Markup-margin size="5pt"/>
@@ -191,22 +191,22 @@
   <!-- =================================================================== -->
   <!-- Zweckform 32010: Business Cards, 54.0 x 85.0 mm, 10 per sheet       -->
   <!-- =================================================================== -->
-  <Template name="Zweckform 32010" size="A4" _description="Business Cards">
+  <Template brand="Zweckform" part="32010" size="A4" _description="Business Cards">
     <Meta category="card"/>
     <Meta category="business-card"/>
     <Label-rectangle id="0" width="240.94" height="153.07" round="0">
       <Markup-margin size="5"/>
       <Layout nx="2" ny="5" x0="40" y0="40" dx="269" dy="153"/>
     </Label-rectangle>
-    <Alias name="DECAdry SCW-2090"/>
-    <Alias name="DECAdry OCB-3327"/>
-    <Alias name="DECAdry DAW-327"/>
+    <Alias brand="DECAdry" part="SCW-2090"/>
+    <Alias brand="DECAdry" part="OCB-3327"/>
+    <Alias brand="DECAdry" part="DAW-327"/>
   </Template>
 
   <!-- =================================================================== -->
   <!-- Zweckform 4760: File Labels, 192 x 38 mm, 7 per sheet               -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  4760" size="A4" _description="File Back Labels">
+  <Template brand="Zweckform" part="4760" size="A4" _description="File Back Labels">
     <Meta category="label"/>
     <Label-rectangle id="0" width="544.252pt" height="107.717pt" round="5.66929pt" waste="0pt">
       <Markup-margin size="9pt"/>
@@ -217,7 +217,7 @@
   <!-- =================================================================== -->
   <!-- Zweckform 3348: Adress Labels.                                      -->
   <!-- =================================================================== -->
-  <Template name="Zweckform  3348" size="A4" _description="Address Labels">
+  <Template brand="Zweckform" part="3348" size="A4" _description="Address Labels">
     <Meta category="label"/>
     <Meta category="mail"/>
     <Label-rectangle id="0" width="189.921pt" height="107.717pt" round="0pt" x_waste="0pt" y_waste="0pt">
-- 
2.39.5