diff --git a/src/spicelib/devices/asrc/asrcdel.c b/src/spicelib/devices/asrc/asrcdel.c
index 4a7ce7f96..0034979c5 100644
--- a/src/spicelib/devices/asrc/asrcdel.c
+++ b/src/spicelib/devices/asrc/asrcdel.c
@@ -10,9 +10,9 @@ Author: 1987 Kanwar Jit Singh
 
 
 int
-ASRCdelete(GENmodel *model, IFuid name, GENinstance **fast)
+ASRCdelete(GENmodel *model, IFuid name, GENinstance **kill)
 {
-    ASRCinstance **instPtr = (ASRCinstance **) fast;
+    ASRCinstance **instPtr = (ASRCinstance **) kill;
     ASRCmodel *modPtr = (ASRCmodel *) model;
     ASRCinstance **prev = NULL;
     ASRCinstance *here;
diff --git a/src/spicelib/devices/bsim1/b1del.c b/src/spicelib/devices/bsim1/b1del.c
index c40b153c0..1720b976f 100644
--- a/src/spicelib/devices/bsim1/b1del.c
+++ b/src/spicelib/devices/bsim1/b1del.c
@@ -11,9 +11,9 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 
 
 int
-B1delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B1delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    B1instance **fast = (B1instance **) inInst;
+    B1instance **fast = (B1instance **) kill;
     B1model *model = (B1model *) inModel;
     B1instance **prev = NULL;
     B1instance *here;
diff --git a/src/spicelib/devices/bsim2/b2del.c b/src/spicelib/devices/bsim2/b2del.c
index 09d1e4f25..ef1d4a69c 100644
--- a/src/spicelib/devices/bsim2/b2del.c
+++ b/src/spicelib/devices/bsim2/b2del.c
@@ -11,9 +11,9 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
 
 
 int
-B2delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    B2instance **fast = (B2instance **) inInst;
+    B2instance **fast = (B2instance **) kill;
     B2model *model = (B2model *) inModel;
     B2instance **prev = NULL;
     B2instance *here;
diff --git a/src/spicelib/devices/bsim3/b3del.c b/src/spicelib/devices/bsim3/b3del.c
index 27b695cbc..ba88f5144 100644
--- a/src/spicelib/devices/bsim3/b3del.c
+++ b/src/spicelib/devices/bsim3/b3del.c
@@ -17,9 +17,9 @@
 
 
 int
-BSIM3delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM3delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    BSIM3instance **fast = (BSIM3instance **) inInst;
+    BSIM3instance **fast = (BSIM3instance **) kill;
     BSIM3model *model = (BSIM3model *) inModel;
     BSIM3instance **prev = NULL;
     BSIM3instance *here;
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidddel.c b/src/spicelib/devices/bsim3soi_dd/b3soidddel.c
index 8876584f4..4afc90e26 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soidddel.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soidddel.c
@@ -18,9 +18,9 @@ Modified by Paolo Nenzi 2002
 
 
 int
-B3SOIDDdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B3SOIDDdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    B3SOIDDinstance **fast = (B3SOIDDinstance **) inInst;
+    B3SOIDDinstance **fast = (B3SOIDDinstance **) kill;
     B3SOIDDmodel *model = (B3SOIDDmodel *) inModel;
     B3SOIDDinstance **prev = NULL;
     B3SOIDDinstance *here;
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifddel.c b/src/spicelib/devices/bsim3soi_fd/b3soifddel.c
index bef9aff26..37aa3a19a 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifddel.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifddel.c
@@ -18,9 +18,9 @@ File: b3soifddel.c          98/5/01
 
 
 int
-B3SOIFDdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B3SOIFDdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    B3SOIFDinstance **fast = (B3SOIFDinstance **) inInst;
+    B3SOIFDinstance **fast = (B3SOIFDinstance **) kill;
     B3SOIFDmodel *model = (B3SOIFDmodel *) inModel;
     B3SOIFDinstance **prev = NULL;
     B3SOIFDinstance *here;
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipddel.c b/src/spicelib/devices/bsim3soi_pd/b3soipddel.c
index 77abda474..8cdba19c8 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipddel.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipddel.c
@@ -18,9 +18,9 @@ Modified by Paolo Nenzi 2002
 
 
 int
-B3SOIPDdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B3SOIPDdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    B3SOIPDinstance **fast = (B3SOIPDinstance **) inInst;
+    B3SOIPDinstance **fast = (B3SOIPDinstance **) kill;
     B3SOIPDmodel *model = (B3SOIPDmodel *) inModel;
     B3SOIPDinstance **prev = NULL;
     B3SOIPDinstance *here;
diff --git a/src/spicelib/devices/bsim3v0/b3v0del.c b/src/spicelib/devices/bsim3v0/b3v0del.c
index eb52aab2e..6a783e16e 100644
--- a/src/spicelib/devices/bsim3v0/b3v0del.c
+++ b/src/spicelib/devices/bsim3v0/b3v0del.c
@@ -12,9 +12,9 @@ File: b3v0del.c
 
 
 int
-BSIM3v0delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM3v0delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    BSIM3v0instance **fast = (BSIM3v0instance **) inInst;
+    BSIM3v0instance **fast = (BSIM3v0instance **) kill;
     BSIM3v0model *model = (BSIM3v0model *) inModel;
     BSIM3v0instance **prev = NULL;
     BSIM3v0instance *here;
diff --git a/src/spicelib/devices/bsim3v1/b3v1del.c b/src/spicelib/devices/bsim3v1/b3v1del.c
index 862bd4c3a..289db98ba 100644
--- a/src/spicelib/devices/bsim3v1/b3v1del.c
+++ b/src/spicelib/devices/bsim3v1/b3v1del.c
@@ -18,9 +18,9 @@
 
 
 int
-BSIM3v1delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM3v1delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    BSIM3v1instance **fast = (BSIM3v1instance **) inInst;
+    BSIM3v1instance **fast = (BSIM3v1instance **) kill;
     BSIM3v1model *model = (BSIM3v1model *) inModel;
     BSIM3v1instance **prev = NULL;
     BSIM3v1instance *here;
diff --git a/src/spicelib/devices/bsim3v32/b3v32del.c b/src/spicelib/devices/bsim3v32/b3v32del.c
index 76427492d..81dec6a62 100644
--- a/src/spicelib/devices/bsim3v32/b3v32del.c
+++ b/src/spicelib/devices/bsim3v32/b3v32del.c
@@ -18,9 +18,9 @@
 
 
 int
-BSIM3v32delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM3v32delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    BSIM3v32instance **fast = (BSIM3v32instance **) inInst;
+    BSIM3v32instance **fast = (BSIM3v32instance **) kill;
     BSIM3v32model *model = (BSIM3v32model *) inModel;
     BSIM3v32instance **prev = NULL;
     BSIM3v32instance *here;
diff --git a/src/spicelib/devices/bsim4/b4del.c b/src/spicelib/devices/bsim4/b4del.c
index c9f047c77..bfeba8ab6 100644
--- a/src/spicelib/devices/bsim4/b4del.c
+++ b/src/spicelib/devices/bsim4/b4del.c
@@ -66,9 +66,9 @@
 
 
 int
-BSIM4delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM4delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    BSIM4instance **fast = (BSIM4instance **) inInst;
+    BSIM4instance **fast = (BSIM4instance **) kill;
     BSIM4model *model = (BSIM4model *) inModel;
     BSIM4instance **prev = NULL;
     BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4v5/b4v5del.c b/src/spicelib/devices/bsim4v5/b4v5del.c
index a86f0fff0..7036d0360 100644
--- a/src/spicelib/devices/bsim4v5/b4v5del.c
+++ b/src/spicelib/devices/bsim4v5/b4v5del.c
@@ -16,9 +16,9 @@
 
 
 int
-BSIM4v5delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM4v5delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    BSIM4v5instance **fast = (BSIM4v5instance **) inInst;
+    BSIM4v5instance **fast = (BSIM4v5instance **) kill;
     BSIM4v5model *model = (BSIM4v5model *) inModel;
     BSIM4v5instance **prev = NULL;
     BSIM4v5instance *here;
diff --git a/src/spicelib/devices/bsim4v6/b4v6del.c b/src/spicelib/devices/bsim4v6/b4v6del.c
index 0e0ad0cef..db3b4abbc 100644
--- a/src/spicelib/devices/bsim4v6/b4v6del.c
+++ b/src/spicelib/devices/bsim4v6/b4v6del.c
@@ -18,9 +18,9 @@
 
 
 int
-BSIM4v6delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM4v6delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    BSIM4v6instance **fast = (BSIM4v6instance **) inInst;
+    BSIM4v6instance **fast = (BSIM4v6instance **) kill;
     BSIM4v6model *model = (BSIM4v6model *) inModel;
     BSIM4v6instance **prev = NULL;
     BSIM4v6instance *here;
diff --git a/src/spicelib/devices/bsim4v7/b4v7del.c b/src/spicelib/devices/bsim4v7/b4v7del.c
index 7af0ded83..a1d692464 100644
--- a/src/spicelib/devices/bsim4v7/b4v7del.c
+++ b/src/spicelib/devices/bsim4v7/b4v7del.c
@@ -18,9 +18,9 @@
 
 
 int
-BSIM4v7delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+BSIM4v7delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    BSIM4v7instance **fast = (BSIM4v7instance **) inInst;
+    BSIM4v7instance **fast = (BSIM4v7instance **) kill;
     BSIM4v7model *model = (BSIM4v7model *) inModel;
     BSIM4v7instance **prev = NULL;
     BSIM4v7instance *here;
diff --git a/src/spicelib/devices/bsimsoi/b4soidel.c b/src/spicelib/devices/bsimsoi/b4soidel.c
index a37b711f1..828aef044 100644
--- a/src/spicelib/devices/bsimsoi/b4soidel.c
+++ b/src/spicelib/devices/bsimsoi/b4soidel.c
@@ -21,9 +21,9 @@
 
 
 int
-B4SOIdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+B4SOIdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    B4SOIinstance **fast = (B4SOIinstance **) inInst;
+    B4SOIinstance **fast = (B4SOIinstance **) kill;
     B4SOImodel *model = (B4SOImodel *) inModel;
     B4SOIinstance **prev = NULL;
     B4SOIinstance *here;
diff --git a/src/spicelib/devices/cap/capdel.c b/src/spicelib/devices/cap/capdel.c
index 5a3737fb4..218233e36 100644
--- a/src/spicelib/devices/cap/capdel.c
+++ b/src/spicelib/devices/cap/capdel.c
@@ -11,9 +11,9 @@ Modified: September 2003 Paolo Nenzi
 
 
 int
-CAPdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+CAPdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    CAPinstance **fast = (CAPinstance **) inst;
+    CAPinstance **fast = (CAPinstance **) kill;
     CAPmodel *model = (CAPmodel *) inModel;
     CAPinstance **prev = NULL;
     CAPinstance *here;
diff --git a/src/spicelib/devices/cccs/cccsdel.c b/src/spicelib/devices/cccs/cccsdel.c
index 836fa0069..b9e2e38d4 100644
--- a/src/spicelib/devices/cccs/cccsdel.c
+++ b/src/spicelib/devices/cccs/cccsdel.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-CCCSdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+CCCSdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     CCCSmodel *model = (CCCSmodel *) inModel;
-    CCCSinstance **fast = (CCCSinstance **) inst;
+    CCCSinstance **fast = (CCCSinstance **) kill;
     CCCSinstance **prev = NULL;
     CCCSinstance *here;
 
diff --git a/src/spicelib/devices/cpl/cpldel.c b/src/spicelib/devices/cpl/cpldel.c
index 44685cf34..2711b54d7 100644
--- a/src/spicelib/devices/cpl/cpldel.c
+++ b/src/spicelib/devices/cpl/cpldel.c
@@ -11,10 +11,10 @@ Author: 1992 Charles Hough
 
 
 int
-CPLdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+CPLdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     CPLmodel *model = (CPLmodel *) inModel;
-    CPLinstance **fast = (CPLinstance **) inst;
+    CPLinstance **fast = (CPLinstance **) kill;
     CPLinstance **prev = NULL;
     CPLinstance *here;
 
diff --git a/src/spicelib/devices/csw/cswdel.c b/src/spicelib/devices/csw/cswdel.c
index cbcb99651..b5624244f 100644
--- a/src/spicelib/devices/csw/cswdel.c
+++ b/src/spicelib/devices/csw/cswdel.c
@@ -10,10 +10,10 @@ Author: 1985 Gordon Jacobs
 
 
 int
-CSWdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+CSWdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     CSWmodel *model = (CSWmodel *) inModel;
-    CSWinstance **fast = (CSWinstance **) inst;
+    CSWinstance **fast = (CSWinstance **) kill;
     CSWinstance **prev = NULL;
     CSWinstance *here;
 
diff --git a/src/spicelib/devices/hfet1/hfetdel.c b/src/spicelib/devices/hfet1/hfetdel.c
index 783599fd4..a94fa8db1 100644
--- a/src/spicelib/devices/hfet1/hfetdel.c
+++ b/src/spicelib/devices/hfet1/hfetdel.c
@@ -14,10 +14,10 @@ Author: 1985 S. Hwang
 
 
 int
-HFETAdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+HFETAdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     HFETAmodel *model = (HFETAmodel *) inModel;
-    HFETAinstance **fast = (HFETAinstance **) inst;
+    HFETAinstance **fast = (HFETAinstance **) kill;
     HFETAinstance **prev = NULL;
     HFETAinstance *here;
 
diff --git a/src/spicelib/devices/hfet2/hfet2del.c b/src/spicelib/devices/hfet2/hfet2del.c
index 33be50267..4b3628c83 100644
--- a/src/spicelib/devices/hfet2/hfet2del.c
+++ b/src/spicelib/devices/hfet2/hfet2del.c
@@ -14,10 +14,10 @@ Author: 1985 S. Hwang
 
 
 int
-HFET2delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+HFET2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     HFET2model *model = (HFET2model *) inModel;
-    HFET2instance **fast = (HFET2instance **) inst;
+    HFET2instance **fast = (HFET2instance **) kill;
     HFET2instance **prev = NULL;
     HFET2instance *here;
 
diff --git a/src/spicelib/devices/hisim2/hsm2del.c b/src/spicelib/devices/hisim2/hsm2del.c
index 158e84201..4e475e130 100644
--- a/src/spicelib/devices/hisim2/hsm2del.c
+++ b/src/spicelib/devices/hisim2/hsm2del.c
@@ -62,9 +62,9 @@ to others."
 
 
 int
-HSM2delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+HSM2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    HSM2instance **fast = (HSM2instance **) inInst;
+    HSM2instance **fast = (HSM2instance **) kill;
     HSM2model *model = (HSM2model *) inModel;
     HSM2instance **prev = NULL;
     HSM2instance *here;
diff --git a/src/spicelib/devices/hisimhv1/hsmhvdel.c b/src/spicelib/devices/hisimhv1/hsmhvdel.c
index 0876250ce..fa29c8f93 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvdel.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvdel.c
@@ -23,9 +23,9 @@
 
 
 int
-HSMHVdelete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+HSMHVdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    HSMHVinstance **fast = (HSMHVinstance **) inInst;
+    HSMHVinstance **fast = (HSMHVinstance **) kill;
     HSMHVmodel *model = (HSMHVmodel *) inModel;
     HSMHVinstance **prev = NULL;
     HSMHVinstance *here;
diff --git a/src/spicelib/devices/hisimhv2/hsmhv2del.c b/src/spicelib/devices/hisimhv2/hsmhv2del.c
index c93fc4504..4f3937bd0 100644
--- a/src/spicelib/devices/hisimhv2/hsmhv2del.c
+++ b/src/spicelib/devices/hisimhv2/hsmhv2del.c
@@ -65,9 +65,9 @@ June 2008 (revised October 2011)
 
 
 int
-HSMHV2delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
+HSMHV2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
-    HSMHV2instance **fast = (HSMHV2instance **) inInst;
+    HSMHV2instance **fast = (HSMHV2instance **) kill;
     HSMHV2model *model = (HSMHV2model *) inModel;
     HSMHV2instance **prev = NULL;
     HSMHV2instance *here;
diff --git a/src/spicelib/devices/isrc/isrcdel.c b/src/spicelib/devices/isrc/isrcdel.c
index bdcb6ee97..729e10cec 100644
--- a/src/spicelib/devices/isrc/isrcdel.c
+++ b/src/spicelib/devices/isrc/isrcdel.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-ISRCdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+ISRCdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     ISRCmodel *model = (ISRCmodel *) inModel;
-    ISRCinstance **fast = (ISRCinstance **) inst;
+    ISRCinstance **fast = (ISRCinstance **) kill;
     ISRCinstance **prev = NULL;
     ISRCinstance *here;
 
diff --git a/src/spicelib/devices/jfet/jfetdel.c b/src/spicelib/devices/jfet/jfetdel.c
index 9d4d6d9c0..51dfdb7da 100644
--- a/src/spicelib/devices/jfet/jfetdel.c
+++ b/src/spicelib/devices/jfet/jfetdel.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-JFETdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+JFETdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     JFETmodel *model = (JFETmodel *) inModel;
-    JFETinstance **fast = (JFETinstance **) inst;
+    JFETinstance **fast = (JFETinstance **) kill;
     JFETinstance **prev = NULL;
     JFETinstance *here;
 
diff --git a/src/spicelib/devices/jfet2/jfet2del.c b/src/spicelib/devices/jfet2/jfet2del.c
index b2a8da4a5..036ef1649 100644
--- a/src/spicelib/devices/jfet2/jfet2del.c
+++ b/src/spicelib/devices/jfet2/jfet2del.c
@@ -14,10 +14,10 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker )
 
 
 int
