diff --git a/docs/pcx86/examples/components.xsl b/docs/pcx86/examples/components.xsl
index 80672267b..5b86ac9f2 100644
--- a/docs/pcx86/examples/components.xsl
+++ b/docs/pcx86/examples/components.xsl
@@ -13,11 +13,11 @@
 	<xsl:variable name="CSSCLASS">pcjs</xsl:variable>
 	<xsl:variable name="APPCLASS">pcx86</xsl:variable>
 	<xsl:variable name="APPNAME">PCx86</xsl:variable>
-	<xsl:variable name="APPVERSION">1.24.0</xsl:variable>
+	<xsl:variable name="APPVERSION">1.24.2</xsl:variable>
 	<xsl:variable name="SITEHOST">www.pcjs.org</xsl:variable>
 
 	<xsl:template name="componentStyles">
-		<link rel="stylesheet" type="text/css" href="/versions/pcx86/1.24.0/components.css"/>
+		<link rel="stylesheet" type="text/css" href="/versions/pcx86/1.24.2/components.css"/>
 	</xsl:template>
 
 	<xsl:template name="componentScripts">
diff --git a/modules/pc8080/lib/bus.js b/modules/pc8080/lib/bus.js
index c575b1756..824f8456b 100644
--- a/modules/pc8080/lib/bus.js
+++ b/modules/pc8080/lib/bus.js
@@ -63,7 +63,7 @@ if (NODE) {
  * @constructor
  * @extends Component
  * @param {Object} parmsBus
- * @param {CPUState8080} cpu
+ * @param {CPU8080State} cpu
  * @param {Debugger8080} dbg
  */
 function Bus8080(parmsBus, cpu, dbg)
diff --git a/modules/pc8080/lib/chipset.js b/modules/pc8080/lib/chipset.js
index 7514533a9..4f60fab87 100644
--- a/modules/pc8080/lib/chipset.js
+++ b/modules/pc8080/lib/chipset.js
@@ -400,7 +400,7 @@ ChipSet8080.prototype.setBinding = function(sHTMLType, sBinding, control, sValue
  * @this {ChipSet8080}
  * @param {Computer8080} cmp
  * @param {Bus8080} bus
- * @param {CPUState8080} cpu
+ * @param {CPU8080State} cpu
  * @param {Debugger8080} dbg
  */
 ChipSet8080.prototype.initBus = function(cmp, bus, cpu, dbg)
diff --git a/modules/pc8080/lib/computer.js b/modules/pc8080/lib/computer.js
index 9b0b1199a..80d72eba0 100644
--- a/modules/pc8080/lib/computer.js
+++ b/modules/pc8080/lib/computer.js
@@ -148,7 +148,7 @@ function Computer8080(parmsComputer, parmsMachine, fSuspended) {
      * where we know getComponentByType() will only return an CPUState object or null), wrap the expression
      * in parentheses.  I never knew this until I stumbled across it in "Closure: The Definitive Guide".
      */
-    this.cpu = /** @type {CPUState8080} */ (Component.getComponentByType("CPU", this.id));
+    this.cpu = /** @type {CPU8080State} */ (Component.getComponentByType("CPU", this.id));
     if (!this.cpu) {
         Component.error("Unable to find CPU component");
         return;
@@ -189,7 +189,7 @@ function Computer8080(parmsComputer, parmsMachine, fSuspended) {
         }
     }
 
-    this.println(PC8080.APPNAME + " v" + PC8080.APPVERSION + "\n" + COPYRIGHT + "\n" + LICENSE);
+    this.println(PC8080.APPNAME + " v" + (XMLVERSION || PC8080.APPVERSION) + "\n" + COPYRIGHT + "\n" + LICENSE);
 
     if (DEBUG && this.messageEnabled()) this.printMessage("TYPEDARRAYS: " + TYPEDARRAYS);
 
diff --git a/modules/pc8080/lib/cpu.js b/modules/pc8080/lib/cpu.js
index caf385648..ba824f45c 100644
--- a/modules/pc8080/lib/cpu.js
+++ b/modules/pc8080/lib/cpu.js
@@ -43,7 +43,7 @@ if (NODE) {
  *
  * The CPU8080 class supports the following (parmsCPU) properties:
  *
- *      cycles: the machine's base cycles per second; the CPUState8080 constructor
+ *      cycles: the machine's base cycles per second; the CPU8080State constructor
  *      will provide us with a default (based on the CPU model) to use as a fallback.
  *
  *      multiplier: base cycle multiplier; default is 1.
@@ -64,7 +64,7 @@ if (NODE) {
  * This component is primarily responsible for interfacing the CPU with the outside
  * world (eg, Panel and Debugger components), and managing overall CPU operation.
  *
- * It is extended by the CPUState8080 component, where the simulation control logic resides.
+ * It is extended by the CPU8080State component, where the simulation control logic resides.
  *
  * @constructor
  * @extends Component
diff --git a/modules/pc8080/lib/cpuops.js b/modules/pc8080/lib/cpuops.js
index cd56061a5..4907afe53 100644
--- a/modules/pc8080/lib/cpuops.js
+++ b/modules/pc8080/lib/cpuops.js
@@ -40,7 +40,7 @@ if (NODE) {
 /**
  * op=0x00 (NOP)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opNOP = function()
 {
@@ -50,7 +50,7 @@ CPUDef8080.opNOP = function()
 /**
  * op=0x01 (LXI B,d16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opLXIB = function()
 {
@@ -61,7 +61,7 @@ CPUDef8080.opLXIB = function()
 /**
  * op=0x02 (STAX B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSTAXB = function()
 {
@@ -72,7 +72,7 @@ CPUDef8080.opSTAXB = function()
 /**
  * op=0x03 (INX B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINXB = function()
 {
@@ -83,7 +83,7 @@ CPUDef8080.opINXB = function()
 /**
  * op=0x04 (INR B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINRB = function()
 {
@@ -94,7 +94,7 @@ CPUDef8080.opINRB = function()
 /**
  * op=0x05 (DCR B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCRB = function()
 {
@@ -105,7 +105,7 @@ CPUDef8080.opDCRB = function()
 /**
  * op=0x06 (MVI B,d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMVIB = function()
 {
@@ -116,7 +116,7 @@ CPUDef8080.opMVIB = function()
 /**
  * op=0x07 (RLC)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRLC = function()
 {
@@ -129,7 +129,7 @@ CPUDef8080.opRLC = function()
 /**
  * op=0x09 (DAD B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDADB = function()
 {
@@ -142,7 +142,7 @@ CPUDef8080.opDADB = function()
 /**
  * op=0x0A (LDAX B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opLDAXB = function()
 {
@@ -153,7 +153,7 @@ CPUDef8080.opLDAXB = function()
 /**
  * op=0x0B (DCX B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCXB = function()
 {
@@ -164,7 +164,7 @@ CPUDef8080.opDCXB = function()
 /**
  * op=0x0C (INR C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINRC = function()
 {
@@ -175,7 +175,7 @@ CPUDef8080.opINRC = function()
 /**
  * op=0x0D (DCR C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCRC = function()
 {
@@ -186,7 +186,7 @@ CPUDef8080.opDCRC = function()
 /**
  * op=0x0E (MVI C,d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMVIC = function()
 {
@@ -197,7 +197,7 @@ CPUDef8080.opMVIC = function()
 /**
  * op=0x0F (RRC)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRRC = function()
 {
@@ -210,7 +210,7 @@ CPUDef8080.opRRC = function()
 /**
  * op=0x11 (LXI D,d16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opLXID = function()
 {
@@ -221,7 +221,7 @@ CPUDef8080.opLXID = function()
 /**
  * op=0x12 (STAX D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSTAXD = function()
 {
@@ -232,7 +232,7 @@ CPUDef8080.opSTAXD = function()
 /**
  * op=0x13 (INX D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINXD = function()
 {
@@ -243,7 +243,7 @@ CPUDef8080.opINXD = function()
 /**
  * op=0x14 (INR D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINRD = function()
 {
@@ -254,7 +254,7 @@ CPUDef8080.opINRD = function()
 /**
  * op=0x15 (DCR D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCRD = function()
 {
@@ -265,7 +265,7 @@ CPUDef8080.opDCRD = function()
 /**
  * op=0x16 (MVI D,d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMVID = function()
 {
@@ -276,7 +276,7 @@ CPUDef8080.opMVID = function()
 /**
  * op=0x17 (RAL)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRAL = function()
 {
@@ -289,7 +289,7 @@ CPUDef8080.opRAL = function()
 /**
  * op=0x19 (DAD D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDADD = function()
 {
@@ -302,7 +302,7 @@ CPUDef8080.opDADD = function()
 /**
  * op=0x1A (LDAX D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opLDAXD = function()
 {
@@ -313,7 +313,7 @@ CPUDef8080.opLDAXD = function()
 /**
  * op=0x1B (DCX D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCXD = function()
 {
@@ -324,7 +324,7 @@ CPUDef8080.opDCXD = function()
 /**
  * op=0x1C (INR E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINRE = function()
 {
@@ -335,7 +335,7 @@ CPUDef8080.opINRE = function()
 /**
  * op=0x1D (DCR E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCRE = function()
 {
@@ -346,7 +346,7 @@ CPUDef8080.opDCRE = function()
 /**
  * op=0x1E (MVI E,d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMVIE = function()
 {
@@ -357,7 +357,7 @@ CPUDef8080.opMVIE = function()
 /**
  * op=0x1F (RAR)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRAR = function()
 {
@@ -370,7 +370,7 @@ CPUDef8080.opRAR = function()
 /**
  * op=0x21 (LXI H,d16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opLXIH = function()
 {
@@ -381,7 +381,7 @@ CPUDef8080.opLXIH = function()
 /**
  * op=0x22 (SHLD a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSHLD = function()
 {
@@ -392,7 +392,7 @@ CPUDef8080.opSHLD = function()
 /**
  * op=0x23 (INX H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINXH = function()
 {
@@ -403,7 +403,7 @@ CPUDef8080.opINXH = function()
 /**
  * op=0x24 (INR H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINRH = function()
 {
@@ -414,7 +414,7 @@ CPUDef8080.opINRH = function()
 /**
  * op=0x25 (DCR H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCRH = function()
 {
@@ -425,7 +425,7 @@ CPUDef8080.opDCRH = function()
 /**
  * op=0x26 (MVI H,d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMVIH = function()
 {
@@ -436,7 +436,7 @@ CPUDef8080.opMVIH = function()
 /**
  * op=0x27 (DAA)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDAA = function()
 {
@@ -458,7 +458,7 @@ CPUDef8080.opDAA = function()
 /**
  * op=0x29 (DAD H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDADH = function()
 {
@@ -471,7 +471,7 @@ CPUDef8080.opDADH = function()
 /**
  * op=0x2A (LHLD a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opLHLD = function()
 {
@@ -482,7 +482,7 @@ CPUDef8080.opLHLD = function()
 /**
  * op=0x2B (DCX H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCXH = function()
 {
@@ -493,7 +493,7 @@ CPUDef8080.opDCXH = function()
 /**
  * op=0x2C (INR L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINRL = function()
 {
@@ -504,7 +504,7 @@ CPUDef8080.opINRL = function()
 /**
  * op=0x2D (DCR L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCRL = function()
 {
@@ -515,7 +515,7 @@ CPUDef8080.opDCRL = function()
 /**
  * op=0x2E (MVI L,d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMVIL = function()
 {
@@ -526,7 +526,7 @@ CPUDef8080.opMVIL = function()
 /**
  * op=0x2F (CMA)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMA = function()
 {
@@ -537,7 +537,7 @@ CPUDef8080.opCMA = function()
 /**
  * op=0x31 (LXI SP,d16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opLXISP = function()
 {
@@ -548,7 +548,7 @@ CPUDef8080.opLXISP = function()
 /**
  * op=0x32 (STA a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSTA = function()
 {
@@ -559,7 +559,7 @@ CPUDef8080.opSTA = function()
 /**
  * op=0x33 (INX SP)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINXSP = function()
 {
@@ -570,7 +570,7 @@ CPUDef8080.opINXSP = function()
 /**
  * op=0x34 (INR M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINRM = function()
 {
@@ -582,7 +582,7 @@ CPUDef8080.opINRM = function()
 /**
  * op=0x35 (DCR M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCRM = function()
 {
@@ -594,7 +594,7 @@ CPUDef8080.opDCRM = function()
 /**
  * op=0x36 (MVI M,d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMVIM = function()
 {
@@ -605,7 +605,7 @@ CPUDef8080.opMVIM = function()
 /**
  * op=0x37 (STC)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSTC = function()
 {
@@ -616,7 +616,7 @@ CPUDef8080.opSTC = function()
 /**
  * op=0x39 (DAD SP)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDADSP = function()
 {
@@ -629,7 +629,7 @@ CPUDef8080.opDADSP = function()
 /**
  * op=0x3A (LDA a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opLDA = function()
 {
@@ -640,7 +640,7 @@ CPUDef8080.opLDA = function()
 /**
  * op=0x3B (DCX SP)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCXSP = function()
 {
@@ -651,7 +651,7 @@ CPUDef8080.opDCXSP = function()
 /**
  * op=0x3C (INR A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opINRA = function()
 {
@@ -662,7 +662,7 @@ CPUDef8080.opINRA = function()
 /**
  * op=0x3D (DCR A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDCRA = function()
 {
@@ -673,7 +673,7 @@ CPUDef8080.opDCRA = function()
 /**
  * op=0x3E (MVI A,d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMVIA = function()
 {
@@ -684,7 +684,7 @@ CPUDef8080.opMVIA = function()
 /**
  * op=0x3F (CMC)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMC = function()
 {
@@ -695,7 +695,7 @@ CPUDef8080.opCMC = function()
 /**
  * op=0x40 (MOV B,B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVBB = function()
 {
@@ -705,7 +705,7 @@ CPUDef8080.opMOVBB = function()
 /**
  * op=0x41 (MOV B,C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVBC = function()
 {
@@ -716,7 +716,7 @@ CPUDef8080.opMOVBC = function()
 /**
  * op=0x42 (MOV B,D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVBD = function()
 {
@@ -727,7 +727,7 @@ CPUDef8080.opMOVBD = function()
 /**
  * op=0x43 (MOV B,E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVBE = function()
 {
@@ -738,7 +738,7 @@ CPUDef8080.opMOVBE = function()
 /**
  * op=0x44 (MOV B,H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVBH = function()
 {
@@ -749,7 +749,7 @@ CPUDef8080.opMOVBH = function()
 /**
  * op=0x45 (MOV B,L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVBL = function()
 {
@@ -760,7 +760,7 @@ CPUDef8080.opMOVBL = function()
 /**
  * op=0x46 (MOV B,M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVBM = function()
 {
@@ -771,7 +771,7 @@ CPUDef8080.opMOVBM = function()
 /**
  * op=0x47 (MOV B,A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVBA = function()
 {
@@ -782,7 +782,7 @@ CPUDef8080.opMOVBA = function()
 /**
  * op=0x48 (MOV C,B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVCB = function()
 {
@@ -793,7 +793,7 @@ CPUDef8080.opMOVCB = function()
 /**
  * op=0x49 (MOV C,C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVCC = function()
 {
@@ -803,7 +803,7 @@ CPUDef8080.opMOVCC = function()
 /**
  * op=0x4A (MOV C,D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVCD = function()
 {
@@ -814,7 +814,7 @@ CPUDef8080.opMOVCD = function()
 /**
  * op=0x4B (MOV C,E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVCE = function()
 {
@@ -825,7 +825,7 @@ CPUDef8080.opMOVCE = function()
 /**
  * op=0x4C (MOV C,H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVCH = function()
 {
@@ -836,7 +836,7 @@ CPUDef8080.opMOVCH = function()
 /**
  * op=0x4D (MOV C,L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVCL = function()
 {
@@ -847,7 +847,7 @@ CPUDef8080.opMOVCL = function()
 /**
  * op=0x4E (MOV C,M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVCM = function()
 {
@@ -858,7 +858,7 @@ CPUDef8080.opMOVCM = function()
 /**
  * op=0x4F (MOV C,A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVCA = function()
 {
@@ -869,7 +869,7 @@ CPUDef8080.opMOVCA = function()
 /**
  * op=0x50 (MOV D,B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVDB = function()
 {
@@ -880,7 +880,7 @@ CPUDef8080.opMOVDB = function()
 /**
  * op=0x51 (MOV D,C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVDC = function()
 {
@@ -891,7 +891,7 @@ CPUDef8080.opMOVDC = function()
 /**
  * op=0x52 (MOV D,D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVDD = function()
 {
@@ -901,7 +901,7 @@ CPUDef8080.opMOVDD = function()
 /**
  * op=0x53 (MOV D,E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVDE = function()
 {
@@ -912,7 +912,7 @@ CPUDef8080.opMOVDE = function()
 /**
  * op=0x54 (MOV D,H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVDH = function()
 {
@@ -923,7 +923,7 @@ CPUDef8080.opMOVDH = function()
 /**
  * op=0x55 (MOV D,L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVDL = function()
 {
@@ -934,7 +934,7 @@ CPUDef8080.opMOVDL = function()
 /**
  * op=0x56 (MOV D,M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVDM = function()
 {
@@ -945,7 +945,7 @@ CPUDef8080.opMOVDM = function()
 /**
  * op=0x57 (MOV D,A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVDA = function()
 {
@@ -956,7 +956,7 @@ CPUDef8080.opMOVDA = function()
 /**
  * op=0x58 (MOV E,B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVEB = function()
 {
@@ -967,7 +967,7 @@ CPUDef8080.opMOVEB = function()
 /**
  * op=0x59 (MOV E,C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVEC = function()
 {
@@ -978,7 +978,7 @@ CPUDef8080.opMOVEC = function()
 /**
  * op=0x5A (MOV E,D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVED = function()
 {
@@ -989,7 +989,7 @@ CPUDef8080.opMOVED = function()
 /**
  * op=0x5B (MOV E,E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVEE = function()
 {
@@ -999,7 +999,7 @@ CPUDef8080.opMOVEE = function()
 /**
  * op=0x5C (MOV E,H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVEH = function()
 {
@@ -1010,7 +1010,7 @@ CPUDef8080.opMOVEH = function()
 /**
  * op=0x5D (MOV E,L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVEL = function()
 {
@@ -1021,7 +1021,7 @@ CPUDef8080.opMOVEL = function()
 /**
  * op=0x5E (MOV E,M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVEM = function()
 {
@@ -1032,7 +1032,7 @@ CPUDef8080.opMOVEM = function()
 /**
  * op=0x5F (MOV E,A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVEA = function()
 {
@@ -1043,7 +1043,7 @@ CPUDef8080.opMOVEA = function()
 /**
  * op=0x60 (MOV H,B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVHB = function()
 {
@@ -1054,7 +1054,7 @@ CPUDef8080.opMOVHB = function()
 /**
  * op=0x61 (MOV H,C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVHC = function()
 {
@@ -1065,7 +1065,7 @@ CPUDef8080.opMOVHC = function()
 /**
  * op=0x62 (MOV H,D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVHD = function()
 {
@@ -1076,7 +1076,7 @@ CPUDef8080.opMOVHD = function()
 /**
  * op=0x63 (MOV H,E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVHE = function()
 {
@@ -1087,7 +1087,7 @@ CPUDef8080.opMOVHE = function()
 /**
  * op=0x64 (MOV H,H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVHH = function()
 {
@@ -1097,7 +1097,7 @@ CPUDef8080.opMOVHH = function()
 /**
  * op=0x65 (MOV H,L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVHL = function()
 {
@@ -1108,7 +1108,7 @@ CPUDef8080.opMOVHL = function()
 /**
  * op=0x66 (MOV H,M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVHM = function()
 {
@@ -1119,7 +1119,7 @@ CPUDef8080.opMOVHM = function()
 /**
  * op=0x67 (MOV H,A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVHA = function()
 {
@@ -1130,7 +1130,7 @@ CPUDef8080.opMOVHA = function()
 /**
  * op=0x68 (MOV L,B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVLB = function()
 {
@@ -1141,7 +1141,7 @@ CPUDef8080.opMOVLB = function()
 /**
  * op=0x69 (MOV L,C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVLC = function()
 {
@@ -1152,7 +1152,7 @@ CPUDef8080.opMOVLC = function()
 /**
  * op=0x6A (MOV L,D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVLD = function()
 {
@@ -1163,7 +1163,7 @@ CPUDef8080.opMOVLD = function()
 /**
  * op=0x6B (MOV L,E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVLE = function()
 {
@@ -1174,7 +1174,7 @@ CPUDef8080.opMOVLE = function()
 /**
  * op=0x6C (MOV L,H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVLH = function()
 {
@@ -1185,7 +1185,7 @@ CPUDef8080.opMOVLH = function()
 /**
  * op=0x6D (MOV L,L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVLL = function()
 {
@@ -1195,7 +1195,7 @@ CPUDef8080.opMOVLL = function()
 /**
  * op=0x6E (MOV L,M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVLM = function()
 {
@@ -1206,7 +1206,7 @@ CPUDef8080.opMOVLM = function()
 /**
  * op=0x6F (MOV L,A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVLA = function()
 {
@@ -1217,7 +1217,7 @@ CPUDef8080.opMOVLA = function()
 /**
  * op=0x70 (MOV M,B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVMB = function()
 {
@@ -1228,7 +1228,7 @@ CPUDef8080.opMOVMB = function()
 /**
  * op=0x71 (MOV M,C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVMC = function()
 {
@@ -1239,7 +1239,7 @@ CPUDef8080.opMOVMC = function()
 /**
  * op=0x72 (MOV M,D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVMD = function()
 {
@@ -1250,7 +1250,7 @@ CPUDef8080.opMOVMD = function()
 /**
  * op=0x73 (MOV M,E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVME = function()
 {
@@ -1261,7 +1261,7 @@ CPUDef8080.opMOVME = function()
 /**
  * op=0x74 (MOV M,H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVMH = function()
 {
@@ -1272,7 +1272,7 @@ CPUDef8080.opMOVMH = function()
 /**
  * op=0x75 (MOV M,L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVML = function()
 {
@@ -1283,7 +1283,7 @@ CPUDef8080.opMOVML = function()
 /**
  * op=0x76 (HLT)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opHLT = function()
 {
@@ -1331,7 +1331,7 @@ CPUDef8080.opHLT = function()
 /**
  * op=0x77 (MOV M,A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVMA = function()
 {
@@ -1342,7 +1342,7 @@ CPUDef8080.opMOVMA = function()
 /**
  * op=0x78 (MOV A,B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVAB = function()
 {
@@ -1353,7 +1353,7 @@ CPUDef8080.opMOVAB = function()
 /**
  * op=0x79 (MOV A,C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVAC = function()
 {
@@ -1364,7 +1364,7 @@ CPUDef8080.opMOVAC = function()
 /**
  * op=0x7A (MOV A,D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVAD = function()
 {
@@ -1375,7 +1375,7 @@ CPUDef8080.opMOVAD = function()
 /**
  * op=0x7B (MOV A,E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVAE = function()
 {
@@ -1386,7 +1386,7 @@ CPUDef8080.opMOVAE = function()
 /**
  * op=0x7C (MOV A,H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVAH = function()
 {
@@ -1397,7 +1397,7 @@ CPUDef8080.opMOVAH = function()
 /**
  * op=0x7D (MOV A,L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVAL = function()
 {
@@ -1408,7 +1408,7 @@ CPUDef8080.opMOVAL = function()
 /**
  * op=0x7E (MOV A,M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVAM = function()
 {
@@ -1419,7 +1419,7 @@ CPUDef8080.opMOVAM = function()
 /**
  * op=0x7F (MOV A,A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opMOVAA = function()
 {
@@ -1429,7 +1429,7 @@ CPUDef8080.opMOVAA = function()
 /**
  * op=0x80 (ADD B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADDB = function()
 {
@@ -1440,7 +1440,7 @@ CPUDef8080.opADDB = function()
 /**
  * op=0x81 (ADD C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADDC = function()
 {
@@ -1451,7 +1451,7 @@ CPUDef8080.opADDC = function()
 /**
  * op=0x82 (ADD D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADDD = function()
 {
@@ -1462,7 +1462,7 @@ CPUDef8080.opADDD = function()
 /**
  * op=0x83 (ADD E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADDE = function()
 {
@@ -1473,7 +1473,7 @@ CPUDef8080.opADDE = function()
 /**
  * op=0x84 (ADD H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADDH = function()
 {
@@ -1484,7 +1484,7 @@ CPUDef8080.opADDH = function()
 /**
  * op=0x85 (ADD L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADDL = function()
 {
@@ -1495,7 +1495,7 @@ CPUDef8080.opADDL = function()
 /**
  * op=0x86 (ADD M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADDM = function()
 {
@@ -1506,7 +1506,7 @@ CPUDef8080.opADDM = function()
 /**
  * op=0x87 (ADD A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADDA = function()
 {
@@ -1517,7 +1517,7 @@ CPUDef8080.opADDA = function()
 /**
  * op=0x88 (ADC B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADCB = function()
 {
@@ -1528,7 +1528,7 @@ CPUDef8080.opADCB = function()
 /**
  * op=0x89 (ADC C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADCC = function()
 {
@@ -1539,7 +1539,7 @@ CPUDef8080.opADCC = function()
 /**
  * op=0x8A (ADC D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADCD = function()
 {
@@ -1550,7 +1550,7 @@ CPUDef8080.opADCD = function()
 /**
  * op=0x8B (ADC E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADCE = function()
 {
@@ -1561,7 +1561,7 @@ CPUDef8080.opADCE = function()
 /**
  * op=0x8C (ADC H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADCH = function()
 {
@@ -1572,7 +1572,7 @@ CPUDef8080.opADCH = function()
 /**
  * op=0x8D (ADC L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADCL = function()
 {
@@ -1583,7 +1583,7 @@ CPUDef8080.opADCL = function()
 /**
  * op=0x8E (ADC M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADCM = function()
 {
@@ -1594,7 +1594,7 @@ CPUDef8080.opADCM = function()
 /**
  * op=0x8F (ADC A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADCA = function()
 {
@@ -1605,7 +1605,7 @@ CPUDef8080.opADCA = function()
 /**
  * op=0x90 (SUB B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUBB = function()
 {
@@ -1616,7 +1616,7 @@ CPUDef8080.opSUBB = function()
 /**
  * op=0x91 (SUB C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUBC = function()
 {
@@ -1627,7 +1627,7 @@ CPUDef8080.opSUBC = function()
 /**
  * op=0x92 (SUB D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUBD = function()
 {
@@ -1638,7 +1638,7 @@ CPUDef8080.opSUBD = function()
 /**
  * op=0x93 (SUB E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUBE = function()
 {
@@ -1649,7 +1649,7 @@ CPUDef8080.opSUBE = function()
 /**
  * op=0x94 (SUB H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUBH = function()
 {
@@ -1660,7 +1660,7 @@ CPUDef8080.opSUBH = function()
 /**
  * op=0x95 (SUB L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUBL = function()
 {
@@ -1671,7 +1671,7 @@ CPUDef8080.opSUBL = function()
 /**
  * op=0x96 (SUB M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUBM = function()
 {
@@ -1682,7 +1682,7 @@ CPUDef8080.opSUBM = function()
 /**
  * op=0x97 (SUB A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUBA = function()
 {
@@ -1693,7 +1693,7 @@ CPUDef8080.opSUBA = function()
 /**
  * op=0x98 (SBB B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBBB = function()
 {
@@ -1704,7 +1704,7 @@ CPUDef8080.opSBBB = function()
 /**
  * op=0x99 (SBB C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBBC = function()
 {
@@ -1715,7 +1715,7 @@ CPUDef8080.opSBBC = function()
 /**
  * op=0x9A (SBB D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBBD = function()
 {
@@ -1726,7 +1726,7 @@ CPUDef8080.opSBBD = function()
 /**
  * op=0x9B (SBB E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBBE = function()
 {
@@ -1737,7 +1737,7 @@ CPUDef8080.opSBBE = function()
 /**
  * op=0x9C (SBB H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBBH = function()
 {
@@ -1748,7 +1748,7 @@ CPUDef8080.opSBBH = function()
 /**
  * op=0x9D (SBB L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBBL = function()
 {
@@ -1759,7 +1759,7 @@ CPUDef8080.opSBBL = function()
 /**
  * op=0x9E (SBB M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBBM = function()
 {
@@ -1770,7 +1770,7 @@ CPUDef8080.opSBBM = function()
 /**
  * op=0x9F (SBB A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBBA = function()
 {
@@ -1781,7 +1781,7 @@ CPUDef8080.opSBBA = function()
 /**
  * op=0xA0 (ANA B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANAB = function()
 {
@@ -1792,7 +1792,7 @@ CPUDef8080.opANAB = function()
 /**
  * op=0xA1 (ANA C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANAC = function()
 {
@@ -1803,7 +1803,7 @@ CPUDef8080.opANAC = function()
 /**
  * op=0xA2 (ANA D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANAD = function()
 {
@@ -1814,7 +1814,7 @@ CPUDef8080.opANAD = function()
 /**
  * op=0xA3 (ANA E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANAE = function()
 {
@@ -1825,7 +1825,7 @@ CPUDef8080.opANAE = function()
 /**
  * op=0xA4 (ANA H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANAH = function()
 {
@@ -1836,7 +1836,7 @@ CPUDef8080.opANAH = function()
 /**
  * op=0xA5 (ANA L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANAL = function()
 {
@@ -1847,7 +1847,7 @@ CPUDef8080.opANAL = function()
 /**
  * op=0xA6 (ANA M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANAM = function()
 {
@@ -1858,7 +1858,7 @@ CPUDef8080.opANAM = function()
 /**
  * op=0xA7 (ANA A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANAA = function()
 {
@@ -1869,7 +1869,7 @@ CPUDef8080.opANAA = function()
 /**
  * op=0xA8 (XRA B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRAB = function()
 {
@@ -1880,7 +1880,7 @@ CPUDef8080.opXRAB = function()
 /**
  * op=0xA9 (XRA C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRAC = function()
 {
@@ -1891,7 +1891,7 @@ CPUDef8080.opXRAC = function()
 /**
  * op=0xAA (XRA D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRAD = function()
 {
@@ -1902,7 +1902,7 @@ CPUDef8080.opXRAD = function()
 /**
  * op=0xAB (XRA E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRAE = function()
 {
@@ -1913,7 +1913,7 @@ CPUDef8080.opXRAE = function()
 /**
  * op=0xAC (XRA H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRAH = function()
 {
@@ -1924,7 +1924,7 @@ CPUDef8080.opXRAH = function()
 /**
  * op=0xAD (XRA L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRAL = function()
 {
@@ -1935,7 +1935,7 @@ CPUDef8080.opXRAL = function()
 /**
  * op=0xAE (XRA M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRAM = function()
 {
@@ -1946,7 +1946,7 @@ CPUDef8080.opXRAM = function()
 /**
  * op=0xAF (XRA A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRAA = function()
 {
@@ -1957,7 +1957,7 @@ CPUDef8080.opXRAA = function()
 /**
  * op=0xB0 (ORA B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORAB = function()
 {
@@ -1968,7 +1968,7 @@ CPUDef8080.opORAB = function()
 /**
  * op=0xB1 (ORA C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORAC = function()
 {
@@ -1979,7 +1979,7 @@ CPUDef8080.opORAC = function()
 /**
  * op=0xB2 (ORA D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORAD = function()
 {
@@ -1990,7 +1990,7 @@ CPUDef8080.opORAD = function()
 /**
  * op=0xB3 (ORA E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORAE = function()
 {
@@ -2001,7 +2001,7 @@ CPUDef8080.opORAE = function()
 /**
  * op=0xB4 (ORA H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORAH = function()
 {
@@ -2012,7 +2012,7 @@ CPUDef8080.opORAH = function()
 /**
  * op=0xB5 (ORA L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORAL = function()
 {
@@ -2023,7 +2023,7 @@ CPUDef8080.opORAL = function()
 /**
  * op=0xB6 (ORA M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORAM = function()
 {
@@ -2034,7 +2034,7 @@ CPUDef8080.opORAM = function()
 /**
  * op=0xB7 (ORA A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORAA = function()
 {
@@ -2045,7 +2045,7 @@ CPUDef8080.opORAA = function()
 /**
  * op=0xB8 (CMP B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMPB = function()
 {
@@ -2056,7 +2056,7 @@ CPUDef8080.opCMPB = function()
 /**
  * op=0xB9 (CMP C)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMPC = function()
 {
@@ -2067,7 +2067,7 @@ CPUDef8080.opCMPC = function()
 /**
  * op=0xBA (CMP D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMPD = function()
 {
@@ -2078,7 +2078,7 @@ CPUDef8080.opCMPD = function()
 /**
  * op=0xBB (CMP E)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMPE = function()
 {
@@ -2089,7 +2089,7 @@ CPUDef8080.opCMPE = function()
 /**
  * op=0xBC (CMP H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMPH = function()
 {
@@ -2100,7 +2100,7 @@ CPUDef8080.opCMPH = function()
 /**
  * op=0xBD (CMP L)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMPL = function()
 {
@@ -2111,7 +2111,7 @@ CPUDef8080.opCMPL = function()
 /**
  * op=0xBE (CMP M)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMPM = function()
 {
@@ -2122,7 +2122,7 @@ CPUDef8080.opCMPM = function()
 /**
  * op=0xBF (CMP A)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCMPA = function()
 {
@@ -2133,7 +2133,7 @@ CPUDef8080.opCMPA = function()
 /**
  * op=0xC0 (RNZ)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRNZ = function()
 {
@@ -2147,7 +2147,7 @@ CPUDef8080.opRNZ = function()
 /**
  * op=0xC1 (POP B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPOPB = function()
 {
@@ -2158,7 +2158,7 @@ CPUDef8080.opPOPB = function()
 /**
  * op=0xC2 (JNZ a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJNZ = function()
 {
@@ -2170,7 +2170,7 @@ CPUDef8080.opJNZ = function()
 /**
  * op=0xC3 (JMP a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJMP = function()
 {
@@ -2181,7 +2181,7 @@ CPUDef8080.opJMP = function()
 /**
  * op=0xC4 (CNZ a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCNZ = function()
 {
@@ -2197,7 +2197,7 @@ CPUDef8080.opCNZ = function()
 /**
  * op=0xC5 (PUSH B)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPUSHB = function()
 {
@@ -2208,7 +2208,7 @@ CPUDef8080.opPUSHB = function()
 /**
  * op=0xC6 (ADI d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opADI = function()
 {
@@ -2219,7 +2219,7 @@ CPUDef8080.opADI = function()
 /**
  * op=0xC7 (RST 0)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRST0 = function()
 {
@@ -2231,7 +2231,7 @@ CPUDef8080.opRST0 = function()
 /**
  * op=0xC8 (RZ)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRZ = function()
 {
@@ -2245,7 +2245,7 @@ CPUDef8080.opRZ = function()
 /**
  * op=0xC9 (RET)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRET = function()
 {
@@ -2256,7 +2256,7 @@ CPUDef8080.opRET = function()
 /**
  * op=0xCA (JZ a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJZ = function()
 {
@@ -2268,7 +2268,7 @@ CPUDef8080.opJZ = function()
 /**
  * op=0xCC (CZ a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCZ = function()
 {
@@ -2284,7 +2284,7 @@ CPUDef8080.opCZ = function()
 /**
  * op=0xCD (CALL a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCALL = function()
 {
@@ -2297,7 +2297,7 @@ CPUDef8080.opCALL = function()
 /**
  * op=0xCE (ACI d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opACI = function()
 {
@@ -2308,7 +2308,7 @@ CPUDef8080.opACI = function()
 /**
  * op=0xCF (RST 1)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRST1 = function()
 {
@@ -2320,7 +2320,7 @@ CPUDef8080.opRST1 = function()
 /**
  * op=0xD0 (RNC)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRNC = function()
 {
@@ -2334,7 +2334,7 @@ CPUDef8080.opRNC = function()
 /**
  * op=0xD1 (POP D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPOPD = function()
 {
@@ -2345,7 +2345,7 @@ CPUDef8080.opPOPD = function()
 /**
  * op=0xD2 (JNC a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJNC = function()
 {
@@ -2357,7 +2357,7 @@ CPUDef8080.opJNC = function()
 /**
  * op=0xD3 (OUT d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opOUT = function()
 {
@@ -2369,7 +2369,7 @@ CPUDef8080.opOUT = function()
 /**
  * op=0xD4 (CNC a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCNC = function()
 {
@@ -2385,7 +2385,7 @@ CPUDef8080.opCNC = function()
 /**
  * op=0xD5 (PUSH D)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPUSHD = function()
 {
@@ -2396,7 +2396,7 @@ CPUDef8080.opPUSHD = function()
 /**
  * op=0xD6 (SUI d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSUI = function()
 {
@@ -2407,7 +2407,7 @@ CPUDef8080.opSUI = function()
 /**
  * op=0xD7 (RST 2)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRST2 = function()
 {
@@ -2419,7 +2419,7 @@ CPUDef8080.opRST2 = function()
 /**
  * op=0xD8 (RC)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRC = function()
 {
@@ -2433,7 +2433,7 @@ CPUDef8080.opRC = function()
 /**
  * op=0xDA (JC a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJC = function()
 {
@@ -2445,7 +2445,7 @@ CPUDef8080.opJC = function()
 /**
  * op=0xDB (IN d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opIN = function()
 {
@@ -2457,7 +2457,7 @@ CPUDef8080.opIN = function()
 /**
  * op=0xDC (CC a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCC = function()
 {
@@ -2473,7 +2473,7 @@ CPUDef8080.opCC = function()
 /**
  * op=0xDE (SBI d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSBI = function()
 {
@@ -2484,7 +2484,7 @@ CPUDef8080.opSBI = function()
 /**
  * op=0xDF (RST 3)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRST3 = function()
 {
@@ -2496,7 +2496,7 @@ CPUDef8080.opRST3 = function()
 /**
  * op=0xE0 (RPO)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRPO = function()
 {
@@ -2510,7 +2510,7 @@ CPUDef8080.opRPO = function()
 /**
  * op=0xE1 (POP H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPOPH = function()
 {
@@ -2521,7 +2521,7 @@ CPUDef8080.opPOPH = function()
 /**
  * op=0xE2 (JPO a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJPO = function()
 {
@@ -2533,7 +2533,7 @@ CPUDef8080.opJPO = function()
 /**
  * op=0xE3 (XTHL)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXTHL = function()
 {
@@ -2546,7 +2546,7 @@ CPUDef8080.opXTHL = function()
 /**
  * op=0xE4 (CPO a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCPO = function()
 {
@@ -2562,7 +2562,7 @@ CPUDef8080.opCPO = function()
 /**
  * op=0xE5 (PUSH H)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPUSHH = function()
 {
@@ -2573,7 +2573,7 @@ CPUDef8080.opPUSHH = function()
 /**
  * op=0xE6 (ANI d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opANI = function()
 {
@@ -2584,7 +2584,7 @@ CPUDef8080.opANI = function()
 /**
  * op=0xE7 (RST 4)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRST4 = function()
 {
@@ -2596,7 +2596,7 @@ CPUDef8080.opRST4 = function()
 /**
  * op=0xE8 (RPE)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRPE = function()
 {
@@ -2610,7 +2610,7 @@ CPUDef8080.opRPE = function()
 /**
  * op=0xE9 (PCHL)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPCHL = function()
 {
@@ -2621,7 +2621,7 @@ CPUDef8080.opPCHL = function()
 /**
  * op=0xEA (JPE a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJPE = function()
 {
@@ -2633,7 +2633,7 @@ CPUDef8080.opJPE = function()
 /**
  * op=0xEB (XCHG)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXCHG = function()
 {
@@ -2646,7 +2646,7 @@ CPUDef8080.opXCHG = function()
 /**
  * op=0xEC (CPE a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCPE = function()
 {
@@ -2662,7 +2662,7 @@ CPUDef8080.opCPE = function()
 /**
  * op=0xEE (XRI d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opXRI = function()
 {
@@ -2673,7 +2673,7 @@ CPUDef8080.opXRI = function()
 /**
  * op=0xEF (RST 5)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRST5 = function()
 {
@@ -2685,7 +2685,7 @@ CPUDef8080.opRST5 = function()
 /**
  * op=0xF0 (RP)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRP = function()
 {
@@ -2699,7 +2699,7 @@ CPUDef8080.opRP = function()
 /**
  * op=0xF1 (POP PSW)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPOPSW = function()
 {
@@ -2710,7 +2710,7 @@ CPUDef8080.opPOPSW = function()
 /**
  * op=0xF2 (JP a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJP = function()
 {
@@ -2722,7 +2722,7 @@ CPUDef8080.opJP = function()
 /**
  * op=0xF3 (DI)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opDI = function()
 {
@@ -2733,7 +2733,7 @@ CPUDef8080.opDI = function()
 /**
  * op=0xF4 (CP a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCP = function()
 {
@@ -2749,7 +2749,7 @@ CPUDef8080.opCP = function()
 /**
  * op=0xF5 (PUSH PSW)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opPUPSW = function()
 {
@@ -2760,7 +2760,7 @@ CPUDef8080.opPUPSW = function()
 /**
  * op=0xF6 (ORI d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opORI = function()
 {
@@ -2771,7 +2771,7 @@ CPUDef8080.opORI = function()
 /**
  * op=0xF7 (RST 6)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRST6 = function()
 {
@@ -2783,7 +2783,7 @@ CPUDef8080.opRST6 = function()
 /**
  * op=0xF8 (RM)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRM = function()
 {
@@ -2797,7 +2797,7 @@ CPUDef8080.opRM = function()
 /**
  * op=0xF9 (SPHL)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opSPHL = function()
 {
@@ -2808,7 +2808,7 @@ CPUDef8080.opSPHL = function()
 /**
  * op=0xFA (JM a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opJM = function()
 {
@@ -2820,7 +2820,7 @@ CPUDef8080.opJM = function()
 /**
  * op=0xFB (EI)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opEI = function()
 {
@@ -2832,7 +2832,7 @@ CPUDef8080.opEI = function()
 /**
  * op=0xFC (CM a16)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCM = function()
 {
@@ -2848,7 +2848,7 @@ CPUDef8080.opCM = function()
 /**
  * op=0xFE (CPI d8)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opCPI = function()
 {
@@ -2859,7 +2859,7 @@ CPUDef8080.opCPI = function()
 /**
  * op=0xFF (RST 7)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
 CPUDef8080.opRST7 = function()
 {
diff --git a/modules/pc8080/lib/cpustate.js b/modules/pc8080/lib/cpustate.js
index 2479325ac..5ab1fe374 100644
--- a/modules/pc8080/lib/cpustate.js
+++ b/modules/pc8080/lib/cpustate.js
@@ -44,9 +44,9 @@ if (NODE) {
 }
 
 /**
- * CPUState8080(parmsCPU)
+ * CPU8080State(parmsCPU)
  *
- * The CPUState8080 class uses the following (parmsCPU) properties:
+ * The CPU8080State class uses the following (parmsCPU) properties:
  *
  *      model: a number (eg, 8080) that should match one of the CPUDef8080.MODEL_* values
  *
@@ -54,14 +54,14 @@ if (NODE) {
  * constructor, along with a default speed (cycles per second) based on the specified (or default)
  * CPU model number.
  *
- * The CPUState8080 class was initially written to simulate a 8080 microprocessor, although over time
+ * The CPU8080State class was initially written to simulate a 8080 microprocessor, although over time
  * it may evolved to support other microprocessors (eg, the Zilog Z80).
  *
  * @constructor
  * @extends CPU8080
  * @param {Object} parmsCPU
  */
-function CPUState8080(parmsCPU)
+function CPU8080State(parmsCPU)
 {
     this.model = +parmsCPU['model'] || CPUDef8080.MODEL_8080;
 
@@ -105,17 +105,17 @@ function CPUState8080(parmsCPU)
     this.resetRegs();
 }
 
-Component.subclass(CPUState8080, CPU8080);
+Component.subclass(CPU8080State, CPU8080);
 
 /**
  * addHaltCheck(fn)
  *
  * Records a function that will be called during HLT opcode processing.
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {function(number)} fn
  */
-CPUState8080.prototype.addHaltCheck = function(fn)
+CPU8080State.prototype.addHaltCheck = function(fn)
 {
     this.afnHalt.push(fn);
 };
@@ -129,9 +129,9 @@ CPUState8080.prototype.addHaltCheck = function(fn)
  * a Closure Compiler optimization is defeated when generating the function array at run-time instead of at
  * compile-time.
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.initProcessor = function()
+CPU8080State.prototype.initProcessor = function()
 {
     this.aOps = CPUDef8080.aOps8080;
 };
@@ -139,9 +139,9 @@ CPUState8080.prototype.initProcessor = function()
 /**
  * reset()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.reset = function()
+CPU8080State.prototype.reset = function()
 {
     if (this.flags.fRunning) this.stopCPU();
     this.resetRegs();
@@ -153,9 +153,9 @@ CPUState8080.prototype.reset = function()
 /**
  * resetRegs()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.resetRegs = function()
+CPU8080State.prototype.resetRegs = function()
 {
     this.regA = 0;
     this.regB = 0;
@@ -183,10 +183,10 @@ CPUState8080.prototype.resetRegs = function()
 /**
  * setReset(addr)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} addr
  */
-CPUState8080.prototype.setReset = function(addr)
+CPU8080State.prototype.setReset = function(addr)
 {
     this.addrReset = addr;
     this.setPC(addr);
@@ -195,10 +195,10 @@ CPUState8080.prototype.setReset = function(addr)
 /**
  * getChecksum()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} a 32-bit summation of key elements of the current CPU state (used by the CPU checksum code)
  */
-CPUState8080.prototype.getChecksum = function()
+CPU8080State.prototype.getChecksum = function()
 {
     var sum = (this.regA + this.regB + this.regC + this.regD + this.regE + this.regH + this.regL)|0;
     sum = (sum + this.getSP() + this.getPC() + this.getPS())|0;
@@ -208,12 +208,12 @@ CPUState8080.prototype.getChecksum = function()
 /**
  * save()
  *
- * This implements save support for the CPUState8080 component.
+ * This implements save support for the CPU8080State component.
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {Object|null}
  */
-CPUState8080.prototype.save = function()
+CPU8080State.prototype.save = function()
 {
     var state = new State(this);
     state.set(0, [this.regA, this.regB, this.regC, this.regD, this.regE, this.regH, this.regL, this.getSP(), this.getPC(), this.getPS()]);
@@ -225,13 +225,13 @@ CPUState8080.prototype.save = function()
 /**
  * restore(data)
  *
- * This implements restore support for the CPUState8080 component.
+ * This implements restore support for the CPU8080State component.
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {Object} data
  * @return {boolean} true if restore successful, false if not
  */
-CPUState8080.prototype.restore = function(data)
+CPU8080State.prototype.restore = function(data)
 {
     var a = data[0];
     this.regA = a[0];
@@ -254,14 +254,14 @@ CPUState8080.prototype.restore = function(data)
 /**
  * setBinding(sHTMLType, sBinding, control, sValue)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {string|null} sHTMLType is the type of the HTML control (eg, "button", "list", "text", "submit", "textarea", "canvas")
  * @param {string} sBinding is the value of the 'binding' parameter stored in the HTML control's "data-value" attribute (eg, "AX")
  * @param {Object} control is the HTML control DOM object (eg, HTMLButtonElement)
  * @param {string} [sValue] optional data value
  * @return {boolean} true if binding was successful, false if unrecognized binding request
  */
-CPUState8080.prototype.setBinding = function(sHTMLType, sBinding, control, sValue)
+CPU8080State.prototype.setBinding = function(sHTMLType, sBinding, control, sValue)
 {
     var fBound = false;
     switch (sBinding) {
@@ -298,10 +298,10 @@ CPUState8080.prototype.setBinding = function(sHTMLType, sBinding, control, sValu
 /**
  * getBC()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number}
  */
-CPUState8080.prototype.getBC = function()
+CPU8080State.prototype.getBC = function()
 {
     return (this.regB << 8) | this.regC;
 };
@@ -309,10 +309,10 @@ CPUState8080.prototype.getBC = function()
 /**
  * setBC(w)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} w
  */
-CPUState8080.prototype.setBC = function(w)
+CPU8080State.prototype.setBC = function(w)
 {
     this.regB = (w >> 8) & 0xff;
     this.regC = w & 0xff;
@@ -321,10 +321,10 @@ CPUState8080.prototype.setBC = function(w)
 /**
  * getDE()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number}
  */
-CPUState8080.prototype.getDE = function()
+CPU8080State.prototype.getDE = function()
 {
     return (this.regD << 8) | this.regE;
 };
@@ -332,10 +332,10 @@ CPUState8080.prototype.getDE = function()
 /**
  * setDE(w)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} w
  */
-CPUState8080.prototype.setDE = function(w)
+CPU8080State.prototype.setDE = function(w)
 {
     this.regD = (w >> 8) & 0xff;
     this.regE = w & 0xff;
@@ -344,10 +344,10 @@ CPUState8080.prototype.setDE = function(w)
 /**
  * getHL()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number}
  */
-CPUState8080.prototype.getHL = function()
+CPU8080State.prototype.getHL = function()
 {
     return (this.regH << 8) | this.regL;
 };
@@ -355,10 +355,10 @@ CPUState8080.prototype.getHL = function()
 /**
  * setHL(w)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} w
  */
-CPUState8080.prototype.setHL = function(w)
+CPU8080State.prototype.setHL = function(w)
 {
     this.regH = (w >> 8) & 0xff;
     this.regL = w & 0xff;
@@ -367,10 +367,10 @@ CPUState8080.prototype.setHL = function(w)
 /**
  * getSP()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number}
  */
-CPUState8080.prototype.getSP = function()
+CPU8080State.prototype.getSP = function()
 {
     return this.regSP;
 };
@@ -378,10 +378,10 @@ CPUState8080.prototype.getSP = function()
 /**
  * setSP(off)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} off
  */
-CPUState8080.prototype.setSP = function(off)
+CPU8080State.prototype.setSP = function(off)
 {
     this.regSP = off & 0xffff;
 };
@@ -389,10 +389,10 @@ CPUState8080.prototype.setSP = function(off)
 /**
  * getPC()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number}
  */
-CPUState8080.prototype.getPC = function()
+CPU8080State.prototype.getPC = function()
 {
     return this.regPC;
 };
@@ -400,11 +400,11 @@ CPUState8080.prototype.getPC = function()
 /**
  * offPC()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} off
  * @return {number}
  */
-CPUState8080.prototype.offPC = function(off)
+CPU8080State.prototype.offPC = function(off)
 {
     return (this.regPC + off) & 0xffff;
 };
@@ -412,10 +412,10 @@ CPUState8080.prototype.offPC = function(off)
 /**
  * setPC(off)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} off
  */
-CPUState8080.prototype.setPC = function(off)
+CPU8080State.prototype.setPC = function(off)
 {
     this.regPC = off & 0xffff;
 };
@@ -423,9 +423,9 @@ CPUState8080.prototype.setPC = function(off)
 /**
  * clearCF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.clearCF = function()
+CPU8080State.prototype.clearCF = function()
 {
     this.resultZeroCarry &= 0xff;
 };
@@ -433,10 +433,10 @@ CPUState8080.prototype.clearCF = function()
 /**
  * getCF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} 0 or 1 (CPUDef8080.PS.CF)
  */
-CPUState8080.prototype.getCF = function()
+CPU8080State.prototype.getCF = function()
 {
     return (this.resultZeroCarry & 0x100)? CPUDef8080.PS.CF : 0;
 };
@@ -444,9 +444,9 @@ CPUState8080.prototype.getCF = function()
 /**
  * setCF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.setCF = function()
+CPU8080State.prototype.setCF = function()
 {
     this.resultZeroCarry |= 0x100;
 };
@@ -454,10 +454,10 @@ CPUState8080.prototype.setCF = function()
 /**
  * updateCF(CF)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} CF (0x000 or 0x100)
  */
-CPUState8080.prototype.updateCF = function(CF)
+CPU8080State.prototype.updateCF = function(CF)
 {
     this.resultZeroCarry = (this.resultZeroCarry & 0xff) | CF;
 };
@@ -465,9 +465,9 @@ CPUState8080.prototype.updateCF = function(CF)
 /**
  * clearPF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.clearPF = function()
+CPU8080State.prototype.clearPF = function()
 {
     if (this.getPF()) this.resultParitySign ^= 0x1;
 };
@@ -475,10 +475,10 @@ CPUState8080.prototype.clearPF = function()
 /**
  * getPF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} 0 or CPUDef8080.PS.PF
  */
-CPUState8080.prototype.getPF = function()
+CPU8080State.prototype.getPF = function()
 {
     return (CPUDef8080.PARITY[this.resultParitySign & 0xff])? CPUDef8080.PS.PF : 0;
 };
@@ -486,9 +486,9 @@ CPUState8080.prototype.getPF = function()
 /**
  * setPF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.setPF = function()
+CPU8080State.prototype.setPF = function()
 {
     if (!this.getPF()) this.resultParitySign ^= 0x1;
 };
@@ -496,9 +496,9 @@ CPUState8080.prototype.setPF = function()
 /**
  * clearAF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.clearAF = function()
+CPU8080State.prototype.clearAF = function()
 {
     this.resultAuxOverflow = (this.resultParitySign & 0x10) | (this.resultAuxOverflow & ~0x10);
 };
@@ -506,10 +506,10 @@ CPUState8080.prototype.clearAF = function()
 /**
  * getAF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} 0 or CPUDef8080.PS.AF
  */
-CPUState8080.prototype.getAF = function()
+CPU8080State.prototype.getAF = function()
 {
     return ((this.resultParitySign ^ this.resultAuxOverflow) & 0x10)? CPUDef8080.PS.AF : 0;
 };
@@ -517,9 +517,9 @@ CPUState8080.prototype.getAF = function()
 /**
  * setAF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.setAF = function()
+CPU8080State.prototype.setAF = function()
 {
     this.resultAuxOverflow = (~this.resultParitySign & 0x10) | (this.resultAuxOverflow & ~0x10);
 };
@@ -527,9 +527,9 @@ CPUState8080.prototype.setAF = function()
 /**
  * clearZF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.clearZF = function()
+CPU8080State.prototype.clearZF = function()
 {
     this.resultZeroCarry |= 0xff;
 };
@@ -537,10 +537,10 @@ CPUState8080.prototype.clearZF = function()
 /**
  * getZF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} 0 or CPUDef8080.PS.ZF
  */
-CPUState8080.prototype.getZF = function()
+CPU8080State.prototype.getZF = function()
 {
     return (this.resultZeroCarry & 0xff)? 0 : CPUDef8080.PS.ZF;
 };
@@ -548,9 +548,9 @@ CPUState8080.prototype.getZF = function()
 /**
  * setZF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.setZF = function()
+CPU8080State.prototype.setZF = function()
 {
     this.resultZeroCarry &= ~0xff;
 };
@@ -558,9 +558,9 @@ CPUState8080.prototype.setZF = function()
 /**
  * clearSF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.clearSF = function()
+CPU8080State.prototype.clearSF = function()
 {
     if (this.getSF()) this.resultParitySign ^= 0xc0;
 };
@@ -568,10 +568,10 @@ CPUState8080.prototype.clearSF = function()
 /**
  * getSF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} 0 or CPUDef8080.PS.SF
  */
-CPUState8080.prototype.getSF = function()
+CPU8080State.prototype.getSF = function()
 {
     return (this.resultParitySign & 0x80)? CPUDef8080.PS.SF : 0;
 };
@@ -579,9 +579,9 @@ CPUState8080.prototype.getSF = function()
 /**
  * setSF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.setSF = function()
+CPU8080State.prototype.setSF = function()
 {
     if (!this.getSF()) this.resultParitySign ^= 0xc0;
 };
@@ -589,9 +589,9 @@ CPUState8080.prototype.setSF = function()
 /**
  * clearIF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.clearIF = function()
+CPU8080State.prototype.clearIF = function()
 {
     this.regPS &= ~CPUDef8080.PS.IF;
 };
@@ -599,10 +599,10 @@ CPUState8080.prototype.clearIF = function()
 /**
  * getIF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} 0 or CPUDef8080.PS.IF
  */
-CPUState8080.prototype.getIF = function()
+CPU8080State.prototype.getIF = function()
 {
     return (this.regPS & CPUDef8080.PS.IF);
 };
@@ -610,9 +610,9 @@ CPUState8080.prototype.getIF = function()
 /**
  * setIF()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.setIF = function()
+CPU8080State.prototype.setIF = function()
 {
     this.regPS |= CPUDef8080.PS.IF;
 };
@@ -620,10 +620,10 @@ CPUState8080.prototype.setIF = function()
 /**
  * getPS()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number}
  */
-CPUState8080.prototype.getPS = function()
+CPU8080State.prototype.getPS = function()
 {
     return (this.regPS & ~CPUDef8080.PS.RESULT) | (this.getSF() | this.getZF() | this.getAF() | this.getPF() | this.getCF());
 };
@@ -631,10 +631,10 @@ CPUState8080.prototype.getPS = function()
 /**
  * setPS(regPS)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} regPS
  */
-CPUState8080.prototype.setPS = function(regPS)
+CPU8080State.prototype.setPS = function(regPS)
 {
     this.resultZeroCarry = this.resultParitySign = this.resultAuxOverflow = 0;
     if (regPS & CPUDef8080.PS.CF) this.resultZeroCarry |= 0x100;
@@ -649,10 +649,10 @@ CPUState8080.prototype.setPS = function(regPS)
 /**
  * getPSW()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number}
  */
-CPUState8080.prototype.getPSW = function()
+CPU8080State.prototype.getPSW = function()
 {
     return (this.getPS() & CPUDef8080.PS.MASK) | (this.regA << 8);
 };
@@ -660,10 +660,10 @@ CPUState8080.prototype.getPSW = function()
 /**
  * setPSW(w)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} w
  */
-CPUState8080.prototype.setPSW = function(w)
+CPU8080State.prototype.setPSW = function(w)
 {
     this.setPS((w & CPUDef8080.PS.MASK) | (this.regPS & ~CPUDef8080.PS.MASK));
     this.regA = w >> 8;
@@ -672,11 +672,11 @@ CPUState8080.prototype.setPSW = function(w)
 /**
  * addByte(src)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} src
  * @return {number} regA + src
  */
-CPUState8080.prototype.addByte = function(src)
+CPU8080State.prototype.addByte = function(src)
 {
     this.resultAuxOverflow = this.regA ^ src;
     return this.resultParitySign = (this.resultZeroCarry = this.regA + src) & 0xff;
@@ -685,11 +685,11 @@ CPUState8080.prototype.addByte = function(src)
 /**
  * addByteCarry(src)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} src
  * @return {number} regA + src + carry
  */
-CPUState8080.prototype.addByteCarry = function(src)
+CPU8080State.prototype.addByteCarry = function(src)
 {
     this.resultAuxOverflow = this.regA ^ src;
     return this.resultParitySign = (this.resultZeroCarry = this.regA + src + ((this.resultZeroCarry & 0x100)? 1 : 0)) & 0xff;
@@ -701,11 +701,11 @@ CPUState8080.prototype.addByteCarry = function(src)
  * Ordinarily, one would expect the Auxiliary Carry flag (AF) to be clear after this operation,
  * but apparently the 8080 will set AF if bit 3 in either operand is set.
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} src
  * @return {number} regA & src
  */
-CPUState8080.prototype.andByte = function(src)
+CPU8080State.prototype.andByte = function(src)
 {
     this.resultZeroCarry = this.resultParitySign = this.resultAuxOverflow = this.regA & src;
     if ((this.regA | src) & 0x8) this.resultAuxOverflow ^= 0x10;        // set AF by inverting bit 4 in resultAuxOverflow
@@ -718,11 +718,11 @@ CPUState8080.prototype.andByte = function(src)
  * We perform this operation using 8-bit two's complement arithmetic, by negating and then adding
  * the implied src of 1.  This appears to mimic how the 8080 manages the Auxiliary Carry flag (AF).
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} b
  * @return {number}
  */
-CPUState8080.prototype.decByte = function(b)
+CPU8080State.prototype.decByte = function(b)
 {
     this.resultAuxOverflow = b ^ 0xff;
     b = this.resultParitySign = (b + 0xff) & 0xff;
@@ -733,11 +733,11 @@ CPUState8080.prototype.decByte = function(b)
 /**
  * incByte(b)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} b
  * @return {number}
  */
-CPUState8080.prototype.incByte = function(b)
+CPU8080State.prototype.incByte = function(b)
 {
     this.resultAuxOverflow = b;
     b = this.resultParitySign = (b + 1) & 0xff;
@@ -748,11 +748,11 @@ CPUState8080.prototype.incByte = function(b)
 /**
  * orByte(src)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} src
  * @return {number} regA | src
  */
-CPUState8080.prototype.orByte = function(src)
+CPU8080State.prototype.orByte = function(src)
 {
     return this.resultParitySign = this.resultZeroCarry = this.resultAuxOverflow = this.regA | src;
 };
@@ -787,11 +787,11 @@ CPUState8080.prototype.orByte = function(src)
  *      ---------
  *    1 0101 0110   (0x56)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} src
  * @return {number} regA - src
  */
-CPUState8080.prototype.subByte = function(src)
+CPU8080State.prototype.subByte = function(src)
 {
     src ^= 0xff;
     this.resultAuxOverflow = this.regA ^ src;
@@ -808,11 +808,11 @@ CPUState8080.prototype.subByte = function(src)
  * This mimics the behavior of subByte() when the Carry flag (CF) is clear, and hopefully also mimics how the
  * 8080 manages the Auxiliary Carry flag (AF) when the Carry flag (CF) is set.
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} src
  * @return {number} regA - src - carry
  */
-CPUState8080.prototype.subByteBorrow = function(src)
+CPU8080State.prototype.subByteBorrow = function(src)
 {
     src ^= 0xff;
     this.resultAuxOverflow = this.regA ^ src;
@@ -822,11 +822,11 @@ CPUState8080.prototype.subByteBorrow = function(src)
 /**
  * xorByte(src)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} src
  * @return {number} regA ^ src
  */
-CPUState8080.prototype.xorByte = function(src)
+CPU8080State.prototype.xorByte = function(src)
 {
     return this.resultParitySign = this.resultZeroCarry = this.resultAuxOverflow = this.regA ^ src;
 };
@@ -834,11 +834,11 @@ CPUState8080.prototype.xorByte = function(src)
 /**
  * getByte(addr)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} addr is a linear address
  * @return {number} byte (8-bit) value at that address
  */
-CPUState8080.prototype.getByte = function(addr)
+CPU8080State.prototype.getByte = function(addr)
 {
     return this.bus.getByte(addr);
 };
@@ -846,11 +846,11 @@ CPUState8080.prototype.getByte = function(addr)
 /**
  * getWord(addr)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} addr is a linear address
  * @return {number} word (16-bit) value at that address
  */
-CPUState8080.prototype.getWord = function(addr)
+CPU8080State.prototype.getWord = function(addr)
 {
     return this.bus.getShort(addr);
 };
@@ -858,11 +858,11 @@ CPUState8080.prototype.getWord = function(addr)
 /**
  * setByte(addr, b)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} addr is a linear address
  * @param {number} b is the byte (8-bit) value to write (which we truncate to 8 bits; required by opSTOSb)
  */
-CPUState8080.prototype.setByte = function(addr, b)
+CPU8080State.prototype.setByte = function(addr, b)
 {
     this.bus.setByte(addr, b);
 };
@@ -870,11 +870,11 @@ CPUState8080.prototype.setByte = function(addr, b)
 /**
  * setWord(addr, w)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} addr is a linear address
  * @param {number} w is the word (16-bit) value to write (which we truncate to 16 bits to be safe)
  */
-CPUState8080.prototype.setWord = function(addr, w)
+CPU8080State.prototype.setWord = function(addr, w)
 {
     this.bus.setShort(addr, w);
 };
@@ -882,10 +882,10 @@ CPUState8080.prototype.setWord = function(addr, w)
 /**
  * getPCByte()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} byte at the current PC; PC advanced by 1
  */
-CPUState8080.prototype.getPCByte = function()
+CPU8080State.prototype.getPCByte = function()
 {
     var b = this.getByte(this.regPC);
     this.setPC(this.regPC + 1);
@@ -895,10 +895,10 @@ CPUState8080.prototype.getPCByte = function()
 /**
  * getPCWord()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} word at the current PC; PC advanced by 2
  */
-CPUState8080.prototype.getPCWord = function()
+CPU8080State.prototype.getPCWord = function()
 {
     var w = this.getWord(this.regPC);
     this.setPC(this.regPC + 2);
@@ -908,10 +908,10 @@ CPUState8080.prototype.getPCWord = function()
 /**
  * popWord()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {number} word popped from the current SP; SP increased by 2
  */
-CPUState8080.prototype.popWord = function()
+CPU8080State.prototype.popWord = function()
 {
     var w = this.getWord(this.regSP);
     this.setSP(this.regSP + 2);
@@ -921,10 +921,10 @@ CPUState8080.prototype.popWord = function()
 /**
  * pushWord(w)
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} w is the word (16-bit) value to push at current SP; SP decreased by 2
  */
-CPUState8080.prototype.pushWord = function(w)
+CPU8080State.prototype.pushWord = function(w)
 {
     this.setSP(this.regSP - 2);
     this.setWord(this.regSP, w);
@@ -933,10 +933,10 @@ CPUState8080.prototype.pushWord = function(w)
 /**
  * checkINTR()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @return {boolean} true if execution may proceed, false if not
  */
-CPUState8080.prototype.checkINTR = function()
+CPU8080State.prototype.checkINTR = function()
 {
     /*
      * If the Debugger is single-stepping, this.nStepCycles will always be zero, which we take
@@ -976,10 +976,10 @@ CPUState8080.prototype.checkINTR = function()
  * nLevel can either be a valid interrupt level (0-7), or -1 to clear all pending interrupts
  * (eg, in the event of a system-wide reset).
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} nLevel (0-7, or -1 for all)
  */
-CPUState8080.prototype.clearINTR = function(nLevel)
+CPU8080State.prototype.clearINTR = function(nLevel)
 {
     var bitsClear = nLevel < 0? 0xff : (1 << nLevel);
     this.intFlags &= ~bitsClear;
@@ -989,9 +989,9 @@ CPUState8080.prototype.clearINTR = function(nLevel)
 /**
  * requestHALT()
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  */
-CPUState8080.prototype.requestHALT = function()
+CPU8080State.prototype.requestHALT = function()
 {
     this.intFlags |= CPUDef8080.INTFLAG.HALT;
     this.nBurstCycles -= this.nStepCycles;
@@ -1008,10 +1008,10 @@ CPUState8080.prototype.requestHALT = function()
  * by setting nStepCycles to zero.  But before we do, we subtract nStepCycles from nBurstCycles,
  * so that the calculation of how many cycles were actually executed on this burst is correct.
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} nLevel (0-7)
  */
-CPUState8080.prototype.requestINTR = function(nLevel)
+CPU8080State.prototype.requestINTR = function(nLevel)
 {
     this.intFlags |= (1 << nLevel);
     if (this.getIF()) {
@@ -1027,12 +1027,12 @@ CPUState8080.prototype.requestINTR = function(nLevel)
  * CPU type before passing the call to displayValue(); in the "old days", updateStatus() called
  * displayValue() directly (although then it was called displayReg()).
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {string} sReg
  * @param {number} nValue
  * @param {number} [cch] (default is 2 hex digits)
  */
-CPUState8080.prototype.updateReg = function(sReg, nValue, cch)
+CPU8080State.prototype.updateReg = function(sReg, nValue, cch)
 {
     this.displayValue(sReg, nValue, cch || 2);
 };
@@ -1046,10 +1046,10 @@ CPUState8080.prototype.updateReg = function(sReg, nValue, cch)
  * Any high-frequency updates should be performed in updateVideo(), which should avoid DOM updates, since updateVideo()
  * can be called up to 60 times per second (see VIDEO_UPDATES_PER_SECOND).
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {boolean} [fForce] (true will display registers even if the CPU is running and "live" registers are not enabled)
  */
-CPUState8080.prototype.updateStatus = function(fForce)
+CPU8080State.prototype.updateStatus = function(fForce)
 {
     if (this.cLiveRegs) {
         if (fForce || !this.flags.fRunning || this.flags.fDisplayLiveRegs) {
@@ -1091,13 +1091,13 @@ CPUState8080.prototype.updateStatus = function(fForce)
  * As a result, the Debugger's complete independence means you can run other 8086/8088 debuggers
  * (eg, DEBUG) inside the simulation without interference; you can even "debug" them with the Debugger.
  *
- * @this {CPUState8080}
+ * @this {CPU8080State}
  * @param {number} nMinCycles (0 implies a single-step, and therefore breakpoints should be ignored)
  * @return {number} of cycles executed; 0 indicates a pre-execution condition (ie, an execution breakpoint
  * was hit), -1 indicates a post-execution condition (eg, a read or write breakpoint was hit), and a positive
  * number indicates successful completion of that many cycles (which should always be >= nMinCycles).
  */
-CPUState8080.prototype.stepCPU = function(nMinCycles)
+CPU8080State.prototype.stepCPU = function(nMinCycles)
 {
     /*
      * The Debugger uses fComplete to determine if the instruction completed (true) or was interrupted
@@ -1155,21 +1155,21 @@ CPUState8080.prototype.stepCPU = function(nMinCycles)
 };
 
 /**
- * CPUState8080.init()
+ * CPU8080State.init()
  *
  * This function operates on every HTML element of class "cpu", extracting the
- * JSON-encoded parameters for the CPUState8080 constructor from the element's "data-value"
+ * JSON-encoded parameters for the CPU8080State constructor from the element's "data-value"
  * attribute, invoking the constructor (which in turn invokes the CPU constructor)
- * to create a CPUState8080 component, and then binding any associated HTML controls to the
+ * to create a CPU8080State component, and then binding any associated HTML controls to the
  * new component.
  */
-CPUState8080.init = function()
+CPU8080State.init = function()
 {
     var aeCPUs = Component.getElementsByClass(document, PC8080.APPCLASS, "cpu");
     for (var iCPU = 0; iCPU < aeCPUs.length; iCPU++) {
         var eCPU = aeCPUs[iCPU];
         var parmsCPU = Component.getComponentParms(eCPU);
-        var cpu = new CPUState8080(parmsCPU);
+        var cpu = new CPU8080State(parmsCPU);
         Component.bindComponentControls(cpu, eCPU, PC8080.APPCLASS);
     }
 };
@@ -1177,6 +1177,6 @@ CPUState8080.init = function()
 /*
  * Initialize every CPU module on the page
  */
-web.onInit(CPUState8080.init);
+web.onInit(CPU8080State.init);
 
-if (NODE) module.exports = CPUState8080;
+if (NODE) module.exports = CPU8080State;
diff --git a/modules/pc8080/lib/debugger.js b/modules/pc8080/lib/debugger.js
index b8bb7577a..825ede27e 100644
--- a/modules/pc8080/lib/debugger.js
+++ b/modules/pc8080/lib/debugger.js
@@ -673,7 +673,7 @@ if (DEBUGGER) {
      * @this {Debugger8080}
      * @param {Computer8080} cmp
      * @param {Bus8080} bus
-     * @param {CPUState8080} cpu
+     * @param {CPU8080State} cpu
      * @param {Debugger8080} dbg
      */
     Debugger8080.prototype.initBus = function(cmp, bus, cpu, dbg)
diff --git a/modules/pc8080/lib/keyboard.js b/modules/pc8080/lib/keyboard.js
index 22b5def73..49911c14e 100644
--- a/modules/pc8080/lib/keyboard.js
+++ b/modules/pc8080/lib/keyboard.js
@@ -541,7 +541,7 @@ Keyboard8080.prototype.setBinding = function(sHTMLType, sBinding, control, sValu
  * @this {Keyboard8080}
  * @param {Computer8080} cmp
  * @param {Bus8080} bus
- * @param {CPUState8080} cpu
+ * @param {CPU8080State} cpu
  * @param {Debugger8080} dbg
  */
 Keyboard8080.prototype.initBus = function(cmp, bus, cpu, dbg)
diff --git a/modules/pc8080/lib/panel.js b/modules/pc8080/lib/panel.js
index fd780a0df..ae2d05466 100644
--- a/modules/pc8080/lib/panel.js
+++ b/modules/pc8080/lib/panel.js
@@ -87,7 +87,7 @@ Panel8080.prototype.setBinding = function(sHTMLType, sBinding, control, sValue)
  * @this {Panel8080}
  * @param {Computer8080} cmp
  * @param {Bus8080} bus
- * @param {CPUState8080} cpu
+ * @param {CPU8080State} cpu
  * @param {Debugger8080} dbg
  */
 Panel8080.prototype.initBus = function(cmp, bus, cpu, dbg)
diff --git a/modules/pc8080/lib/ram.js b/modules/pc8080/lib/ram.js
index 37238ffc6..77501323a 100644
--- a/modules/pc8080/lib/ram.js
+++ b/modules/pc8080/lib/ram.js
@@ -74,7 +74,7 @@ Component.subclass(RAM8080);
  * @this {RAM8080}
  * @param {Computer8080} cmp
  * @param {Bus8080} bus
- * @param {CPUState8080} cpu
+ * @param {CPU8080State} cpu
  * @param {Debugger8080} dbg
  */
 RAM8080.prototype.initBus = function(cmp, bus, cpu, dbg)
diff --git a/modules/pc8080/lib/rom.js b/modules/pc8080/lib/rom.js
index b8a6e1ae6..e01554f10 100644
--- a/modules/pc8080/lib/rom.js
+++ b/modules/pc8080/lib/rom.js
@@ -158,7 +158,7 @@ ROM8080.CPM.VECTORS = [ROM8080.CPM.BIOS.VECTOR, ROM8080.CPM.BDOS.VECTOR];
  * @this {ROM8080}
  * @param {Computer8080} cmp
  * @param {Bus8080} bus
- * @param {CPUState8080} cpu
+ * @param {CPU8080State} cpu
  * @param {Debugger8080} dbg
  */
 ROM8080.prototype.initBus = function(cmp, bus, cpu, dbg)
diff --git a/modules/pc8080/lib/serialport.js b/modules/pc8080/lib/serialport.js
index 4ba66a468..226646df1 100644
--- a/modules/pc8080/lib/serialport.js
+++ b/modules/pc8080/lib/serialport.js
@@ -442,7 +442,7 @@ SerialPort8080.prototype.echoByte = function(b)
  * @this {SerialPort8080}
  * @param {Computer8080} cmp
  * @param {Bus8080} bus
- * @param {CPUState8080} cpu
+ * @param {CPU8080State} cpu
  * @param {Debugger8080} dbg
  */
 SerialPort8080.prototype.initBus = function(cmp, bus, cpu, dbg)
diff --git a/modules/pc8080/lib/video.js b/modules/pc8080/lib/video.js
index 3ed414f93..fd3585ac7 100644
--- a/modules/pc8080/lib/video.js
+++ b/modules/pc8080/lib/video.js
@@ -399,7 +399,7 @@ Video8080.prototype.initBuffers = function()
  * @this {Video8080}
  * @param {Computer8080} cmp
  * @param {Bus8080} bus
- * @param {CPUState8080} cpu
+ * @param {CPU8080State} cpu
  * @param {Debugger8080} dbg
  */
 Video8080.prototype.initBus = function(cmp, bus, cpu, dbg)
diff --git a/modules/pcx86/lib/computer.js b/modules/pcx86/lib/computer.js
index 0ec8d2aef..c4cd06ace 100644
--- a/modules/pcx86/lib/computer.js
+++ b/modules/pcx86/lib/computer.js
@@ -218,7 +218,7 @@ function Computer(parmsComputer, parmsMachine, fSuspended) {
         }
     }
 
-    this.println(PCX86.APPNAME + " v" + PCX86.APPVERSION + "\n" + COPYRIGHT + "\n" + LICENSE);
+    this.println(PCX86.APPNAME + " v" + (XMLVERSION || PCX86.APPVERSION) + "\n" + COPYRIGHT + "\n" + LICENSE);
 
     if (DEBUG && this.messageEnabled()) this.printMessage("PREFETCH: " + PREFETCH + ", TYPEDARRAYS: " + TYPEDARRAYS);