diff --git a/inc/ifpage.h b/inc/ifpage.h
index e4b00cc..8bdbea8 100755
--- a/inc/ifpage.h
+++ b/inc/ifpage.h
@@ -11,6 +11,7 @@
 #include "lispemul.h" /* for LispPTR, DLword */
 #include "version.h" /* for BIGVM */
 
+#define MACHINETYPE_MAIKO 3
 #define IFPAGE_KEYVAL 0x15e3
 #ifndef BYTESWAP
 #ifdef BIGVM
diff --git a/src/allocmds.c b/src/allocmds.c
index b67c703..1258937 100644
--- a/src/allocmds.c
+++ b/src/allocmds.c
@@ -107,7 +107,7 @@ LispPTR initmdspage(LispPTR *base, DLword size, LispPTR prev)
 /*
                 Func name :	alloc_mdspage
 
-                        This version works only for KATANA-SUN
+                        This version works only for Maiko
 
                         Date :		January 13, 1987
                         Edited by :	Takeshi Shimizu
diff --git a/src/dspsubrs.c b/src/dspsubrs.c
index 7fdfe8a..cf1c516 100644
--- a/src/dspsubrs.c
+++ b/src/dspsubrs.c
@@ -119,7 +119,7 @@ void DSP_SetMousePos(LispPTR *args)
 /****************************************************
  *
  *	DSP_ScreenWidth() entry of SUBRCALL 67 0
- *			called from  "\Katana.DisplayWidth".
+ *		called from  UPDATESCREENDIMENSIONS
  *
  ****************************************************/
 LispPTR DSP_ScreenWidth(LispPTR *args)
@@ -128,7 +128,7 @@ LispPTR DSP_ScreenWidth(LispPTR *args)
 /****************************************************
  *
  *	DSP_ScreenHight() entry of SUBRCALL 68 0
- *			called from  "\Katana.DisplayHeight".
+ *		called from UPDATESCREENDIMENSIONS
  *
  ****************************************************/
 LispPTR DSP_ScreenHight(LispPTR *args)
diff --git a/src/initsout.c b/src/initsout.c
index c5452a0..ea93031 100644
--- a/src/initsout.c
+++ b/src/initsout.c
@@ -34,8 +34,7 @@
 #include "etherdefs.h"     // for init_ifpage_ether
 #include "gcarraydefs.h"   // for get_package_atom
 #include "gcdata.h"        // for ADDREF, GCLOOKUP
-#include "hdw_conf.h"      // for KATANA
-#include "ifpage.h"        // for IFPAGE
+#include "ifpage.h"        // for IFPAGE, MACHINETYPE_MAIKO
 #include "initsoutdefs.h"  // for build_lisp_map, fixp_value, init_for_bitblt
 #include "iopage.h"        // for IOPAGE
 #include "lispemul.h"      // for LispPTR, DLword, NIL, BYTESPER_DLWORD
@@ -116,7 +115,7 @@ void init_ifpage(unsigned sysout_size) {
   /*
     Initialize IFPAGE
    */
-  InterfacePage->machinetype = KATANA; /* 3 is katana */
+  InterfacePage->machinetype = MACHINETYPE_MAIKO;
 #if defined(MAIKO_ENABLE_ETHERNET) || defined(MAIKO_ENABLE_NETHUB)
   init_ifpage_ether(); /* store ethernet ID in IF page */
 #endif /* MAIKO_ENABLE_ETHERNET or MAIKO_ENABLE_NETHUB */
diff --git a/src/storage.c b/src/storage.c
index fe20786..9741781 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -24,8 +24,7 @@
 #include "conspagedefs.h"  // for cons
 #include "gcdata.h"        // for ADDREF, GCLOOKUP
 #include "gcfinaldefs.h"   // for makefreearrayblock, mergebackward
-#include "hdw_conf.h"      // for KATANA
-#include "ifpage.h"        // for IFPAGE
+#include "ifpage.h"        // for IFPAGE, MACHINETYPE_MAIKO
 #include "lispemul.h"      // for LispPTR, NIL, GETFPTOVP, INTSTAT, ATOM_T
 #include "lispmap.h"       // for S_POSITIVE
 #include "lspglob.h"       // for InterfacePage, FPtoVP, SYSTEMCACHEVARS_word
@@ -216,7 +215,7 @@ static void advance_storagestate(DLword flg) {
 */
 /*****************************************************************/
 static void set_storage_state(void) {
-  if ((*MACHINETYPE_word & 0xffff) == KATANA) {
+  if ((*MACHINETYPE_word & 0xffff) == MACHINETYPE_MAIKO) {
     if (InterfacePage->dl24bitaddressable != 0)
       *STORAGEFULLSTATE_word = S_POSITIVE | SFS_SWITCHABLE;
     else
@@ -230,7 +229,7 @@ static void set_storage_state(void) {
     printf("SETSTATE: set to %d \n", (*STORAGEFULLSTATE_word) & 0xffff);
 #endif
   } else {
-    error("set_storage_state: Sorry! We can work on only KATANA");
+    error("set_storage_state: Sorry! We can work on only Maiko");
   }
 
 } /* set_storage_state() end */
diff --git a/src/subr0374.c b/src/subr0374.c
index 3a76988..d6150ff 100644
--- a/src/subr0374.c
+++ b/src/subr0374.c
@@ -22,7 +22,7 @@
 /*
         subr_k_trace()
 
-                subr----0130 for katana trace
+                subr----0130 for maiko trace
                 first argument is base address of
                 error message in Lisp.
                 second argument is length of message.
diff --git a/src/vmemsave.c b/src/vmemsave.c
index 3071e64..8ab1e0e 100644
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -38,7 +38,6 @@
 #endif /* DOS */
 
 
-#include "hdw_conf.h"
 #include "lispemul.h"
 #include "lispmap.h"
 #include "lspglob.h"
@@ -49,6 +48,7 @@
 #include "locfile.h"
 #include "dbprint.h"
 #include "devif.h"
+#include "ifpage.h"       // for MACHINETYPE_MAIKO
 
 #include "vmemsavedefs.h"
 #include "byteswapdefs.h"
@@ -365,7 +365,7 @@ LispPTR vmem_save(char *sysout_file_name)
     return (FILECANNOTOPEN);
   }
 
-  InterfacePage->machinetype = KATANA;
+  InterfacePage->machinetype = MACHINETYPE_MAIKO;
 
   /* Restore storagefull state */
   if (((*STORAGEFULLSTATE_word) & 0xffff) == SFS_NOTSWITCHABLE) {