diff --git a/configure.ac b/configure.ac
index 8deb8984a..be5139fab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1026,7 +1026,7 @@ if test "x$enable_adms" = xyes ; then
     fi
     AC_DEFINE([ADMS], [1], [Support for Verilog-A models])
 
-    VLADEVDIR=" adms/bsim6 \
+    VLADEVDIR=" adms/bsimbulk \
                 adms/bsimcmg \
                 adms/ekv \
                 adms/hicum0 \
@@ -1035,7 +1035,7 @@ if test "x$enable_adms" = xyes ; then
                 adms/psp102 "
 
 # The makefiles for adms (to be added to AC_CONFIG_FILES by ./autogen.sh --adms)
-#VLAMKF    src/spicelib/devices/adms/bsim6/Makefile
+#VLAMKF    src/spicelib/devices/adms/bsimbulk/Makefile
 #VLAMKF    src/spicelib/devices/adms/bsimcmg/Makefile
 #VLAMKF    src/spicelib/devices/adms/ekv/Makefile
 #VLAMKF    src/spicelib/devices/adms/hicum0/Makefile
@@ -1045,7 +1045,7 @@ if test "x$enable_adms" = xyes ; then
 
     NOTVLADEVDIR=""
 
-    VLADEV=" spicelib/devices/adms/bsim6/libbsim6.la \
+    VLADEV=" spicelib/devices/adms/bsimbulk/libbsimbulk.la \
              spicelib/devices/adms/bsimcmg/libbsimcmg.la \
              spicelib/devices/adms/ekv/libekv.la \
              spicelib/devices/adms/hicum0/libhicum0.la \
@@ -1251,7 +1251,7 @@ AC_CONFIG_FILES([Makefile
                  tests/bsim3soifd/Makefile
                  tests/bsim3soipd/Makefile
                  tests/bsim4/Makefile
-                 tests/bsim6/Makefile
+                 tests/bsimbulk/Makefile
                  tests/bsimsoi/Makefile
                  tests/filters/Makefile
                  tests/general/Makefile
diff --git a/src/spicelib/devices/adms/admst/ngspiceVersion.xml b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
index dc3954e99..26001c2b2 100644
--- a/src/spicelib/devices/adms/admst/ngspiceVersion.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
@@ -2140,7 +2140,7 @@
           </admst:new>
         </admst:if>
       </admst:when>
-      <admst:when test="[lower-case(name)='bsim6']">
+      <admst:when test="[lower-case(name)='bsimbulk']">
         <admst:if test="[nilled(variable[name='nmos'])]">
           <admst:value-of select="analog"/>
           <admst:value-of select="."/>
diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c
index f289b61b9..80fb93dcb 100644
--- a/src/spicelib/devices/dev.c
+++ b/src/spicelib/devices/dev.c
@@ -126,7 +126,7 @@ int add_udn(int,Evt_Udn_Info_t **);
 #include "adms/mextram/bjt504titf.h"
 #include "adms/ekv/ekvitf.h"
 #include "adms/psp102/psp102itf.h"
-#include "adms/bsim6/bsim6itf.h"
+#include "adms/bsimbulk/bsimbulkitf.h"
 #include "adms/bsimcmg/bsimcmgitf.h"
 #endif
 #ifdef CIDER
@@ -209,7 +209,7 @@ static SPICEdev *(*static_devices[])(void) = {
     (SPICEdev *(*)(void)) get_bjt504t_info,
     (SPICEdev *(*)(void)) get_ekv_info,
     (SPICEdev *(*)(void)) get_psp102_info,
-    (SPICEdev *(*)(void)) get_bsim6_info,
+    (SPICEdev *(*)(void)) get_bsimbulk_info,
     (SPICEdev *(*)(void)) get_bsimcmg_info,
 #endif
 
@@ -295,7 +295,7 @@ SPICEdev ** devices(void)
 #define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v5", "bsim4v6", "bsim4v7", \
                       "bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv1",  "hisimhv2", \
                       "cap", "cccs", "ccvs", "csw", "dio", "hfet", "hfet2", "ind", "isrc", "jfet", "ltra", "mes", "mesa" ,"mos1", "mos2", "mos3", \
-                      "mos6", "mos9", "res", "soi3", "sw", "tra", "urc", "vccs", "vcvs", "vsrc", "hicum0", "hicum2", "bjt504t", "ekv", "psp102", "bsim6", "bsimcmg"}
+                      "mos6", "mos9", "res", "soi3", "sw", "tra", "urc", "vccs", "vcvs", "vsrc", "hicum0", "hicum2", "bjt504t", "ekv", "psp102", "bsimbulk", "bsimcmg"}
 #else
 #define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v5", "bsim4v6", "bsim4v7", \
                       "bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv1", "hisimhv2", \
diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c
index efb2a0437..649e5f62d 100644
--- a/src/spicelib/parser/inp2m.c
+++ b/src/spicelib/parser/inp2m.c
@@ -32,7 +32,7 @@ model_numnodes(int type)
     }
 
 #ifdef ADMS
-    if (type == INPtypelook("BSIM6") ||     /* bsim6.va with __THERMAL_NODE__ */
+    if (type == INPtypelook("BSIMBULK") ||  /* bsimbulk.va */
         type == INPtypelook("BSIMCMG"))     /* bsimcmg.va */
     {
         return 5;
@@ -142,7 +142,7 @@ INP2M(CKTcircuit *ckt, INPtables *tab, struct card *current)
 #ifdef ADMS
         thismodel->INPmodType != INPtypelook("ekv") &&
         thismodel->INPmodType != INPtypelook("psp102") &&
-        thismodel->INPmodType != INPtypelook("bsim6") &&
+        thismodel->INPmodType != INPtypelook("bsimbulk") &&
         thismodel->INPmodType != INPtypelook("bsimcmg") &&
 #endif
         thismodel->INPmodType != INPtypelook("HiSIM2") &&
diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c
index c6e792556..8f4e3e680 100644
--- a/src/spicelib/parser/inpdomod.c
+++ b/src/spicelib/parser/inpdomod.c
@@ -344,11 +344,11 @@ char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab)
 #ifdef ADMS
 			case 16:
 			case 77:
-			    type = INPtypelook("BSIM6");
+			    type = INPtypelook("BSIMBULK");
 			    if (type < 0) {
 				    err =
 				    INPmkTemp
-				    ("Device type BSIM6 not available in this binary\n");}
+				    ("Device type BSIMBULK not available in this binary\n");}
 			    break;
 			case 17:
 			case 72: