diff --git a/VAX/vax780_defs.h b/VAX/vax780_defs.h
index a93a0026..fdaf34e4 100644
--- a/VAX/vax780_defs.h
+++ b/VAX/vax780_defs.h
@@ -174,8 +174,8 @@
                         { MTAB_XTD|MTAB_VDV|MTAB_NMO, 0, "MEMORY", NULL, NULL, &cpu_show_memory, NULL, "Display memory configuration" }
 extern t_stat cpu_show_memory (FILE* st, UNIT* uptr, int32 val, void* desc);
 #define CPU_MODEL_MODIFIERS                                                                     \
-                        { MTAB_XTD|MTAB_VDV, 0, "MODEL", NULL,                                  \
-                              NULL, &cpu_show_model, NULL, "Display the simulator CPU Model" }
+                        { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={780|785}",                     \
+                          &cpu_set_model, &cpu_show_model, NULL, "Set/Show the simulator CPU Model" }
 
 /* Unibus I/O registers */
 
diff --git a/VAX/vax780_sbi.c b/VAX/vax780_sbi.c
index 7fc60203..570b843e 100644
--- a/VAX/vax780_sbi.c
+++ b/VAX/vax780_sbi.c
@@ -836,10 +836,14 @@ return SCPE_OK;
 t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc)
 {
 if (cptr == NULL) return SCPE_ARG;
-if (strcmp(cptr, "780") == 0)
+if (strcmp(cptr, "780") == 0) {
    sys_model = 0;
-else if (strcmp(cptr, "785") == 0)
+   strcpy (sim_name, "VAX 11/780");
+   }
+else if (strcmp(cptr, "785") == 0) {
    sys_model = 1;
+   strcpy (sim_name, "VAX 11/785");
+   }
 else
    return SCPE_ARG;
 return SCPE_OK;
diff --git a/VAX/vax860_abus.c b/VAX/vax860_abus.c
index feced082..ccf70e8d 100644
--- a/VAX/vax860_abus.c
+++ b/VAX/vax860_abus.c
@@ -841,10 +841,14 @@ return SCPE_OK;
 t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc)
 {
 if (cptr == NULL) return SCPE_ARG;
-if (strcmp(cptr, "8600") == 0)
+if (strcmp(cptr, "8600") == 0) {
    sys_model = 0;
-else if (strcmp(cptr, "8650") == 0)
+   strcpy (sim_name, "VAX 8600");
+   }
+else if (strcmp(cptr, "8650") == 0) {
    sys_model = 1;
+   strcpy (sim_name, "VAX 8650");
+   }
 else
    return SCPE_ARG;
 return SCPE_OK;
diff --git a/VAX/vax860_defs.h b/VAX/vax860_defs.h
index 212fec74..aae3318b 100644
--- a/VAX/vax860_defs.h
+++ b/VAX/vax860_defs.h
@@ -197,7 +197,7 @@
 extern t_stat cpu_show_memory (FILE* st, UNIT* uptr, int32 val, void* desc);
 
 #define CPU_MODEL_MODIFIERS                                                                     \
-                        { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL=8600|8650",                                  \
+                        { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={8600|8650}",                   \
                               &cpu_set_model, &cpu_show_model, NULL, "Set/Display processor model" }
 
 /* Unibus I/O registers */
diff --git a/VAX/vax_sysdev.c b/VAX/vax_sysdev.c
index 7f39be99..bcf99b3f 100644
--- a/VAX/vax_sysdev.c
+++ b/VAX/vax_sysdev.c
@@ -1822,7 +1822,7 @@ char gbuf[CBUFSIZE];
 if ((cptr == NULL) || (!*cptr))
     return SCPE_ARG;
 cptr = get_glyph (cptr, gbuf, 0);
-if (MATCH_CMD(cptr, "VAXSERVER") == 0) {
+if (MATCH_CMD(gbuf, "VAXSERVER") == 0) {
     sys_model = 0;
     strcpy (sim_name, "VAXServer 3900 (KA655)");
     }