diff --git a/NOVA/nova_mta.c b/NOVA/nova_mta.c
index b8798383..92652cc6 100644
--- a/NOVA/nova_mta.c
+++ b/NOVA/nova_mta.c
@@ -295,7 +295,7 @@ switch (pulse) {                                        /* decode IR<8:9> */
                 ~(STA_BOT | STA_EOF | STA_EOT | STA_RDY)) | STA_REW);
             sim_activate (uptr, mta_rwait);             /* start IO */
             if (c == CU_UNLOAD)
-                detach_unit (uptr);
+                sim_tape_detach (uptr);
             }
         else {
             mta_sta = 0;                                /* clear errors */
diff --git a/PDP10/pdp10_tu.c b/PDP10/pdp10_tu.c
index 22c1569a..726ece7d 100644
--- a/PDP10/pdp10_tu.c
+++ b/PDP10/pdp10_tu.c
@@ -694,7 +694,7 @@ switch (fnc) {                                          /* case on function */
             set_tuer (ER_UNS);
             break;
             }
-        detach_unit (uptr);
+        sim_tape_detach (uptr);
         uptr->USTAT = FS_REW;
         sim_activate (uptr, tu_time);
         tucs1 = tucs1 & ~CS1_GO;
diff --git a/PDP11/pdp11_tm.c b/PDP11/pdp11_tm.c
index dc9e6181..1caa3404 100644
--- a/PDP11/pdp11_tm.c
+++ b/PDP11/pdp11_tm.c
@@ -377,7 +377,7 @@ uptr->USTAT = uptr->USTAT & (STA_WLK | STA_ONL);        /* clear status */
 tm_sta = 0;                                             /* clear errors */
 if (f == MTC_UNLOAD) {                                  /* unload? */
     uptr->USTAT = (uptr->USTAT | STA_REW) & ~STA_ONL;
-    detach_unit (uptr);                                 /* set offline */
+    sim_tape_detach (uptr);                             /* set offline */
     }
 else if (f == MTC_REWIND)                               /* rewind */
     uptr->USTAT = uptr->USTAT | STA_REW;                /* rewinding */
diff --git a/PDP11/pdp11_tu.c b/PDP11/pdp11_tu.c
index 5c51ca11..cc00a443 100644
--- a/PDP11/pdp11_tu.c
+++ b/PDP11/pdp11_tu.c
@@ -521,7 +521,7 @@ switch (fnc) {                                          /* case on function */
             tu_set_er (ER_UNS);
             break;
             }
-        detach_unit (uptr);
+        sim_tape_detach (uptr);
         uptr->USTAT = FS_REW;
         sim_activate (uptr, tu_time);
         tucs1 = tucs1 & ~CS1_GO;
diff --git a/PDP8/pdp8_mt.c b/PDP8/pdp8_mt.c
index 3a9ea66c..917666ba 100644
--- a/PDP8/pdp8_mt.c
+++ b/PDP8/pdp8_mt.c
@@ -275,7 +275,7 @@ switch (IR & 07) {                                      /* decode IR<9:11> */
             }
         uptr->USTAT = uptr->USTAT & STA_WLK;            /* clear status */
         if (f == FN_UNLOAD) {                           /* unload? */
-            detach_unit (uptr);                         /* set offline */
+            sim_tape_detach (uptr);                     /* set offline */
             uptr->USTAT = STA_REW | STA_REM;            /* rewinding, off */
             mt_set_done ();                             /* set done */
             }
diff --git a/sigma/sigma_mt.c b/sigma/sigma_mt.c
index 5dfa33c1..22b49c66 100644
--- a/sigma/sigma_mt.c
+++ b/sigma/sigma_mt.c
@@ -366,7 +366,7 @@ switch (cmd) {                                          /* case on command */
         break;
 
     case MCM_RWU:                                       /* rewind unload */
-        r = detach_unit (uptr);
+        r = sim_tape_detach (uptr);
         break;
 
     case MCM_REW:                                       /* rewind */