-JFET2delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+JFET2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     JFET2model *model = (JFET2model *) inModel;
-    JFET2instance **fast = (JFET2instance **) inst;
+    JFET2instance **fast = (JFET2instance **) kill;
     JFET2instance **prev = NULL;
     JFET2instance *here;
 
diff --git a/src/spicelib/devices/mes/mesdel.c b/src/spicelib/devices/mes/mesdel.c
index ad4c0a031..14a38681a 100644
--- a/src/spicelib/devices/mes/mesdel.c
+++ b/src/spicelib/devices/mes/mesdel.c
@@ -10,10 +10,10 @@ Author: 1985 S. Hwang
 
 
 int
-MESdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MESdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     MESmodel *model = (MESmodel *) inModel;
-    MESinstance **fast = (MESinstance **) inst;
+    MESinstance **fast = (MESinstance **) kill;
     MESinstance **prev = NULL;
     MESinstance *here;
 
diff --git a/src/spicelib/devices/mesa/mesadel.c b/src/spicelib/devices/mesa/mesadel.c
index 9347f0c44..0a4c104fa 100644
--- a/src/spicelib/devices/mesa/mesadel.c
+++ b/src/spicelib/devices/mesa/mesadel.c
@@ -14,10 +14,10 @@ Author: 1985 S. Hwang
 
 
 int
-MESAdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MESAdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     MESAmodel *model = (MESAmodel *) inModel;
-    MESAinstance **fast = (MESAinstance **) inst;
+    MESAinstance **fast = (MESAinstance **) kill;
     MESAinstance **prev = NULL;
     MESAinstance *here;
 
diff --git a/src/spicelib/devices/mos1/mos1del.c b/src/spicelib/devices/mos1/mos1del.c
index 5fb32a7a9..ed45007f4 100644
--- a/src/spicelib/devices/mos1/mos1del.c
+++ b/src/spicelib/devices/mos1/mos1del.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-MOS1delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS1delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     MOS1model *model = (MOS1model *) inModel;
-    MOS1instance **fast = (MOS1instance **) inst;
+    MOS1instance **fast = (MOS1instance **) kill;
     MOS1instance **prev = NULL;
     MOS1instance *here;
 
diff --git a/src/spicelib/devices/mos2/mos2del.c b/src/spicelib/devices/mos2/mos2del.c
index 2cc2d446c..f4dd81701 100644
--- a/src/spicelib/devices/mos2/mos2del.c
+++ b/src/spicelib/devices/mos2/mos2del.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-MOS2delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     MOS2model *model = (MOS2model *) inModel;
-    MOS2instance **fast = (MOS2instance **) inst;
+    MOS2instance **fast = (MOS2instance **) kill;
     MOS2instance **prev = NULL;
     MOS2instance *here;
 
