diff --git a/tests/Makefile.am b/tests/Makefile.am
index aaa56883c..38edb1fdb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,7 @@ endif
 SUBDIRS +=		\
 	bsim3		\
 	bsim4		\
-	bsim6		\
+	bsimbulk	\
 	bsimsoi		\
 	hisim		\
 	hisimhv1	\
@@ -24,7 +24,7 @@ DIST_SUBDIRS =		\
 	bsim3soifd	\
 	bsim3soipd	\
 	bsim4		\
-	bsim6		\
+	bsimbulk	\
 	bsimsoi		\
 	filters		\
 	general		\
diff --git a/tests/bsimbulk/Makefile.am b/tests/bsimbulk/Makefile.am
index bd3529768..df41e31a1 100644
--- a/tests/bsimbulk/Makefile.am
+++ b/tests/bsimbulk/Makefile.am
@@ -14,4 +14,4 @@ EXTRA_DIST = \
 MAINTAINERCLEANFILES = Makefile.in
 
 clean-local:
-	rm -rf nmos/results pmos/results ngspiceCkt bsim6.out
+	rm -rf nmos/results pmos/results ngspiceCkt bsimbulk.out
diff --git a/tests/bsimbulk/nmos/parameters/nmosParameters b/tests/bsimbulk/nmos/parameters/nmosParameters
index eec056bda..416312886 100644
--- a/tests/bsimbulk/nmos/parameters/nmosParameters
+++ b/tests/bsimbulk/nmos/parameters/nmosParameters
@@ -206,4 +206,4 @@
 + VSATLEXP=0.00033
 + SHMOD = 0
 + RTH0 = 10m
-+ MOBSCALE = 1			
++ MOBSCALE = 1
diff --git a/tests/bsimbulk/nmos/qaSpec b/tests/bsimbulk/nmos/qaSpec
index 1630562f3..cdfab7322 100644
--- a/tests/bsimbulk/nmos/qaSpec
+++ b/tests/bsimbulk/nmos/qaSpec
@@ -1,6 +1,6 @@
 
 //
-// Test specification for bsim6 (version 6.1.1_beta1)
+// Test specification for bsim6 (version 6.1.1_beta1), now bsimbulk
 //
 
 //
@@ -19,8 +19,8 @@ nTypeSelectionArguments nmos level=77 version=6.1.1
 pTypeSelectionArguments pmos level=77 version=6.1.1
 `endif
 `ifdef ngspice
-nTypeSelectionArguments nmos level=16
-pTypeSelectionArguments pmos level=16
+nTypeSelectionArguments nmos level=77
+pTypeSelectionArguments pmos level=77
 `endif
 
 //
@@ -29,7 +29,7 @@ pTypeSelectionArguments pmos level=16
 
 keyLetter                   m
 pins                        d g s b
-//verilogaFile                code/bsim6.1.1_beta1.va
+//verilogaFile                code/bsim6.1.1_beta1.va now bsimbulk.va
 //linearScale                 w l ps pd
 //areaScale                   as ad
 temperature                 27 -50 150
diff --git a/tests/bsimbulk/pmos/qaSpec b/tests/bsimbulk/pmos/qaSpec
index df88717f7..a8eb559c6 100644
--- a/tests/bsimbulk/pmos/qaSpec
+++ b/tests/bsimbulk/pmos/qaSpec
@@ -1,6 +1,6 @@
 
 //
-// test specification for bsim6 (version 6.1.1_beta1)
+// test specification for bsim6 (version 6.1.1_beta1) now bsimbulk
 //
 
 //
@@ -19,8 +19,8 @@ nTypeSelectionArguments nmos level=77 version=6.1.1
 pTypeSelectionArguments pmos level=77 version=6.1.1
 `endif
 `ifdef ngspice
-nTypeSelectionArguments nmos level=16
-pTypeSelectionArguments pmos level=16
+nTypeSelectionArguments nmos level=77
+pTypeSelectionArguments pmos level=77
 `endif
 
 //
@@ -29,7 +29,7 @@ pTypeSelectionArguments pmos level=16
 
 keyLetter                   m
 pins                        d g s b
-//verilogaFile               code/bsim6.1.1_beta1.va
+//verilogaFile               code/bsim6.1.1_beta1.va now bsimbulk
 //linearScale                 w l ps pd
 //areaScale                   as ad
 temperature                 27 -50 150