diff --git a/src/rec/aaiRecord.c b/src/rec/aaiRecord.c
index 54c3b106b..008a4f3d5 100644
--- a/src/rec/aaiRecord.c
+++ b/src/rec/aaiRecord.c
@@ -36,6 +36,7 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "aaiRecord.h"
 #undef  GEN_SIZE_OFFSET
@@ -254,12 +255,12 @@ static long readValue(aaiRecord *prec)
     if (status)
         return(status);
 
-    if (prec->simm == NO){
+    if (prec->simm == menuYesNoNO){
         /* Call dev support */
         status = pdset->read_aai(prec);
         return status;
     }
-    if (prec->simm == YES){
+    if (prec->simm == menuYesNoYES){
         /* Simm processing split performed in devSup */
         /* Call dev support */
         status = pdset->read_aai(prec);
diff --git a/src/rec/aaoRecord.c b/src/rec/aaoRecord.c
index a6033853f..954df058f 100644
--- a/src/rec/aaoRecord.c
+++ b/src/rec/aaoRecord.c
@@ -36,6 +36,7 @@
 #include "devSup.h"
 #include "recSup.h"
 #include "recGbl.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "aaoRecord.h"
 #undef  GEN_SIZE_OFFSET
@@ -251,12 +252,12 @@ static long writeValue(aaoRecord *prec)
     if (status)
         return status;
 
-    if (prec->simm == NO) {
+    if (prec->simm == menuYesNoNO) {
         /* Call dev support */
         status = pdset->write_aao(prec);
         return status;
     }
-    if (prec->simm == YES) {
+    if (prec->simm == menuYesNoYES) {
         /* Call dev support */
         status = pdset->write_aao(prec);
         return status;
diff --git a/src/rec/aoRecord.c b/src/rec/aoRecord.c
index 5d004aca5..d896b4904 100644
--- a/src/rec/aoRecord.c
+++ b/src/rec/aoRecord.c
@@ -36,6 +36,7 @@
 #include "recGbl.h"
 #include "menuConvert.h"
 #include "menuOmsl.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "aoRecord.h"
 #undef  GEN_SIZE_OFFSET
@@ -531,11 +532,11 @@ static long writeValue(aoRecord *prec)
 	if (status)
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuYesNoNO){
 		status=(*pdset->write_ao)(prec);
 		return(status);
 	}
-	if (prec->simm == YES){
+	if (prec->simm == menuYesNoYES){
 		status = dbPutLink(&(prec->siol),DBR_DOUBLE,&(prec->oval),1);
 	} else {
 		status=-1;
diff --git a/src/rec/boRecord.c b/src/rec/boRecord.c
index a3521816c..b0c8897e5 100644
--- a/src/rec/boRecord.c
+++ b/src/rec/boRecord.c
@@ -38,6 +38,7 @@
 #undef  GEN_SIZE_OFFSET
 #include "menuIvoa.h"
 #include "menuOmsl.h"
+#include "menuYesNo.h"
 #include "epicsExport.h"
 
 /* Create RSET - Record Support Entry Table*/
@@ -383,11 +384,11 @@ static long writeValue(boRecord *prec)
 	if (status)
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuYesNoNO){
 		status=(*pdset->write_bo)(prec);
 		return(status);
 	}
-	if (prec->simm == YES){
+	if (prec->simm == menuYesNoYES){
 		status=dbPutLink(&(prec->siol),DBR_USHORT, &(prec->val),1);
 	} else {
 		status=-1;
diff --git a/src/rec/eventRecord.c b/src/rec/eventRecord.c
index bf00612c4..4785e78f3 100644
--- a/src/rec/eventRecord.c
+++ b/src/rec/eventRecord.c
@@ -32,6 +32,7 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "eventRecord.h"
 #undef  GEN_SIZE_OFFSET
@@ -171,11 +172,11 @@ static long readValue(eventRecord *prec)
         if (status)
                 return(status);
 
-        if (prec->simm == NO){
+        if (prec->simm == menuYesNoNO){
                 status=(*pdset->read_event)(prec);
                 return(status);
         }
-        if (prec->simm == YES){
+        if (prec->simm == menuYesNoYES){
                 status=dbGetLink(&(prec->siol),DBR_USHORT,
 			&(prec->sval),0,0);
                 if (status==0) {
diff --git a/src/rec/histogramRecord.c b/src/rec/histogramRecord.c
index d9515104c..7753312a6 100644
--- a/src/rec/histogramRecord.c
+++ b/src/rec/histogramRecord.c
@@ -36,6 +36,7 @@
 #include "special.h"
 #include "recSup.h"
 #include "recGbl.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "histogramRecord.h"
 #undef  GEN_SIZE_OFFSET
@@ -364,11 +365,11 @@ static long readValue(histogramRecord *prec)
         if (status)
                 return(status);
 
-        if (prec->simm == NO){
+        if (prec->simm == menuYesNoNO){
                 status=(*pdset->read_histogram)(prec);
                 return(status);
         }
-        if (prec->simm == YES){
+        if (prec->simm == menuYesNoYES){
         	status=dbGetLink(&(prec->siol),DBR_DOUBLE,
 			&(prec->sval),0,0);
 
diff --git a/src/rec/longinRecord.c b/src/rec/longinRecord.c
index 9f211a0a0..830e411a2 100644
--- a/src/rec/longinRecord.c
+++ b/src/rec/longinRecord.c
@@ -31,6 +31,7 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "longinRecord.h"
 #undef  GEN_SIZE_OFFSET
@@ -306,11 +307,11 @@ static long readValue(longinRecord *prec)
 	if (status)
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuYesNoNO){
 		status=(*pdset->read_longin)(prec);
 		return(status);
 	}
-	if (prec->simm == YES){
+	if (prec->simm == menuYesNoYES){
 		status=dbGetLink(&(prec->siol),DBR_LONG,
 			&(prec->sval),0,0);
 
diff --git a/src/rec/longoutRecord.c b/src/rec/longoutRecord.c
index d143be23b..2a3b87a95 100644
--- a/src/rec/longoutRecord.c
+++ b/src/rec/longoutRecord.c
@@ -28,6 +28,7 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "longoutRecord.h"
 #undef  GEN_SIZE_OFFSET
@@ -346,11 +347,11 @@ static long writeValue(longoutRecord *prec)
 	if (!RTN_SUCCESS(status))
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuYesNoNO){
 		status=(*pdset->write_longout)(prec);
 		return(status);
 	}
-	if (prec->simm == YES){
+	if (prec->simm == menuYesNoYES){
 		status=dbPutLink(&prec->siol,DBR_LONG,&prec->val,1);
 	} else {
 		status=-1;
diff --git a/src/rec/mbbiDirectRecord.c b/src/rec/mbbiDirectRecord.c
index f455e59a6..86b88b595 100644
--- a/src/rec/mbbiDirectRecord.c
+++ b/src/rec/mbbiDirectRecord.c
@@ -243,7 +243,7 @@ static long readValue(mbbiDirectRecord *prec)
 	if (status)
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuSimmNO){
 		status=(*pdset->read_mbbi)(prec);
 		return(status);
 	}
diff --git a/src/rec/mbboDirectRecord.c b/src/rec/mbboDirectRecord.c
index 824302db0..ec128813c 100644
--- a/src/rec/mbboDirectRecord.c
+++ b/src/rec/mbboDirectRecord.c
@@ -37,6 +37,7 @@
 #undef  GEN_SIZE_OFFSET
 #include "menuOmsl.h"
 #include "menuIvoa.h"
+#include "menuYesNo.h"
 #include "epicsExport.h"
 
 /* Create RSET - Record Support Entry Table*/
@@ -336,11 +337,11 @@ static long writeValue(mbboDirectRecord *prec)
 	if (status)
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuYesNoNO){
 		status=(*pdset->write_mbbo)(prec);
 		return(status);
 	}
-	if (prec->simm == YES){
+	if (prec->simm == menuYesNoYES){
 		status=dbPutLink(&prec->siol,DBR_USHORT,
 			&prec->val,1);
 	} else {
diff --git a/src/rec/mbboRecord.c b/src/rec/mbboRecord.c
index 6508830ec..afaeecfab 100644
--- a/src/rec/mbboRecord.c
+++ b/src/rec/mbboRecord.c
@@ -38,6 +38,7 @@
 #undef  GEN_SIZE_OFFSET
 #include "menuOmsl.h"
 #include "menuIvoa.h"
+#include "menuYesNo.h"
 #include "epicsExport.h"
 
 /* Create RSET - Record Support Entry Table*/
@@ -437,11 +438,11 @@ static long writeValue(mbboRecord *prec)
 	if (status)
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuYesNoNO){
 		status=(*pdset->write_mbbo)(prec);
 		return(status);
 	}
-	if (prec->simm == YES){
+	if (prec->simm == menuYesNoYES){
 		status=dbPutLink(&prec->siol,DBR_USHORT, &prec->val,1);
 	} else {
 		status=-1;
diff --git a/src/rec/stringinRecord.c b/src/rec/stringinRecord.c
index 5816304e9..6bb98b438 100644
--- a/src/rec/stringinRecord.c
+++ b/src/rec/stringinRecord.c
@@ -32,6 +32,7 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "stringinRecord.h"
 #undef  GEN_SIZE_OFFSET
@@ -183,11 +184,11 @@ static long readValue(stringinRecord *prec)
 	if (status)
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuYesNoNO){
 		status=(*pdset->read_stringin)(prec);
 		return(status);
 	}
-	if (prec->simm == YES){
+	if (prec->simm == menuYesNoYES){
 		status=dbGetLink(&(prec->siol),DBR_STRING,
 			prec->sval,0,0);
 		if (status==0) {
diff --git a/src/rec/stringoutRecord.c b/src/rec/stringoutRecord.c
index c16445759..489fd01a7 100644
--- a/src/rec/stringoutRecord.c
+++ b/src/rec/stringoutRecord.c
@@ -37,6 +37,7 @@
 #undef  GEN_SIZE_OFFSET
 #include "menuOmsl.h"
 #include "menuIvoa.h"
+#include "menuYesNo.h"
 #include "epicsExport.h"
 
 /* Create RSET - Record Support Entry Table*/
@@ -213,11 +214,11 @@ static long writeValue(stringoutRecord *prec)
 	if (status)
 		return(status);
 
-	if (prec->simm == NO){
+	if (prec->simm == menuYesNoNO){
 		status=(*pdset->write_stringout)(prec);
 		return(status);
 	}
-	if (prec->simm == YES){
+	if (prec->simm == menuYesNoYES){
 		status=dbPutLink(&prec->siol,DBR_STRING,
 			prec->val,1);
 	} else {
diff --git a/src/rec/waveformRecord.c b/src/rec/waveformRecord.c
index 7cf1cf298..b36435fb6 100644
--- a/src/rec/waveformRecord.c
+++ b/src/rec/waveformRecord.c
@@ -33,11 +33,13 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "cantProceed.h"
+#include "menuYesNo.h"
 #define GEN_SIZE_OFFSET
 #include "waveformRecord.h"
 #undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
 #include "epicsString.h"
+
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
 #define initialize NULL
@@ -288,11 +290,11 @@ static long readValue(waveformRecord *prec)
     if (status)
         return status;
 
-    if (prec->simm == NO){
+    if (prec->simm == menuYesNoNO){
         return (*pdset->read_wf)(prec);
     }
 
-    if (prec->simm == YES){
+    if (prec->simm == menuYesNoYES){
         long nRequest = prec->nelm;
         status = dbGetLink(&(prec->siol), prec->ftvl, prec->bptr, 0, &nRequest);
         /* nord set only for db links: needed for old db_access */