diff --git a/configure.ac b/configure.ac
index 1adec3c69..cad1def15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1021,10 +1021,10 @@ AC_CONFIG_FILES([Makefile
src/spicelib/devices/bsim4v4/Makefile
src/spicelib/devices/bsim4v5/Makefile
src/spicelib/devices/bsim4v6/Makefile
- src/spicelib/devices/bsim3soi/Makefile
src/spicelib/devices/bsim3soi_pd/Makefile
src/spicelib/devices/bsim3soi_fd/Makefile
src/spicelib/devices/bsim3soi_dd/Makefile
+ src/spicelib/devices/bsimsoi/Makefile
src/spicelib/devices/cap/Makefile
src/spicelib/devices/cccs/Makefile
src/spicelib/devices/ccvs/Makefile
@@ -1103,11 +1103,11 @@ AC_CONFIG_FILES([Makefile
tests/bsim3/ac_sim/Makefile
tests/bsim3/dc_sim/Makefile
tests/bsim3/tran_sim/Makefile
- tests/bsim3soi/Makefile
tests/bsim3soidd/Makefile
tests/bsim3soifd/Makefile
tests/bsim3soipd/Makefile
tests/bsim4/Makefile
+ tests/bsimsoi/Makefile
tests/filters/Makefile
tests/general/Makefile
tests/hfet/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index e56a55cec..1e7a0faaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,10 +50,10 @@ DYNAMIC_DEVICELIBS = \
spicelib/devices/bsim4v5/libbsim4v5.la \
spicelib/devices/bsim4v6/libbsim4v6.la \
spicelib/devices/cap/libcap.la \
- spicelib/devices/bsim3soi/libbsim4soi.la \
spicelib/devices/bsim3soi_pd/libbsim3soipd.la \
spicelib/devices/bsim3soi_fd/libbsim3soifd.la \
spicelib/devices/bsim3soi_dd/libbsim3soidd.la \
+ spicelib/devices/bsimsoi/libbsim4soi.la \
spicelib/devices/cccs/libcccs.la \
spicelib/devices/ccvs/libccvs.la \
spicelib/devices/cpl/libcpl.la \
diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am
index 4a36fc49f..6d889bdc6 100644
--- a/src/spicelib/devices/Makefile.am
+++ b/src/spicelib/devices/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = \
bsim1 \
bsim2 \
bsim3 \
- bsim3soi \
+ bsimsoi \
bsim4 \
bsim4v4 \
bsim4v5 \
@@ -66,7 +66,7 @@ DIST_SUBDIRS = \
bsim1 \
bsim2 \
bsim3 \
- bsim3soi \
+ bsimsoi \
bsim4 \
bsim4v4 \
bsim4v5 \
diff --git a/src/spicelib/devices/bsim3soi/.cvsignore b/src/spicelib/devices/bsimsoi/.cvsignore
similarity index 100%
rename from src/spicelib/devices/bsim3soi/.cvsignore
rename to src/spicelib/devices/bsimsoi/.cvsignore
diff --git a/src/spicelib/devices/bsim3soi/BsimTerms_use b/src/spicelib/devices/bsimsoi/BsimTerms_use
similarity index 100%
rename from src/spicelib/devices/bsim3soi/BsimTerms_use
rename to src/spicelib/devices/bsimsoi/BsimTerms_use
diff --git a/src/spicelib/devices/bsim3soi/Makefile.am b/src/spicelib/devices/bsimsoi/Makefile.am
similarity index 100%
rename from src/spicelib/devices/bsim3soi/Makefile.am
rename to src/spicelib/devices/bsimsoi/Makefile.am
diff --git a/src/spicelib/devices/bsim3soi/b4soi.c b/src/spicelib/devices/bsimsoi/b4soi.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soi.c
rename to src/spicelib/devices/bsimsoi/b4soi.c
diff --git a/src/spicelib/devices/bsim3soi/b4soiacld.c b/src/spicelib/devices/bsimsoi/b4soiacld.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soiacld.c
rename to src/spicelib/devices/bsimsoi/b4soiacld.c
diff --git a/src/spicelib/devices/bsim3soi/b4soiask.c b/src/spicelib/devices/bsimsoi/b4soiask.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soiask.c
rename to src/spicelib/devices/bsimsoi/b4soiask.c
diff --git a/src/spicelib/devices/bsim3soi/b4soicheck.c b/src/spicelib/devices/bsimsoi/b4soicheck.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soicheck.c
rename to src/spicelib/devices/bsimsoi/b4soicheck.c
diff --git a/src/spicelib/devices/bsim3soi/b4soicvtest.c b/src/spicelib/devices/bsimsoi/b4soicvtest.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soicvtest.c
rename to src/spicelib/devices/bsimsoi/b4soicvtest.c
diff --git a/src/spicelib/devices/bsim3soi/b4soidef.h b/src/spicelib/devices/bsimsoi/b4soidef.h
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soidef.h
rename to src/spicelib/devices/bsimsoi/b4soidef.h
diff --git a/src/spicelib/devices/bsim3soi/b4soidel.c b/src/spicelib/devices/bsimsoi/b4soidel.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soidel.c
rename to src/spicelib/devices/bsimsoi/b4soidel.c
diff --git a/src/spicelib/devices/bsim3soi/b4soidest.c b/src/spicelib/devices/bsimsoi/b4soidest.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soidest.c
rename to src/spicelib/devices/bsimsoi/b4soidest.c
diff --git a/src/spicelib/devices/bsim3soi/b4soiext.h b/src/spicelib/devices/bsimsoi/b4soiext.h
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soiext.h
rename to src/spicelib/devices/bsimsoi/b4soiext.h
diff --git a/src/spicelib/devices/bsim3soi/b4soigetic.c b/src/spicelib/devices/bsimsoi/b4soigetic.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soigetic.c
rename to src/spicelib/devices/bsimsoi/b4soigetic.c
diff --git a/src/spicelib/devices/bsim3soi/b4soiinit.c b/src/spicelib/devices/bsimsoi/b4soiinit.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soiinit.c
rename to src/spicelib/devices/bsimsoi/b4soiinit.c
diff --git a/src/spicelib/devices/bsim3soi/b4soiinit.h b/src/spicelib/devices/bsimsoi/b4soiinit.h
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soiinit.h
rename to src/spicelib/devices/bsimsoi/b4soiinit.h
diff --git a/src/spicelib/devices/bsim3soi/b4soiitf.h b/src/spicelib/devices/bsimsoi/b4soiitf.h
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soiitf.h
rename to src/spicelib/devices/bsimsoi/b4soiitf.h
diff --git a/src/spicelib/devices/bsim3soi/b4soild.c b/src/spicelib/devices/bsimsoi/b4soild.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soild.c
rename to src/spicelib/devices/bsimsoi/b4soild.c
diff --git a/src/spicelib/devices/bsim3soi/b4soimask.c b/src/spicelib/devices/bsimsoi/b4soimask.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soimask.c
rename to src/spicelib/devices/bsimsoi/b4soimask.c
diff --git a/src/spicelib/devices/bsim3soi/b4soimdel.c b/src/spicelib/devices/bsimsoi/b4soimdel.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soimdel.c
rename to src/spicelib/devices/bsimsoi/b4soimdel.c
diff --git a/src/spicelib/devices/bsim3soi/b4soimpar.c b/src/spicelib/devices/bsimsoi/b4soimpar.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soimpar.c
rename to src/spicelib/devices/bsimsoi/b4soimpar.c
diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsimsoi/b4soinoi.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soinoi.c
rename to src/spicelib/devices/bsimsoi/b4soinoi.c
diff --git a/src/spicelib/devices/bsim3soi/b4soipar.c b/src/spicelib/devices/bsimsoi/b4soipar.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soipar.c
rename to src/spicelib/devices/bsimsoi/b4soipar.c
diff --git a/src/spicelib/devices/bsim3soi/b4soipzld.c b/src/spicelib/devices/bsimsoi/b4soipzld.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soipzld.c
rename to src/spicelib/devices/bsimsoi/b4soipzld.c
diff --git a/src/spicelib/devices/bsim3soi/b4soiset.c b/src/spicelib/devices/bsimsoi/b4soiset.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soiset.c
rename to src/spicelib/devices/bsimsoi/b4soiset.c
diff --git a/src/spicelib/devices/bsim3soi/b4soitemp.c b/src/spicelib/devices/bsimsoi/b4soitemp.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soitemp.c
rename to src/spicelib/devices/bsimsoi/b4soitemp.c
diff --git a/src/spicelib/devices/bsim3soi/b4soitrunc.c b/src/spicelib/devices/bsimsoi/b4soitrunc.c
similarity index 100%
rename from src/spicelib/devices/bsim3soi/b4soitrunc.c
rename to src/spicelib/devices/bsimsoi/b4soitrunc.c
diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c
index 8037c6fef..033799c56 100644
--- a/src/spicelib/devices/dev.c
+++ b/src/spicelib/devices/dev.c
@@ -85,10 +85,10 @@ int add_udn(int,Evt_Udn_Info_t **);
#include "bsim4v4/bsim4v4itf.h"
#include "bsim4v5/bsim4v5itf.h"
#include "bsim4v6/bsim4v6itf.h"
-#include "bsim3soi/b4soiitf.h"
#include "bsim3soi_pd/b3soipditf.h"
#include "bsim3soi_fd/b3soifditf.h"
#include "bsim3soi_dd/b3soidditf.h"
+#include "bsimsoi/b4soiitf.h"
#include "cap/capitf.h"
#include "cccs/cccsitf.h"
#include "ccvs/ccvsitf.h"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f696b3c21..f05e2ca2c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,15 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = bsim3 \
- bsim3soi \
- bsim4 \
- hisim \
+SUBDIRS = bsim3 \
+ bsim4 \
+ bsimsoi \
+ hisim \
hisimhv
-DIST_SUBDIRS = bsim3 \
- bsim3soi \
- bsim4 \
+DIST_SUBDIRS = bsim3 \
+ bsim4 \
+ bsimsoi \
hisim \
hisimhv
diff --git a/tests/bsim3soi/.cvsignore b/tests/bsimsoi/.cvsignore
similarity index 100%
rename from tests/bsim3soi/.cvsignore
rename to tests/bsimsoi/.cvsignore
diff --git a/tests/bsim3soi/Makefile.am b/tests/bsimsoi/Makefile.am
similarity index 100%
rename from tests/bsim3soi/Makefile.am
rename to tests/bsimsoi/Makefile.am
diff --git a/tests/bsim3soi/nmos/parameters/nmosParameters b/tests/bsimsoi/nmos/parameters/nmosParameters
similarity index 100%
rename from tests/bsim3soi/nmos/parameters/nmosParameters
rename to tests/bsimsoi/nmos/parameters/nmosParameters
diff --git a/tests/bsim3soi/nmos/qaSpec b/tests/bsimsoi/nmos/qaSpec
similarity index 100%
rename from tests/bsim3soi/nmos/qaSpec
rename to tests/bsimsoi/nmos/qaSpec
diff --git a/tests/bsim3soi/nmos/reference/acFreq01.standard b/tests/bsimsoi/nmos/reference/acFreq01.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/acFreq01.standard
rename to tests/bsimsoi/nmos/reference/acFreq01.standard
diff --git a/tests/bsim3soi/nmos/reference/acFreq02.standard b/tests/bsimsoi/nmos/reference/acFreq02.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/acFreq02.standard
rename to tests/bsimsoi/nmos/reference/acFreq02.standard
diff --git a/tests/bsim3soi/nmos/reference/acVd01.standard b/tests/bsimsoi/nmos/reference/acVd01.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/acVd01.standard
rename to tests/bsimsoi/nmos/reference/acVd01.standard
diff --git a/tests/bsim3soi/nmos/reference/acVd02.standard b/tests/bsimsoi/nmos/reference/acVd02.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/acVd02.standard
rename to tests/bsimsoi/nmos/reference/acVd02.standard
diff --git a/tests/bsim3soi/nmos/reference/dcSweep01.standard b/tests/bsimsoi/nmos/reference/dcSweep01.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/dcSweep01.standard
rename to tests/bsimsoi/nmos/reference/dcSweep01.standard
diff --git a/tests/bsim3soi/nmos/reference/dcSweep02.standard b/tests/bsimsoi/nmos/reference/dcSweep02.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/dcSweep02.standard
rename to tests/bsimsoi/nmos/reference/dcSweep02.standard
diff --git a/tests/bsim3soi/nmos/reference/dcSweep03.standard b/tests/bsimsoi/nmos/reference/dcSweep03.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/dcSweep03.standard
rename to tests/bsimsoi/nmos/reference/dcSweep03.standard
diff --git a/tests/bsim3soi/nmos/reference/noise01.standard b/tests/bsimsoi/nmos/reference/noise01.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/noise01.standard
rename to tests/bsimsoi/nmos/reference/noise01.standard
diff --git a/tests/bsim3soi/nmos/reference/noise02.standard b/tests/bsimsoi/nmos/reference/noise02.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/noise02.standard
rename to tests/bsimsoi/nmos/reference/noise02.standard
diff --git a/tests/bsim3soi/nmos/reference/noise03.standard b/tests/bsimsoi/nmos/reference/noise03.standard
similarity index 100%
rename from tests/bsim3soi/nmos/reference/noise03.standard
rename to tests/bsimsoi/nmos/reference/noise03.standard
diff --git a/tests/bsim3soi/pmos/parameters/pmosParameters b/tests/bsimsoi/pmos/parameters/pmosParameters
similarity index 100%
rename from tests/bsim3soi/pmos/parameters/pmosParameters
rename to tests/bsimsoi/pmos/parameters/pmosParameters
diff --git a/tests/bsim3soi/pmos/qaSpec b/tests/bsimsoi/pmos/qaSpec
similarity index 100%
rename from tests/bsim3soi/pmos/qaSpec
rename to tests/bsimsoi/pmos/qaSpec
diff --git a/tests/bsim3soi/pmos/reference/acFreq01.standard b/tests/bsimsoi/pmos/reference/acFreq01.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/acFreq01.standard
rename to tests/bsimsoi/pmos/reference/acFreq01.standard
diff --git a/tests/bsim3soi/pmos/reference/acFreq02.standard b/tests/bsimsoi/pmos/reference/acFreq02.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/acFreq02.standard
rename to tests/bsimsoi/pmos/reference/acFreq02.standard
diff --git a/tests/bsim3soi/pmos/reference/acVd01.standard b/tests/bsimsoi/pmos/reference/acVd01.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/acVd01.standard
rename to tests/bsimsoi/pmos/reference/acVd01.standard
diff --git a/tests/bsim3soi/pmos/reference/acVd02.standard b/tests/bsimsoi/pmos/reference/acVd02.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/acVd02.standard
rename to tests/bsimsoi/pmos/reference/acVd02.standard
diff --git a/tests/bsim3soi/pmos/reference/dcSweep01.standard b/tests/bsimsoi/pmos/reference/dcSweep01.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/dcSweep01.standard
rename to tests/bsimsoi/pmos/reference/dcSweep01.standard
diff --git a/tests/bsim3soi/pmos/reference/dcSweep02.standard b/tests/bsimsoi/pmos/reference/dcSweep02.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/dcSweep02.standard
rename to tests/bsimsoi/pmos/reference/dcSweep02.standard
diff --git a/tests/bsim3soi/pmos/reference/dcSweep03.standard b/tests/bsimsoi/pmos/reference/dcSweep03.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/dcSweep03.standard
rename to tests/bsimsoi/pmos/reference/dcSweep03.standard
diff --git a/tests/bsim3soi/pmos/reference/noise01.standard b/tests/bsimsoi/pmos/reference/noise01.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/noise01.standard
rename to tests/bsimsoi/pmos/reference/noise01.standard
diff --git a/tests/bsim3soi/pmos/reference/noise02.standard b/tests/bsimsoi/pmos/reference/noise02.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/noise02.standard
rename to tests/bsimsoi/pmos/reference/noise02.standard
diff --git a/tests/bsim3soi/pmos/reference/noise03.standard b/tests/bsimsoi/pmos/reference/noise03.standard
similarity index 100%
rename from tests/bsim3soi/pmos/reference/noise03.standard
rename to tests/bsimsoi/pmos/reference/noise03.standard
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index 30a240a95..8f13eda6c 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -1245,19 +1245,19 @@
>