diff --git a/src/spicelib/devices/asrc/asrcdefs.h b/src/spicelib/devices/asrc/asrcdefs.h
index ffc21ca03..921c23f7f 100644
--- a/src/spicelib/devices/asrc/asrcdefs.h
+++ b/src/spicelib/devices/asrc/asrcdefs.h
@@ -18,7 +18,7 @@ Author: 1985 Thomas L. Quarles
 /* information to describe a single instance */
 
 typedef struct sASRCinstance {
-    struct sASRCmodel *ARRCmodPtr;          /* backpointer to model */
+    struct sASRCmodel *ASRCmodPtr;          /* backpointer to model */
     struct sASRCinstance *ASRCnextInstance; /* pointer to next instance of
                                              * current model */
     IFuid ASRCname;            /* pointer to character string naming this instance */
diff --git a/src/spicelib/devices/mos1/mos1ask.c b/src/spicelib/devices/mos1/mos1ask.c
index be63f9304..d913c162d 100644
--- a/src/spicelib/devices/mos1/mos1ask.c
+++ b/src/spicelib/devices/mos1/mos1ask.c
@@ -182,7 +182,7 @@ MOS1ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
         case MOS1_CAPGS:
             value->rValue = 2* *(ckt->CKTstate0 + here->MOS1capgs);
             /* add overlap capacitance */
-            value->rValue += (here->sMOS1modPtr->MOS1gateSourceOverlapCapFactor)
+            value->rValue += (here->MOS1modPtr->MOS1gateSourceOverlapCapFactor)
                              * here->MOS1m
                              * (here->MOS1w);
             return(OK);
@@ -195,7 +195,7 @@ MOS1ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
         case MOS1_CAPGD:
             value->rValue = 2* *(ckt->CKTstate0 + here->MOS1capgd);
             /* add overlap capacitance */
-            value->rValue += (here->sMOS1modPtr->MOS1gateDrainOverlapCapFactor)
+            value->rValue += (here->MOS1modPtr->MOS1gateDrainOverlapCapFactor)
                              * here->MOS1m
                              * (here->MOS1w);
             return(OK);
@@ -208,10 +208,10 @@ MOS1ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
         case MOS1_CAPGB:
             value->rValue = 2* *(ckt->CKTstate0 + here->MOS1capgb);
             /* add overlap capacitance */
-            value->rValue += (here->sMOS1modPtr->MOS1gateBulkOverlapCapFactor)
+            value->rValue += (here->MOS1modPtr->MOS1gateBulkOverlapCapFactor)
                              * here->MOS1m
                              * (here->MOS1l
-                                -2*(here->sMOS1modPtr->MOS1latDiff));
+                                -2*(here->MOS1modPtr->MOS1latDiff));
             return(OK);
         case MOS1_QGB:
             value->rValue = *(ckt->CKTstate0 + here->MOS1qgb);
diff --git a/src/spicelib/devices/mos1/mos1defs.h b/src/spicelib/devices/mos1/mos1defs.h
index 6d99af876..b5862df3c 100644
--- a/src/spicelib/devices/mos1/mos1defs.h
+++ b/src/spicelib/devices/mos1/mos1defs.h
@@ -18,7 +18,7 @@ Modified: 2000 AlansFixes
 /* information needed for each instance */
 
 typedef struct sMOS1instance {
-    struct sMOS1model *sMOS1modPtr; /* backpointer to model */
+    struct sMOS1model *MOS1modPtr; /* backpointer to model */
     struct sMOS1instance *MOS1nextInstance;  /* pointer to next instance of
                                               *current model*/
     IFuid MOS1name; /* pointer to character string naming this instance */
diff --git a/src/spicelib/devices/mos6/mos6ask.c b/src/spicelib/devices/mos6/mos6ask.c
index 35483c6c4..5740b2787 100644
--- a/src/spicelib/devices/mos6/mos6ask.c
+++ b/src/spicelib/devices/mos6/mos6ask.c
@@ -209,7 +209,7 @@ MOS6ask(CKTcircuit *ckt, GENinstance *inst, int which,
         case MOS6_CAPGS:
             value->rValue = 2* *(ckt->CKTstate0 + here->MOS6capgs);
             /* add overlap capacitance */
-            value->rValue += (here->sMOS6modPtr->MOS6gateSourceOverlapCapFactor)
+            value->rValue += (here->MOS6modPtr->MOS6gateSourceOverlapCapFactor)
                              * (here->MOS6w);
             value->rValue *= here->MOS6m;
             return(OK);
@@ -224,7 +224,7 @@ MOS6ask(CKTcircuit *ckt, GENinstance *inst, int which,
         case MOS6_CAPGD:
             value->rValue = 2* *(ckt->CKTstate0 + here->MOS6capgd);
             /* add overlap capacitance */
-            value->rValue += (here->sMOS6modPtr->MOS6gateSourceOverlapCapFactor)
+            value->rValue += (here->MOS6modPtr->MOS6gateSourceOverlapCapFactor)
                              * (here->MOS6w);
             value->rValue *= here->MOS6m;
             return(OK);
@@ -239,9 +239,9 @@ MOS6ask(CKTcircuit *ckt, GENinstance *inst, int which,
         case MOS6_CAPGB:
             value->rValue = 2* *(ckt->CKTstate0 + here->MOS6capgb);
             /* add overlap capacitance */
-            value->rValue += (here->sMOS6modPtr->MOS6gateBulkOverlapCapFactor)
+            value->rValue += (here->MOS6modPtr->MOS6gateBulkOverlapCapFactor)
                              * (here->MOS6l
-                                -2*(here->sMOS6modPtr->MOS6latDiff));
+                                -2*(here->MOS6modPtr->MOS6latDiff));
             value->rValue *= here->MOS6m;
             return(OK);
         case MOS6_QGB:
diff --git a/src/spicelib/devices/mos6/mos6defs.h b/src/spicelib/devices/mos6/mos6defs.h
index b9f9438ea..053d8948e 100644
--- a/src/spicelib/devices/mos6/mos6defs.h
+++ b/src/spicelib/devices/mos6/mos6defs.h
@@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
 /* information needed for each instance */
 
 typedef struct sMOS6instance {
-    struct sMOS6model *sMOS6modPtr; /* backpointer to model */
+    struct sMOS6model *MOS6modPtr; /* backpointer to model */
     struct sMOS6instance *MOS6nextInstance;  /* pointer to next instance of
                                               *current model*/
     IFuid MOS6name; /* pointer to character string naming this instance */
diff --git a/src/spicelib/devices/soi3/soi3defs.h b/src/spicelib/devices/soi3/soi3defs.h
index 24cf30fb6..80877e022 100644
--- a/src/spicelib/devices/soi3/soi3defs.h
+++ b/src/spicelib/devices/soi3/soi3defs.h
@@ -37,7 +37,7 @@ ngspice integration
 
 typedef struct sSOI3instance {
 
-    struct sSOI3model *sSOI3modPtr; /* backpointer to model */
+    struct sSOI3model *SOI3modPtr; /* backpointer to model */
     struct sSOI3instance *SOI3nextInstance;  /* pointer to next instance of
                                               *current model*/
     IFuid SOI3name;     /* pointer to character string naming this instance */