diff --git a/chip-6800/nodenames.js b/chip-6800/nodenames.js
index 58167ea..f6a9613 100644
--- a/chip-6800/nodenames.js
+++ b/chip-6800/nodenames.js
@@ -167,6 +167,15 @@ addb4: 553,
 addb5: 552,
 addb6: 545,
 addb7: 544,
+addg0: 593,
+addp0: 564,
+addp1: 566,
+addp2: 556,
+addp3: 558,
+addp4: 548,
+addp5: 550,
+addp6: 541,
+addp7: 543,
 idb0: 610,
 idb1: 1593,
 idb2: 387,
@@ -265,7 +274,7 @@ pcl4: 1875,
 pcl5: 1871,
 pcl6: 1874,
 pcl7: 1870,
-res: 1512,
+resg: 1512,
 sph0: 1909,
 sph1: 1908,
 sph2: 1907,
@@ -290,14 +299,6 @@ sum4: 640,
 sum5: 639,
 sum6: 638,
 sum7: 412,
-sumab0: 564,
-sumab1: 566,
-sumab2: 556,
-sumab3: 558,
-sumab4: 548,
-sumab5: 550,
-sumab6: 541,
-sumab7: 543,
 tmp0: 1893,
 tmp1: 1892,
 tmp2: 1891,
@@ -306,7 +307,14 @@ tmp4: 1889,
 tmp5: 1888,
 tmp6: 1887,
 tmp7: 1886,
-qaddgen0: 593,
+xi0: 1303,
+xi1: 1291,
+xi2: 1294,
+xi3: 1292,
+xi4: 1295,
+xi5: 1293,
+xi6: 1275,
+xi7: 1276,
 
 // signals which are not purely alphabetical
 acca0_1: 342,
@@ -736,7 +744,6 @@ phi2_1: 478,
 "#n0n.2-7": 1242,
 "#phi2_0": 477,
 "#phi2_2": 576,
-"#qand0": 571,
 "#x0/abh": 979,
 "#x0/abl1": 438,
 "#x0/db0": 127,
@@ -750,6 +757,7 @@ phi2_1: 478,
 "#xacca/db": 466,
 "#xaccb/abl1": 460,
 "#xaccb/db": 760,
+"#xaddg0": 571,
 "#xda/adda": 434,
 "#xdb/acca": 464,
 "#xdb/accb": 430,
@@ -888,13 +896,5 @@ phi2_1: 478,
 "flag0/db3": 376,
 "flag0/db4": 309,
 "flag0/db5": 308,
-"n1n-0": 1303,
-"n1n-1": 1291,
-"n1n-2": 1294,
-"n1n-3": 1292,
-"n1n-4": 1295,
-"n1n-5": 1293,
-"n1n-6": 1275,
 "ndb/adda": 415,
-"nin-7": 1276,
 }