Index: devmap.lht
===================================================================
--- devmap.lht	(revision 3336)
+++ devmap.lht	(revision 3337)
@@ -30,7 +30,7 @@
 						x=12000; y=12000; rot=90.000000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=D
@@ -41,7 +41,7 @@
 						mirx=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=G
@@ -80,7 +80,7 @@
 						x=12000; y=-4000; rot=90.000000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=S
@@ -267,7 +267,7 @@
 						x=12000; y=12000; rot=90.000000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=D
@@ -278,7 +278,7 @@
 						mirx=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=G
@@ -317,7 +317,7 @@
 						x=12000; y=-4000; rot=90.000000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=S
Index: psu.lht
===================================================================
--- psu.lht	(revision 3336)
+++ psu.lht	(revision 3337)
@@ -59,7 +59,7 @@
 					ha:group.2 {
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=1
@@ -70,7 +70,7 @@
 						x=0; y=4000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=2
@@ -213,7 +213,7 @@
 						x=20000; y=0;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=2
@@ -224,7 +224,7 @@
 						mirx=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=1
@@ -256,7 +256,7 @@
 						x=20000; y=0;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=N
@@ -267,7 +267,7 @@
 						mirx=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=P
@@ -305,7 +305,7 @@
 					ha:group.2 {
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=1
@@ -316,7 +316,7 @@
 						x=0; y=4000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=2
@@ -453,7 +453,7 @@
 						x=20000; y=0;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=2
@@ -464,7 +464,7 @@
 						mirx=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=1
Index: slot.lht
===================================================================
--- slot.lht	(revision 3336)
+++ slot.lht	(revision 3337)
@@ -59,7 +59,7 @@
 						x=-20000; y=4000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=in+
@@ -70,7 +70,7 @@
 						x=-20000; y=-4000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=in-
@@ -80,7 +80,7 @@
 					ha:group.3 {
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=out
@@ -97,7 +97,7 @@
 						x=-12000; y=-8000; rot=270.000000; mirx=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=V-
@@ -108,7 +108,7 @@
 						x=-12000; y=8000; rot=90.000000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=V+
@@ -136,7 +136,7 @@
 						x=-20000; y=4000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=in+
@@ -147,7 +147,7 @@
 						x=-20000; y=-4000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=in-
@@ -157,7 +157,7 @@
 					ha:group.3 {
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=out
@@ -174,7 +174,7 @@
 						x=-12000; y=-8000; rot=270.000000; mirx=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=V-
@@ -185,7 +185,7 @@
 						x=-12000; y=8000; rot=90.000000;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 						}
 						ha:attrib {
 							name=V+
Index: slot2.lht
===================================================================
--- slot2.lht	(revision 3336)
+++ slot2.lht	(revision 3337)
@@ -77,7 +77,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -98,7 +98,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -120,7 +120,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.3 { x1=-1000; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.5 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -171,7 +171,7 @@
 						x=4000; y=24000; rot=90.000000; miry=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.3 { x1=0; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -184,7 +184,7 @@
 						x=4000; y=0; rot=-90.000000; miry=1;
 						li:objects {
 							ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.3 { x1=0; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -225,7 +225,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -246,7 +246,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -268,7 +268,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.3 { x1=-1000; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.5 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -327,7 +327,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -348,7 +348,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -370,7 +370,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.3 { x1=-1000; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.5 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -429,7 +429,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -450,7 +450,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {
@@ -472,7 +472,7 @@
 								stroke=sym-decor;
 							}
 							ha:line.3 { x1=-1000; y1=0; x2=-4000; y2=0; stroke=term-decor; }
-							ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
+							ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; }
 							ha:text.5 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; }
 						}
 						ha:attrib {