diff --git a/src/std/dev/devAiSoftCallback.c b/src/std/dev/devAiSoftCallback.c
index 8dfae71ea..ee73b0b44 100644
--- a/src/std/dev/devAiSoftCallback.c
+++ b/src/std/dev/devAiSoftCallback.c
@@ -32,7 +32,7 @@
 
 #define GET_OPTIONS (DBR_STATUS | DBR_TIME)
 
-typedef struct notifyInfo {
+typedef struct devPvt {
     processNotify *ppn;
     CALLBACK *pcallback;
     long options;
@@ -43,13 +43,13 @@ typedef struct notifyInfo {
         DBRtime
         epicsFloat64 value;
     } buffer;
-} notifyInfo;
+} devPvt;
 
 
 static void getCallback(processNotify *ppn, notifyGetType type)
 {
     aiRecord *prec = (aiRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
     long no_elements = 1;
 
     if (ppn->status == notifyCanceled) {
@@ -58,16 +58,16 @@ static void getCallback(processNotify *ppn, notifyGetType type)
     }
 
     assert(type == getFieldType);
-    pnotifyInfo->status = dbGetField(ppn->paddr, DBR_DOUBLE,
-        &pnotifyInfo->buffer, &pnotifyInfo->options, &no_elements, 0);
+    pdevPvt->status = dbGetField(ppn->paddr, DBR_DOUBLE,
+        &pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
 }
 
 static void doneCallback(processNotify *ppn)
 {
     aiRecord *prec = (aiRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
-    callbackRequestProcessCallback(pnotifyInfo->pcallback, prec->prio, prec);
+    callbackRequestProcessCallback(pdevPvt->pcallback, prec->prio, prec);
 }
 
 static long add_record(dbCommon *pcommon)
@@ -76,7 +76,7 @@ static long add_record(dbCommon *pcommon)
     DBLINK *plink = &prec->inp;
     DBADDR *pdbaddr;
     long  status;
-    notifyInfo *pnotifyInfo;
+    devPvt *pdevPvt;
     processNotify *ppn;
 
     if (plink->type == CONSTANT) return 0;
@@ -110,29 +110,29 @@ static long add_record(dbCommon *pcommon)
     ppn->doneCallback = doneCallback;
     ppn->requestType = processGetRequest;
 
-    pnotifyInfo = callocMustSucceed(1, sizeof(*pnotifyInfo),
+    pdevPvt = callocMustSucceed(1, sizeof(*pdevPvt),
         "devAiSoftCallback::add_record");
-    pnotifyInfo->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
+    pdevPvt->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
         "devAiSoftCallback::add_record");
-    pnotifyInfo->ppn = ppn;
-    pnotifyInfo->options = GET_OPTIONS;
+    pdevPvt->ppn = ppn;
+    pdevPvt->options = GET_OPTIONS;
 
-    prec->dpvt = pnotifyInfo;
+    prec->dpvt = pdevPvt;
     return 0;
 }
 
 static long del_record(dbCommon *pcommon) {
     aiRecord *prec = (aiRecord *)pcommon;
     DBLINK *plink = &prec->inp;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (plink->type == CONSTANT) return 0;
     assert(plink->type == PN_LINK);
 
-    dbNotifyCancel(pnotifyInfo->ppn);
-    free(pnotifyInfo->ppn);
-    free(pnotifyInfo->pcallback);
-    free(pnotifyInfo);
+    dbNotifyCancel(pdevPvt->ppn);
+    free(pdevPvt->ppn);
+    free(pdevPvt->pcallback);
+    free(pdevPvt);
     free(plink->value.pv_link.pvt);
 
     plink->type = PV_LINK;
@@ -172,51 +172,51 @@ static long init_record(aiRecord *prec)
 
 static long read_ai(aiRecord *prec)
 {
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (!prec->dpvt)
         return 2;
 
     if (!prec->pact) {
-        dbProcessNotify(pnotifyInfo->ppn);
+        dbProcessNotify(pdevPvt->ppn);
         prec->pact = TRUE;
         return 0;
     }
 
-    if (pnotifyInfo->status) {
+    if (pdevPvt->status) {
         recGblSetSevr(prec, READ_ALARM, INVALID_ALARM);
-        pnotifyInfo->smooth = FALSE;
+        pdevPvt->smooth = FALSE;
         return 2;
     }
 
     /* Apply smoothing algorithm */
-    if (prec->smoo != 0.0 && pnotifyInfo->smooth)
+    if (prec->smoo != 0.0 && pdevPvt->smooth)
         prec->val = prec->val * prec->smoo +
-            pnotifyInfo->buffer.value * (1.0 - prec->smoo);
+            pdevPvt->buffer.value * (1.0 - prec->smoo);
     else
-        prec->val = pnotifyInfo->buffer.value;
+        prec->val = pdevPvt->buffer.value;
     prec->udf = FALSE;
-    pnotifyInfo->smooth = TRUE;
+    pdevPvt->smooth = TRUE;
 
     switch (prec->inp.value.pv_link.pvlMask & pvlOptMsMode) {
         case pvlOptNMS:
             break;
         case pvlOptMSI:
-            if (pnotifyInfo->buffer.severity < INVALID_ALARM)
+            if (pdevPvt->buffer.severity < INVALID_ALARM)
                 break;
             /* else fall through */
         case pvlOptMS:
-            recGblSetSevr(prec, LINK_ALARM, pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, LINK_ALARM, pdevPvt->buffer.severity);
             break;
         case pvlOptMSS:
-            recGblSetSevr(prec, pnotifyInfo->buffer.status,
-                pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, pdevPvt->buffer.status,
+                pdevPvt->buffer.severity);
             break;
     }
 
     if (prec->tsel.type == CONSTANT &&
         prec->tse == epicsTimeEventDeviceTime)
-        prec->time = pnotifyInfo->buffer.time;
+        prec->time = pdevPvt->buffer.time;
     return 2;
 }
 
diff --git a/src/std/dev/devBiSoftCallback.c b/src/std/dev/devBiSoftCallback.c
index 7c6dc6bbc..fff6f7017 100644
--- a/src/std/dev/devBiSoftCallback.c
+++ b/src/std/dev/devBiSoftCallback.c
@@ -32,7 +32,7 @@
 
 #define GET_OPTIONS (DBR_STATUS | DBR_TIME)
 
-typedef struct notifyInfo {
+typedef struct devPvt {
     processNotify *ppn;
     CALLBACK *pcallback;
     long options;
@@ -42,13 +42,13 @@ typedef struct notifyInfo {
         DBRtime
         epicsEnum16 value;
     } buffer;
-} notifyInfo;
+} devPvt;
 
 
 static void getCallback(processNotify *ppn,notifyGetType type)
 {
     biRecord *prec = (biRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
     long no_elements = 1;
 
     if (ppn->status == notifyCanceled) {
@@ -57,16 +57,16 @@ static void getCallback(processNotify *ppn,notifyGetType type)
     }
 
     assert(type == getFieldType);
-    pnotifyInfo->status = dbGetField(ppn->paddr, DBR_ENUM,
-        &pnotifyInfo->buffer, &pnotifyInfo->options, &no_elements, 0);
+    pdevPvt->status = dbGetField(ppn->paddr, DBR_ENUM,
+        &pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
 }
 
 static void doneCallback(processNotify *ppn)
 {
     biRecord *prec = (biRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
-    callbackRequestProcessCallback(pnotifyInfo->pcallback, prec->prio, prec);
+    callbackRequestProcessCallback(pdevPvt->pcallback, prec->prio, prec);
 }
 
 static long add_record(dbCommon *pcommon)
@@ -75,7 +75,7 @@ static long add_record(dbCommon *pcommon)
     DBLINK *plink = &prec->inp;
     DBADDR *pdbaddr;
     long  status;
-    notifyInfo *pnotifyInfo;
+    devPvt *pdevPvt;
     processNotify *ppn;
 
     if (plink->type == CONSTANT) return 0;
@@ -109,29 +109,29 @@ static long add_record(dbCommon *pcommon)
     ppn->doneCallback = doneCallback;
     ppn->requestType = processGetRequest;
 
-    pnotifyInfo = callocMustSucceed(1, sizeof(*pnotifyInfo),
+    pdevPvt = callocMustSucceed(1, sizeof(*pdevPvt),
         "devBiSoftCallback::add_record");
-    pnotifyInfo->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
+    pdevPvt->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
         "devBiSoftCallback::add_record");
-    pnotifyInfo->ppn = ppn;
-    pnotifyInfo->options = GET_OPTIONS;
+    pdevPvt->ppn = ppn;
+    pdevPvt->options = GET_OPTIONS;
 
-    prec->dpvt = pnotifyInfo;
+    prec->dpvt = pdevPvt;
     return 0;
 }
 
 static long del_record(dbCommon *pcommon) {
     biRecord *prec = (biRecord *)pcommon;
     DBLINK *plink = &prec->inp;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (plink->type == CONSTANT) return 0;
     assert(plink->type == PN_LINK);
 
-    dbNotifyCancel(pnotifyInfo->ppn);
-    free(pnotifyInfo->ppn);
-    free(pnotifyInfo->pcallback);
-    free(pnotifyInfo);
+    dbNotifyCancel(pdevPvt->ppn);
+    free(pdevPvt->ppn);
+    free(pdevPvt->pcallback);
+    free(pdevPvt);
     free(plink->value.pv_link.pvt);
 
     plink->type = PV_LINK;
@@ -171,44 +171,44 @@ static long init_record(biRecord *prec)
 
 static long read_bi(biRecord *prec)
 {
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (!prec->dpvt)
         return 2;
 
     if (!prec->pact) {
-        dbProcessNotify(pnotifyInfo->ppn);
+        dbProcessNotify(pdevPvt->ppn);
         prec->pact = TRUE;
         return 0;
     }
 
-    if (pnotifyInfo->status) {
+    if (pdevPvt->status) {
         recGblSetSevr(prec, READ_ALARM, INVALID_ALARM);
         return 2;
     }
 
-    prec->val = pnotifyInfo->buffer.value;
+    prec->val = pdevPvt->buffer.value;
     prec->udf = FALSE;
 
     switch (prec->inp.value.pv_link.pvlMask & pvlOptMsMode) {
         case pvlOptNMS:
             break;
         case pvlOptMSI:
-            if (pnotifyInfo->buffer.severity < INVALID_ALARM)
+            if (pdevPvt->buffer.severity < INVALID_ALARM)
                 break;
             /* else fall through */
         case pvlOptMS:
-            recGblSetSevr(prec, LINK_ALARM, pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, LINK_ALARM, pdevPvt->buffer.severity);
             break;
         case pvlOptMSS:
-            recGblSetSevr(prec, pnotifyInfo->buffer.status,
-                pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, pdevPvt->buffer.status,
+                pdevPvt->buffer.severity);
             break;
     }
 
     if (prec->tsel.type == CONSTANT &&
         prec->tse == epicsTimeEventDeviceTime)
-        prec->time = pnotifyInfo->buffer.time;
+        prec->time = pdevPvt->buffer.time;
     return 2;
 }
 
diff --git a/src/std/dev/devLiSoftCallback.c b/src/std/dev/devLiSoftCallback.c
index 4b9a2a00e..8c9e7a280 100644
--- a/src/std/dev/devLiSoftCallback.c
+++ b/src/std/dev/devLiSoftCallback.c
@@ -32,7 +32,7 @@
 
 #define GET_OPTIONS (DBR_STATUS | DBR_TIME)
 
-typedef struct notifyInfo {
+typedef struct devPvt {
     processNotify *ppn;
     CALLBACK *pcallback;
     long options;
@@ -42,13 +42,13 @@ typedef struct notifyInfo {
         DBRtime
         epicsInt32 value;
     } buffer;
-} notifyInfo;
+} devPvt;
 
 
 static void getCallback(processNotify *ppn, notifyGetType type)
 {
     longinRecord *prec = (longinRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
     long no_elements = 1;
 
     if (ppn->status == notifyCanceled) {
@@ -57,16 +57,16 @@ static void getCallback(processNotify *ppn, notifyGetType type)
     }
 
     assert(type == getFieldType);
-    pnotifyInfo->status = dbGetField(ppn->paddr, DBR_LONG,
-        &pnotifyInfo->buffer, &pnotifyInfo->options, &no_elements, 0);
+    pdevPvt->status = dbGetField(ppn->paddr, DBR_LONG,
+        &pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
 }
 
 static void doneCallback(processNotify *ppn)
 {
     longinRecord *prec = (longinRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
-    callbackRequestProcessCallback(pnotifyInfo->pcallback, prec->prio, prec);
+    callbackRequestProcessCallback(pdevPvt->pcallback, prec->prio, prec);
 }
 
 static long add_record(dbCommon *pcommon)
@@ -75,7 +75,7 @@ static long add_record(dbCommon *pcommon)
     DBLINK *plink = &prec->inp;
     DBADDR *pdbaddr;
     long  status;
-    notifyInfo *pnotifyInfo;
+    devPvt *pdevPvt;
     processNotify *ppn;
 
     if (plink->type == CONSTANT) return 0;
@@ -109,29 +109,29 @@ static long add_record(dbCommon *pcommon)
     ppn->doneCallback = doneCallback;
     ppn->requestType = processGetRequest;
 
-    pnotifyInfo = callocMustSucceed(1, sizeof(*pnotifyInfo),
+    pdevPvt = callocMustSucceed(1, sizeof(*pdevPvt),
         "devLiSoftCallback::add_record");
-    pnotifyInfo->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
+    pdevPvt->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
         "devLiSoftCallback::add_record");
-    pnotifyInfo->ppn = ppn;
-    pnotifyInfo->options = GET_OPTIONS;
+    pdevPvt->ppn = ppn;
+    pdevPvt->options = GET_OPTIONS;
 
-    prec->dpvt = pnotifyInfo;
+    prec->dpvt = pdevPvt;
     return 0;
 }
 
 static long del_record(dbCommon *pcommon) {
     longinRecord *prec = (longinRecord *)pcommon;
     DBLINK *plink = &prec->inp;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (plink->type == CONSTANT) return 0;
     assert(plink->type == PN_LINK);
 
-    dbNotifyCancel(pnotifyInfo->ppn);
-    free(pnotifyInfo->ppn);
-    free(pnotifyInfo->pcallback);
-    free(pnotifyInfo);
+    dbNotifyCancel(pdevPvt->ppn);
+    free(pdevPvt->ppn);
+    free(pdevPvt->pcallback);
+    free(pdevPvt);
     free(plink->value.pv_link.pvt);
 
     plink->type = PV_LINK;
@@ -171,44 +171,44 @@ static long init_record(longinRecord *prec)
 
 static long read_li(longinRecord *prec)
 {
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (!prec->dpvt)
         return 0;
 
     if (!prec->pact) {
-        dbProcessNotify(pnotifyInfo->ppn);
+        dbProcessNotify(pdevPvt->ppn);
         prec->pact = TRUE;
         return 0;
     }
 
-    if (pnotifyInfo->status) {
+    if (pdevPvt->status) {
         recGblSetSevr(prec, READ_ALARM, INVALID_ALARM);
-        return pnotifyInfo->status;
+        return pdevPvt->status;
     }
 
-    prec->val = pnotifyInfo->buffer.value;
+    prec->val = pdevPvt->buffer.value;
     prec->udf = FALSE;
 
     switch (prec->inp.value.pv_link.pvlMask & pvlOptMsMode) {
         case pvlOptNMS:
             break;
         case pvlOptMSI:
-            if (pnotifyInfo->buffer.severity < INVALID_ALARM)
+            if (pdevPvt->buffer.severity < INVALID_ALARM)
                 break;
             /* else fall through */
         case pvlOptMS:
-            recGblSetSevr(prec, LINK_ALARM, pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, LINK_ALARM, pdevPvt->buffer.severity);
             break;
         case pvlOptMSS:
-            recGblSetSevr(prec, pnotifyInfo->buffer.status,
-                pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, pdevPvt->buffer.status,
+                pdevPvt->buffer.severity);
             break;
     }
 
     if (prec->tsel.type == CONSTANT &&
         prec->tse == epicsTimeEventDeviceTime)
-        prec->time = pnotifyInfo->buffer.time;
+        prec->time = pdevPvt->buffer.time;
     return 0;
 }
 
diff --git a/src/std/dev/devMbbiDirectSoftCallback.c b/src/std/dev/devMbbiDirectSoftCallback.c
index b2bcd7bcd..1597a1e23 100644
--- a/src/std/dev/devMbbiDirectSoftCallback.c
+++ b/src/std/dev/devMbbiDirectSoftCallback.c
@@ -32,7 +32,7 @@
 
 #define GET_OPTIONS (DBR_STATUS | DBR_TIME)
 
-typedef struct notifyInfo {
+typedef struct devPvt {
     processNotify *ppn;
     CALLBACK *pcallback;
     long options;
@@ -42,13 +42,13 @@ typedef struct notifyInfo {
         DBRtime
         epicsUInt16 value;
     } buffer;
-} notifyInfo;
+} devPvt;
 
 
 static void getCallback(processNotify *ppn, notifyGetType type)
 {
     mbbiDirectRecord *prec = (mbbiDirectRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
     long no_elements = 1;
 
     if (ppn->status == notifyCanceled) {
@@ -57,16 +57,16 @@ static void getCallback(processNotify *ppn, notifyGetType type)
     }
 
     assert(type == getFieldType);
-    pnotifyInfo->status = dbGetField(ppn->paddr, DBR_USHORT,
-        &pnotifyInfo->buffer, &pnotifyInfo->options, &no_elements, 0);
+    pdevPvt->status = dbGetField(ppn->paddr, DBR_USHORT,
+        &pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
 }
 
 static void doneCallback(processNotify *ppn)
 {
     mbbiDirectRecord *prec = (mbbiDirectRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
-    callbackRequestProcessCallback(pnotifyInfo->pcallback, prec->prio, prec);
+    callbackRequestProcessCallback(pdevPvt->pcallback, prec->prio, prec);
 }
 
 static long add_record(dbCommon *pcommon)
@@ -75,7 +75,7 @@ static long add_record(dbCommon *pcommon)
     DBLINK *plink = &prec->inp;
     DBADDR *pdbaddr;
     long status;
-    notifyInfo *pnotifyInfo;
+    devPvt *pdevPvt;
     processNotify *ppn;
 
     if (plink->type == CONSTANT) return 0;
@@ -109,29 +109,29 @@ static long add_record(dbCommon *pcommon)
     ppn->doneCallback = doneCallback;
     ppn->requestType = processGetRequest;
 
-    pnotifyInfo = callocMustSucceed(1, sizeof(*pnotifyInfo),
+    pdevPvt = callocMustSucceed(1, sizeof(*pdevPvt),
         "devMbbiDirectSoftCallback::add_record");
-    pnotifyInfo->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
+    pdevPvt->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
         "devMbbiDirectSoftCallback::add_record");
-    pnotifyInfo->ppn = ppn;
-    pnotifyInfo->options = GET_OPTIONS;
+    pdevPvt->ppn = ppn;
+    pdevPvt->options = GET_OPTIONS;
 
-    prec->dpvt = pnotifyInfo;
+    prec->dpvt = pdevPvt;
     return 0;
 }
 
 static long del_record(dbCommon *pcommon) {
     mbbiDirectRecord *prec = (mbbiDirectRecord *)pcommon;
     DBLINK *plink = &prec->inp;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (plink->type == CONSTANT) return 0;
     assert(plink->type == PN_LINK);
 
-    dbNotifyCancel(pnotifyInfo->ppn);
-    free(pnotifyInfo->ppn);
-    free(pnotifyInfo->pcallback);
-    free(pnotifyInfo);
+    dbNotifyCancel(pdevPvt->ppn);
+    free(pdevPvt->ppn);
+    free(pdevPvt->pcallback);
+    free(pdevPvt);
     free(plink->value.pv_link.pvt);
 
     plink->type = PV_LINK;
@@ -171,44 +171,44 @@ static long init_record(mbbiDirectRecord *prec)
 
 static long read_mbbiDirect(mbbiDirectRecord *prec)
 {
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (!prec->dpvt)
         return 2;
 
     if (!prec->pact) {
-        dbProcessNotify(pnotifyInfo->ppn);
+        dbProcessNotify(pdevPvt->ppn);
         prec->pact = TRUE;
         return 0;
     }
 
-    if (pnotifyInfo->status) {
+    if (pdevPvt->status) {
         recGblSetSevr(prec, READ_ALARM, INVALID_ALARM);
         return 2;
     }
 
-    prec->val = pnotifyInfo->buffer.value;
+    prec->val = pdevPvt->buffer.value;
     prec->udf = FALSE;
 
     switch (prec->inp.value.pv_link.pvlMask & pvlOptMsMode) {
         case pvlOptNMS:
             break;
         case pvlOptMSI:
-            if (pnotifyInfo->buffer.severity < INVALID_ALARM)
+            if (pdevPvt->buffer.severity < INVALID_ALARM)
                 break;
             /* else fall through */
         case pvlOptMS:
-            recGblSetSevr(prec, LINK_ALARM, pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, LINK_ALARM, pdevPvt->buffer.severity);
             break;
         case pvlOptMSS:
-            recGblSetSevr(prec, pnotifyInfo->buffer.status,
-                pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, pdevPvt->buffer.status,
+                pdevPvt->buffer.severity);
             break;
     }
 
     if (prec->tsel.type == CONSTANT &&
         prec->tse == epicsTimeEventDeviceTime)
-        prec->time = pnotifyInfo->buffer.time;
+        prec->time = pdevPvt->buffer.time;
     return 2;
 }
 
diff --git a/src/std/dev/devMbbiSoftCallback.c b/src/std/dev/devMbbiSoftCallback.c
index f583d8cff..1cf25640e 100644
--- a/src/std/dev/devMbbiSoftCallback.c
+++ b/src/std/dev/devMbbiSoftCallback.c
@@ -32,7 +32,7 @@
 
 #define GET_OPTIONS (DBR_STATUS | DBR_TIME)
 
-typedef struct notifyInfo {
+typedef struct devPvt {
     processNotify *ppn;
     CALLBACK *pcallback;
     long options;
@@ -42,13 +42,13 @@ typedef struct notifyInfo {
         DBRtime
         epicsEnum16 value;
     } buffer;
-} notifyInfo;
+} devPvt;
 
 
 static void getCallback(processNotify *ppn, notifyGetType type)
 {
     mbbiRecord *prec = (mbbiRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
     long no_elements = 1;
 
     if (ppn->status == notifyCanceled) {
@@ -57,16 +57,16 @@ static void getCallback(processNotify *ppn, notifyGetType type)
     }
 
     assert(type == getFieldType);
-    pnotifyInfo->status = dbGetField(ppn->paddr, DBR_ENUM,
-        &pnotifyInfo->buffer, &pnotifyInfo->options, &no_elements, 0);
+    pdevPvt->status = dbGetField(ppn->paddr, DBR_ENUM,
+        &pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
 }
 
 static void doneCallback(processNotify *ppn)
 {
     mbbiRecord *prec = (mbbiRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
-    callbackRequestProcessCallback(pnotifyInfo->pcallback, prec->prio, prec);
+    callbackRequestProcessCallback(pdevPvt->pcallback, prec->prio, prec);
 }
 
 static long add_record(dbCommon *pcommon)
@@ -75,7 +75,7 @@ static long add_record(dbCommon *pcommon)
     DBLINK *plink = &prec->inp;
     DBADDR *pdbaddr;
     long status;
-    notifyInfo *pnotifyInfo;
+    devPvt *pdevPvt;
     processNotify *ppn;
 
     if (plink->type == CONSTANT) return 0;
@@ -109,29 +109,29 @@ static long add_record(dbCommon *pcommon)
     ppn->doneCallback = doneCallback;
     ppn->requestType = processGetRequest;
 
-    pnotifyInfo = callocMustSucceed(1, sizeof(*pnotifyInfo),
+    pdevPvt = callocMustSucceed(1, sizeof(*pdevPvt),
         "devMbbiSoftCallback::add_record");
-    pnotifyInfo->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
+    pdevPvt->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
         "devMbbiSoftCallback::add_record");
-    pnotifyInfo->ppn = ppn;
-    pnotifyInfo->options = GET_OPTIONS;
+    pdevPvt->ppn = ppn;
+    pdevPvt->options = GET_OPTIONS;
 
-    prec->dpvt = pnotifyInfo;
+    prec->dpvt = pdevPvt;
     return 0;
 }
 
 static long del_record(dbCommon *pcommon) {
     mbbiRecord *prec = (mbbiRecord *)pcommon;
     DBLINK *plink = &prec->inp;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (plink->type == CONSTANT) return 0;
     assert(plink->type == PN_LINK);
 
-    dbNotifyCancel(pnotifyInfo->ppn);
-    free(pnotifyInfo->ppn);
-    free(pnotifyInfo->pcallback);
-    free(pnotifyInfo);
+    dbNotifyCancel(pdevPvt->ppn);
+    free(pdevPvt->ppn);
+    free(pdevPvt->pcallback);
+    free(pdevPvt);
     free(plink->value.pv_link.pvt);
 
     plink->type = PV_LINK;
@@ -171,44 +171,44 @@ static long init_record(mbbiRecord *prec)
 
 static long read_mbbi(mbbiRecord *prec)
 {
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (!prec->dpvt)
         return 2;
 
     if (!prec->pact) {
-        dbProcessNotify(pnotifyInfo->ppn);
+        dbProcessNotify(pdevPvt->ppn);
         prec->pact = TRUE;
         return 0;
     }
 
-    if (pnotifyInfo->status) {
+    if (pdevPvt->status) {
         recGblSetSevr(prec, READ_ALARM, INVALID_ALARM);
         return 2;
     }
 
-    prec->val = pnotifyInfo->buffer.value;
+    prec->val = pdevPvt->buffer.value;
     prec->udf = FALSE;
 
     switch (prec->inp.value.pv_link.pvlMask & pvlOptMsMode) {
         case pvlOptNMS:
             break;
         case pvlOptMSI:
-            if (pnotifyInfo->buffer.severity < INVALID_ALARM)
+            if (pdevPvt->buffer.severity < INVALID_ALARM)
                 break;
             /* else fall through */
         case pvlOptMS:
-            recGblSetSevr(prec, LINK_ALARM, pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, LINK_ALARM, pdevPvt->buffer.severity);
             break;
         case pvlOptMSS:
-            recGblSetSevr(prec, pnotifyInfo->buffer.status,
-                pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, pdevPvt->buffer.status,
+                pdevPvt->buffer.severity);
             break;
     }
 
     if (prec->tsel.type == CONSTANT &&
         prec->tse == epicsTimeEventDeviceTime)
-        prec->time = pnotifyInfo->buffer.time;
+        prec->time = pdevPvt->buffer.time;
     return 2;
 }
 
diff --git a/src/std/dev/devSiSoftCallback.c b/src/std/dev/devSiSoftCallback.c
index 2aa732221..18438a06d 100644
--- a/src/std/dev/devSiSoftCallback.c
+++ b/src/std/dev/devSiSoftCallback.c
@@ -33,7 +33,7 @@
 
 #define GET_OPTIONS (DBR_STATUS | DBR_TIME)
 
-typedef struct notifyInfo {
+typedef struct devPvt {
     processNotify *ppn;
     CALLBACK *pcallback;
     long options;
@@ -43,13 +43,13 @@ typedef struct notifyInfo {
         DBRtime
         char value[MAX_STRING_SIZE];
     } buffer;
-} notifyInfo;
+} devPvt;
 
 
 static void getCallback(processNotify *ppn, notifyGetType type)
 {
     stringinRecord *prec = (stringinRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
     long no_elements = 1;
 
     if (ppn->status==notifyCanceled) {
@@ -58,16 +58,16 @@ static void getCallback(processNotify *ppn, notifyGetType type)
     }
 
     assert(type == getFieldType);
-    pnotifyInfo->status = dbGetField(ppn->paddr, DBR_STRING,
-        &pnotifyInfo->buffer, &pnotifyInfo->options, &no_elements, 0);
+    pdevPvt->status = dbGetField(ppn->paddr, DBR_STRING,
+        &pdevPvt->buffer, &pdevPvt->options, &no_elements, 0);
 }
 
 static void doneCallback(processNotify *ppn)
 {
     stringinRecord *prec = (stringinRecord *)ppn->usrPvt;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
-    callbackRequestProcessCallback(pnotifyInfo->pcallback, prec->prio, prec);
+    callbackRequestProcessCallback(pdevPvt->pcallback, prec->prio, prec);
 }
 
 
@@ -77,7 +77,7 @@ static long add_record(dbCommon *pcommon)
     DBLINK *plink = &prec->inp;
     DBADDR *pdbaddr;
     long  status;
-    notifyInfo *pnotifyInfo;
+    devPvt *pdevPvt;
     processNotify *ppn;
 
     if (plink->type == CONSTANT) return 0;
@@ -111,29 +111,29 @@ static long add_record(dbCommon *pcommon)
     ppn->doneCallback = doneCallback;
     ppn->requestType = processGetRequest;
 
-    pnotifyInfo = callocMustSucceed(1, sizeof(*pnotifyInfo),
+    pdevPvt = callocMustSucceed(1, sizeof(*pdevPvt),
         "devSiSoftCallback::add_record");
-    pnotifyInfo->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
+    pdevPvt->pcallback = callocMustSucceed(1, sizeof(CALLBACK),
         "devSiSoftCallback::add_record");
-    pnotifyInfo->ppn = ppn;
-    pnotifyInfo->options = GET_OPTIONS;
+    pdevPvt->ppn = ppn;
+    pdevPvt->options = GET_OPTIONS;
 
-    prec->dpvt = pnotifyInfo;
+    prec->dpvt = pdevPvt;
     return 0;
 }
 
 static long del_record(dbCommon *pcommon) {
     stringinRecord *prec = (stringinRecord *)pcommon;
     DBLINK *plink = &prec->inp;
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (plink->type == CONSTANT) return 0;
     assert(plink->type == PN_LINK);
 
-    dbNotifyCancel(pnotifyInfo->ppn);
-    free(pnotifyInfo->ppn);
-    free(pnotifyInfo->pcallback);
-    free(pnotifyInfo);
+    dbNotifyCancel(pdevPvt->ppn);
+    free(pdevPvt->ppn);
+    free(pdevPvt->pcallback);
+    free(pdevPvt);
     free(plink->value.pv_link.pvt);
 
     plink->type = PV_LINK;
@@ -173,22 +173,22 @@ static long init_record(stringinRecord *prec)
 
 static long read_si(stringinRecord *prec)
 {
-    notifyInfo *pnotifyInfo = (notifyInfo *)prec->dpvt;
+    devPvt *pdevPvt = (devPvt *)prec->dpvt;
 
     if (!prec->dpvt)
         return 0;
 
     if (!prec->pact) {
-        dbProcessNotify(pnotifyInfo->ppn);
+        dbProcessNotify(pdevPvt->ppn);
         prec->pact = TRUE;
         return 0;
     }
 
-    if (pnotifyInfo->status) {
+    if (pdevPvt->status) {
         recGblSetSevr(prec, READ_ALARM, INVALID_ALARM);
-        return pnotifyInfo->status;
+        return pdevPvt->status;
     }
-    strncpy(prec->val, pnotifyInfo->buffer.value, MAX_STRING_SIZE);
+    strncpy(prec->val, pdevPvt->buffer.value, MAX_STRING_SIZE);
     prec->val[MAX_STRING_SIZE-1] = 0;
     prec->udf = FALSE;
 
@@ -196,21 +196,21 @@ static long read_si(stringinRecord *prec)
         case pvlOptNMS:
             break;
         case pvlOptMSI:
-            if (pnotifyInfo->buffer.severity < INVALID_ALARM)
+            if (pdevPvt->buffer.severity < INVALID_ALARM)
                 break;
             /* else fall through */
         case pvlOptMS:
-            recGblSetSevr(prec, LINK_ALARM, pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, LINK_ALARM, pdevPvt->buffer.severity);
             break;
         case pvlOptMSS:
-            recGblSetSevr(prec, pnotifyInfo->buffer.status,
-                pnotifyInfo->buffer.severity);
+            recGblSetSevr(prec, pdevPvt->buffer.status,
+                pdevPvt->buffer.severity);
             break;
     }
 
     if (prec->tsel.type == CONSTANT &&
         prec->tse == epicsTimeEventDeviceTime)
-        prec->time = pnotifyInfo->buffer.time;
+        prec->time = pdevPvt->buffer.time;
     return 0;
 }