diff --git a/I7000/i7000_cdp.c b/I7000/i7000_cdp.c
index 523c3ef..b664360 100644
--- a/I7000/i7000_cdp.c
+++ b/I7000/i7000_cdp.c
@@ -217,15 +217,15 @@ cdp_srv(UNIT *uptr) {
 #else
               switch(sim_punch_card(uptr, image)) {
 #endif
-              case SCPE_EOF:
-              case SCPE_UNATT:
+              case CDSE_EOF:
+              case CDSE_EMPTY:
                   chan_set_eof(chan);
                   break;
                  /* If we get here, something is wrong */
-              case SCPE_IOERR:
+              case CDSE_ERROR:
                   chan_set_error(chan);
                   break;
-              case SCPE_OK:
+              case CDSE_OK:
                   break;
               }
               uptr->u5 &= ~URCSTA_FULL;
diff --git a/I7000/i7000_cdr.c b/I7000/i7000_cdr.c
index 1b9d6dc..39c355f 100644
--- a/I7000/i7000_cdr.c
+++ b/I7000/i7000_cdr.c
@@ -199,25 +199,25 @@ cdr_srv(UNIT *uptr) {
     if (uptr->u4 == 0 && uptr->u5 & URCSTA_READ &&
                 (uptr->u5 & URCSTA_CARD) == 0) {
         switch(sim_read_card(uptr, image)) {
-        case SCPE_EOF:
+        case CDSE_EOF:
              sim_debug(DEBUG_DETAIL, &cdr_dev, "%d: EOF\n", u);
              /* Fall through */
 
-        case SCPE_UNATT:
+        case CDSE_EMPTY:
              chan_set_eof(chan);
              chan_set_attn(chan);
              chan_clear(chan, DEV_SEL);
              uptr->u5 |= URCSTA_EOF;
              uptr->u5 &= ~(URCSTA_BUSY|URCSTA_READ);
              return SCPE_OK;
-        case SCPE_IOERR:
+        case CDSE_ERROR:
              sim_debug(DEBUG_DETAIL, &cdr_dev, "%d: ERF\n", u);
              uptr->u5 |= URCSTA_ERR;
              uptr->u5 &= ~(URCSTA_BUSY|URCSTA_READ);
              chan_set_attn(chan);
              chan_clear(chan, DEV_SEL);
              return SCPE_OK;
-        case SCPE_OK:
+        case CDSE_OK:
              uptr->u5 |= URCSTA_CARD;
 #ifdef I7010
              chan_set_attn_urec(chan, cdr_dib.addr);
diff --git a/I7000/i7090_cdr.c b/I7000/i7090_cdr.c
index e7c2c64..a72f150 100644
--- a/I7000/i7090_cdr.c
+++ b/I7000/i7090_cdr.c
@@ -164,22 +164,22 @@ t_stat cdr_srv(UNIT * uptr)
     pos = (uptr->u5 & CDRPOSMASK) >> CDRPOSSHIFT;
     if (pos == (CDRPOSMASK >> CDRPOSSHIFT)) {
         switch (sim_read_card(uptr, image)) {
-        case SCPE_UNATT:
-        case SCPE_IOERR:
+        case CDSE_EMPTY:
+        case CDSE_ERROR:
             sim_debug(DEBUG_EXP, &cdr_dev, "unit=%d Setting ATTN\n", u);
             chan_set_error(chan);
             chan_set_attn(chan);
             uptr->u5 &= ~URCSTA_READ;
             sim_activate(uptr, us_to_ticks(1000));
             return SCPE_OK;
-        case SCPE_EOF:
+        case CDSE_EOF:
             sim_debug(DEBUG_EXP, &cdr_dev, "unit=%d EOF\n", u);
             chan_set_eof(chan);
             chan_set_attn(chan);
             uptr->u5 &= ~URCSTA_READ;
             sim_activate(uptr, us_to_ticks(1000));
             return SCPE_OK;
-        case SCPE_OK:
+        case CDSE_OK:
             break;
         }
         pos = 0;
diff --git a/doc/i7010_doc.doc b/doc/i7010_doc.doc
index 00c9c22..9ab417d 100644
Binary files a/doc/i7010_doc.doc and b/doc/i7010_doc.doc differ
diff --git a/doc/i701_doc.doc b/doc/i701_doc.doc
index 0790bd4..999d15b 100644
Binary files a/doc/i701_doc.doc and b/doc/i701_doc.doc differ
diff --git a/doc/i7070_doc.doc b/doc/i7070_doc.doc
index a3508af..be48210 100644
Binary files a/doc/i7070_doc.doc and b/doc/i7070_doc.doc differ
diff --git a/doc/i7080_doc.doc b/doc/i7080_doc.doc
index 564e0b6..5f4d309 100644
Binary files a/doc/i7080_doc.doc and b/doc/i7080_doc.doc differ
diff --git a/doc/i7090_doc.doc b/doc/i7090_doc.doc
index d455925..75c4ff0 100644
Binary files a/doc/i7090_doc.doc and b/doc/i7090_doc.doc differ