diff --git a/src/spicelib/devices/mos3/mos3del.c b/src/spicelib/devices/mos3/mos3del.c
index dc2573b1b..97870b146 100644
--- a/src/spicelib/devices/mos3/mos3del.c
+++ b/src/spicelib/devices/mos3/mos3del.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-MOS3delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS3delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     MOS3model *model = (MOS3model *) inModel;
-    MOS3instance **fast = (MOS3instance **) inst;
+    MOS3instance **fast = (MOS3instance **) kill;
     MOS3instance **prev = NULL;
     MOS3instance *here;
 
diff --git a/src/spicelib/devices/mos9/mos9del.c b/src/spicelib/devices/mos9/mos9del.c
index f8ab7798b..240765d2d 100644
--- a/src/spicelib/devices/mos9/mos9del.c
+++ b/src/spicelib/devices/mos9/mos9del.c
@@ -11,10 +11,10 @@ Modified: Alan Gillespie
 
 
 int
-MOS9delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+MOS9delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     MOS9model *model = (MOS9model *) inModel;
-    MOS9instance **fast = (MOS9instance **) inst;
+    MOS9instance **fast = (MOS9instance **) kill;
     MOS9instance **prev = NULL;
     MOS9instance *here;
 
diff --git a/src/spicelib/devices/res/resdel.c b/src/spicelib/devices/res/resdel.c
index 65cfc5ef5..06761fc0e 100644
--- a/src/spicelib/devices/res/resdel.c
+++ b/src/spicelib/devices/res/resdel.c
@@ -10,10 +10,10 @@ Modified: Apr 2000 - Paolo Nenzi
 
 
 int
-RESdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+RESdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     RESmodel *model = (RESmodel *) inModel;
-    RESinstance **fast = (RESinstance **) inst;
+    RESinstance **fast = (RESinstance **) kill;
     RESinstance **prev = NULL;
     RESinstance *here;
 
diff --git a/src/spicelib/devices/soi3/soi3del.c b/src/spicelib/devices/soi3/soi3del.c
index ec9bcedf0..c0d4afdd0 100644
--- a/src/spicelib/devices/soi3/soi3del.c
+++ b/src/spicelib/devices/soi3/soi3del.c
@@ -27,10 +27,10 @@ Acknowledgements : Rupert Howes and Pete Mole.
 
 
 int
-SOI3delete(GENmodel *inModel, IFuid name, GENinstance **inst)
+SOI3delete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     SOI3model *model = (SOI3model *) inModel;
-    SOI3instance **fast = (SOI3instance **) inst;
+    SOI3instance **fast = (SOI3instance **) kill;
     SOI3instance **prev = NULL;
     SOI3instance *here;
 
diff --git a/src/spicelib/devices/sw/swdelete.c b/src/spicelib/devices/sw/swdelete.c
index 7dd1dde63..62811e2bd 100644
--- a/src/spicelib/devices/sw/swdelete.c
+++ b/src/spicelib/devices/sw/swdelete.c
@@ -10,10 +10,10 @@ Author: 1985 Gordon Jacobs
 
 
 int
-SWdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+SWdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     SWmodel *model = (SWmodel *) inModel;
-    SWinstance **fast = (SWinstance **) inst;
+    SWinstance **fast = (SWinstance **) kill;
     SWinstance **prev = NULL;
     SWinstance *here;
 
diff --git a/src/spicelib/devices/txl/txldel.c b/src/spicelib/devices/txl/txldel.c
index f4e420d45..025a5d996 100644
--- a/src/spicelib/devices/txl/txldel.c
+++ b/src/spicelib/devices/txl/txldel.c
@@ -11,10 +11,10 @@ Author: 1992 Charles Hough
 
 
 int
-TXLdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+TXLdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     TXLmodel *model = (TXLmodel *) inModel;
-    TXLinstance **fast = (TXLinstance **) inst;
+    TXLinstance **fast = (TXLinstance **) kill;
     TXLinstance **prev = NULL;
     TXLinstance *here;
 
diff --git a/src/spicelib/devices/urc/urcdel.c b/src/spicelib/devices/urc/urcdel.c
index f220ddc79..fbc15fef4 100644
--- a/src/spicelib/devices/urc/urcdel.c
+++ b/src/spicelib/devices/urc/urcdel.c
@@ -10,10 +10,10 @@ Author: 1987 Thomas L. Quarles
 
 
 int
-URCdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+URCdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     URCmodel *model = (URCmodel *) inModel;
-    URCinstance **fast = (URCinstance **) inst;
+    URCinstance **fast = (URCinstance **) kill;
     URCinstance **prev = NULL;
     URCinstance *here;
 
diff --git a/src/spicelib/devices/vccs/vccsdel.c b/src/spicelib/devices/vccs/vccsdel.c
index 864474f44..370379da0 100644
--- a/src/spicelib/devices/vccs/vccsdel.c
+++ b/src/spicelib/devices/vccs/vccsdel.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-VCCSdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+VCCSdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     VCCSmodel *model = (VCCSmodel *) inModel;
-    VCCSinstance **fast = (VCCSinstance **) inst;
+    VCCSinstance **fast = (VCCSinstance **) kill;
     VCCSinstance **prev = NULL;
     VCCSinstance *here;
 
diff --git a/src/spicelib/devices/vcvs/vcvsdel.c b/src/spicelib/devices/vcvs/vcvsdel.c
index 84a885788..0f9cf8927 100644
--- a/src/spicelib/devices/vcvs/vcvsdel.c
+++ b/src/spicelib/devices/vcvs/vcvsdel.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-VCVSdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+VCVSdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     VCVSmodel *model = (VCVSmodel *) inModel;
-    VCVSinstance **fast = (VCVSinstance **) inst;
+    VCVSinstance **fast = (VCVSinstance **) kill;
     VCVSinstance **prev = NULL;
     VCVSinstance *here;
 
diff --git a/src/spicelib/devices/vsrc/vsrcdel.c b/src/spicelib/devices/vsrc/vsrcdel.c
index cc081b205..796d9e2df 100644
--- a/src/spicelib/devices/vsrc/vsrcdel.c
+++ b/src/spicelib/devices/vsrc/vsrcdel.c
@@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles
 
 
 int
-VSRCdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
+VSRCdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
 {
     VSRCmodel *model = (VSRCmodel *) inModel;
-    VSRCinstance **fast = (VSRCinstance **) inst;
+    VSRCinstance **fast = (VSRCinstance **) kill;
     VSRCinstance **prev = NULL;
     VSRCinstance *here;