diff --git a/src/spicelib/devices/mos3/mos3mask.c b/src/spicelib/devices/mos3/mos3mask.c
index f3a07716d..1dac927d4 100644
--- a/src/spicelib/devices/mos3/mos3mask.c
+++ b/src/spicelib/devices/mos3/mos3mask.c
@@ -18,147 +18,147 @@ Modified: 2000 AlansFixes
 
 /*ARGSUSED*/
 int
-MOS3mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
+MOS3mAsk(CKTcircuit *ckt, GENmodel *inModel, int which, IFvalue *value)
 {
-    MOS3model *here = (MOS3model *)inst;
+    MOS3model *model = (MOS3model *)inModel;
 
     NG_IGNORE(ckt);
 
     switch(which) {
         case MOS3_MOD_TNOM:
-            value->rValue = here->MOS3tnom-CONSTCtoK;
+            value->rValue = model->MOS3tnom-CONSTCtoK;
             return(OK);
         case MOS3_MOD_VTO:
-            value->rValue = here->MOS3vt0;
+            value->rValue = model->MOS3vt0;
             return(OK);
         case MOS3_MOD_KP:
-            value->rValue = here->MOS3transconductance;
+            value->rValue = model->MOS3transconductance;
             return(OK);
         case MOS3_MOD_GAMMA:
-            value->rValue = here->MOS3gamma;
+            value->rValue = model->MOS3gamma;
             return(OK);
         case MOS3_MOD_PHI:
-            value->rValue = here->MOS3phi;
+            value->rValue = model->MOS3phi;
             return(OK);
         case MOS3_MOD_RD:
-            value->rValue = here->MOS3drainResistance;
+            value->rValue = model->MOS3drainResistance;
             return(OK);
         case MOS3_MOD_RS:
-            value->rValue = here->MOS3sourceResistance;
+            value->rValue = model->MOS3sourceResistance;
             return(OK);
         case MOS3_MOD_CBD:
-            value->rValue = here->MOS3capBD;
+            value->rValue = model->MOS3capBD;
             return(OK);
         case MOS3_MOD_CBS:
-            value->rValue = here->MOS3capBS;
+            value->rValue = model->MOS3capBS;
             return(OK);
         case MOS3_MOD_IS:
-            value->rValue = here->MOS3jctSatCur;
+            value->rValue = model->MOS3jctSatCur;
             return(OK);
         case MOS3_MOD_PB:
-            value->rValue = here->MOS3bulkJctPotential;
+            value->rValue = model->MOS3bulkJctPotential;
             return(OK);
         case MOS3_MOD_CGSO:
-            value->rValue = here->MOS3gateSourceOverlapCapFactor;
+            value->rValue = model->MOS3gateSourceOverlapCapFactor;
             return(OK);
         case MOS3_MOD_CGDO:
-            value->rValue = here->MOS3gateDrainOverlapCapFactor;
+            value->rValue = model->MOS3gateDrainOverlapCapFactor;
             return(OK);
         case MOS3_MOD_CGBO:
-            value->rValue = here->MOS3gateBulkOverlapCapFactor;
+            value->rValue = model->MOS3gateBulkOverlapCapFactor;
             return(OK);
         case MOS3_MOD_CJ:
-            value->rValue = here->MOS3bulkCapFactor;
+            value->rValue = model->MOS3bulkCapFactor;
             return(OK);
         case MOS3_MOD_MJ:
-            value->rValue = here->MOS3bulkJctBotGradingCoeff;
+            value->rValue = model->MOS3bulkJctBotGradingCoeff;
             return(OK);
         case MOS3_MOD_CJSW:
-            value->rValue = here->MOS3sideWallCapFactor;
+            value->rValue = model->MOS3sideWallCapFactor;
             return(OK);
         case MOS3_MOD_MJSW:
-            value->rValue = here->MOS3bulkJctSideGradingCoeff;
+            value->rValue = model->MOS3bulkJctSideGradingCoeff;
             return(OK);
         case MOS3_MOD_JS:
-            value->rValue = here->MOS3jctSatCurDensity;
+            value->rValue = model->MOS3jctSatCurDensity;
             return(OK);
         case MOS3_MOD_TOX:
-            value->rValue = here->MOS3oxideThickness;
+            value->rValue = model->MOS3oxideThickness;
             return(OK);
         case MOS3_MOD_LD:
-            value->rValue = here->MOS3latDiff;
+            value->rValue = model->MOS3latDiff;
             return(OK);
         case MOS3_MOD_XL:
-            value->rValue = here->MOS3lengthAdjust;
+            value->rValue = model->MOS3lengthAdjust;
             return(OK);
         case MOS3_MOD_WD:
-            value->rValue = here->MOS3widthNarrow;
+            value->rValue = model->MOS3widthNarrow;
             return(OK);
         case MOS3_MOD_XW:
-            value->rValue = here->MOS3widthAdjust;
+            value->rValue = model->MOS3widthAdjust;
             return(OK);
         case MOS3_MOD_DELVTO:
-            value->rValue = here->MOS3delvt0;
+            value->rValue = model->MOS3delvt0;
             return(OK);
         case MOS3_MOD_RSH:
-            value->rValue = here->MOS3sheetResistance;
+            value->rValue = model->MOS3sheetResistance;
             return(OK);
         case MOS3_MOD_U0:
-            value->rValue = here->MOS3surfaceMobility;
+            value->rValue = model->MOS3surfaceMobility;
             return(OK);
         case MOS3_MOD_FC:
-            value->rValue = here->MOS3fwdCapDepCoeff;
+            value->rValue = model->MOS3fwdCapDepCoeff;
             return(OK);
         case MOS3_MOD_NSUB:
-            value->rValue = here->MOS3substrateDoping;
+            value->rValue = model->MOS3substrateDoping;
             return(OK);
         case MOS3_MOD_TPG:
-            value->iValue = here->MOS3gateType;
+            value->iValue = model->MOS3gateType;
             return(OK);
         case MOS3_MOD_NSS:
-            value->rValue = here->MOS3surfaceStateDensity;
+            value->rValue = model->MOS3surfaceStateDensity;
             return(OK);
         case MOS3_MOD_NFS:
-            value->rValue = here->MOS3fastSurfaceStateDensity;
+            value->rValue = model->MOS3fastSurfaceStateDensity;
             return(OK);
         case MOS3_MOD_DELTA:
-            value->rValue = here->MOS3narrowFactor;
+            value->rValue = model->MOS3narrowFactor;
             return(OK);
         case MOS3_MOD_VMAX:
-            value->rValue = here->MOS3maxDriftVel;
+            value->rValue = model->MOS3maxDriftVel;
             return(OK);
         case MOS3_MOD_XJ:
-            value->rValue = here->MOS3junctionDepth;
+            value->rValue = model->MOS3junctionDepth;
             return(OK);
         case MOS3_MOD_ETA:
-            value->rValue = here->MOS3eta;
+            value->rValue = model->MOS3eta;
             return(OK);
         case MOS3_MOD_XD:
-            value->rValue = here->MOS3coeffDepLayWidth;
+            value->rValue = model->MOS3coeffDepLayWidth;
             return(OK);
         case MOS3_DELTA:
-            value->rValue = here->MOS3delta;
+            value->rValue = model->MOS3delta;
             return(OK);
         case MOS3_MOD_THETA:
-            value->rValue = here->MOS3theta;
+            value->rValue = model->MOS3theta;
             return(OK);
         case MOS3_MOD_ALPHA:
-            value->rValue = here->MOS3alpha;
+            value->rValue = model->MOS3alpha;
             return(OK);
         case MOS3_MOD_KAPPA:
-            value->rValue = here->MOS3kappa;
+            value->rValue = model->MOS3kappa;
             return(OK);
         case MOS3_MOD_KF:
-            value->rValue = here->MOS3fNcoef;
+            value->rValue = model->MOS3fNcoef;
             return(OK);
         case MOS3_MOD_AF:
-            value->rValue = here->MOS3fNexp;
+            value->rValue = model->MOS3fNexp;
             return(OK);
         case MOS3_MOD_NLEV:
-            value->iValue = here->MOS3nlev;
+            value->iValue = model->MOS3nlev;
             return(OK);
         case MOS3_MOD_TYPE:
-            if (here->MOS3type > 0)
+            if (model->MOS3type > 0)
                 value->sValue = "nmos";
             else
                 value->sValue = "pmos";