diff --git a/configure.ac b/configure.ac
index f480b46ad..f0c83767e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1036,7 +1036,7 @@ AC_CONFIG_FILES([Makefile
                  src/spicelib/devices/hfet1/Makefile
                  src/spicelib/devices/hfet2/Makefile
                  src/spicelib/devices/hisim2/Makefile
-                 src/spicelib/devices/hisimhv/Makefile
+                 src/spicelib/devices/hisimhv1/Makefile
                  src/spicelib/devices/jfet/Makefile
                  src/spicelib/devices/jfet2/Makefile
                  src/spicelib/devices/ltra/Makefile
@@ -1112,7 +1112,7 @@ AC_CONFIG_FILES([Makefile
                  tests/general/Makefile
                  tests/hfet/Makefile
                  tests/hisim/Makefile
-                 tests/hisimhv/Makefile
+                 tests/hisimhv1/Makefile
                  tests/jfet/Makefile
                  tests/mes/Makefile
                  tests/mesa/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e7a0faaf..f55281c67 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,7 @@ DYNAMIC_DEVICELIBS =					\
 	spicelib/devices/hfet1/libhfet.la		\
 	spicelib/devices/hfet2/libhfet2.la		\
 	spicelib/devices/hisim2/libhisim2.la		\
-	spicelib/devices/hisimhv/libhisimhv.la		\
+	spicelib/devices/hisimhv1/libhisimhv1.la	\
 	spicelib/devices/jfet/libjfet.la		\
 	spicelib/devices/jfet2/libjfet2.la		\
 	spicelib/devices/ltra/libltra.la		\
diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am
index 6d889bdc6..9885998a1 100644
--- a/src/spicelib/devices/Makefile.am
+++ b/src/spicelib/devices/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS = \
 	hfet1	\
 	hfet2	\
 	hisim2	\
-	hisimhv	\
+	hisimhv1	\
 	jfet	\
 	jfet2	\
 	ltra	\
@@ -88,7 +88,7 @@ DIST_SUBDIRS = \
 	hfet1	\
 	hfet2	\
 	hisim2	\
-	hisimhv	\
+	hisimhv1	\
 	jfet	\
 	jfet2	\
 	ltra	\
diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c
index 033799c56..60dd437cf 100644
--- a/src/spicelib/devices/dev.c
+++ b/src/spicelib/devices/dev.c
@@ -97,7 +97,7 @@ int add_udn(int,Evt_Udn_Info_t **);
 #include "hfet1/hfetitf.h"
 #include "hfet2/hfet2itf.h"
 #include "hisim2/hsm2itf.h"
-#include "hisimhv/hsmhvitf.h"
+#include "hisimhv1/hsmhvitf.h"
 #include "ind/inditf.h"
 #include "isrc/isrcitf.h"
 #include "jfet/jfetitf.h"
@@ -302,12 +302,12 @@ SPICEdev ** devices(void)
 
 #ifdef ADMS
 #define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v4", "bsim4v5", "bsim4v6", \
-                      "bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv", \
+                      "bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv1", \
                       "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"}
 #else
 #define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v4", "bsim4v5", "bsim4v6", \
-                      "bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv", \
+                      "bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv1", \
                       "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"}
 #endif
diff --git a/src/spicelib/devices/hisimhv1/Makefile.am b/src/spicelib/devices/hisimhv1/Makefile.am
index a270cfef2..ea6d9e6fe 100644
--- a/src/spicelib/devices/hisimhv1/Makefile.am
+++ b/src/spicelib/devices/hisimhv1/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LTLIBRARIES = libhisimhv.la
+noinst_LTLIBRARIES = libhisimhv1.la
 
-libhisimhv_la_SOURCES = hisimhv.h	\
+libhisimhv1_la_SOURCES = hisimhv.h	\
 			hsmhv.c		\
 			hsmhvacld.c	\
 			hsmhvask.c 	\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d90a6c40e..543ccaf05 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =		\
 	bsim4		\
 	bsimsoi		\
 	hisim		\
-	hisimhv
+	hisimhv1
 
 if XSPICE_WANTED
 SUBDIRS += xspice
@@ -25,7 +25,7 @@ DIST_SUBDIRS =		\
 	general		\
 	hfet		\
 	hisim		\
-	hisimhv		\
+	hisimhv1	\
 	jfet		\
 	mes		\
 	mesa		\
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index 8f13eda6c..edd92c317 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
@@ -2053,7 +2053,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hisimhv.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hisimhv.h"
 				>
 			</File>
 			<File
@@ -2085,35 +2085,35 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvdef.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvdef.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhveval_qover.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhveval_qover.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvevalenv.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvevalenv.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvext.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvext.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvinit.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvinit.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvitf.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvitf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvld_info_eval.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvld_info_eval.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvtemp_eval.h"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvtemp_eval.h"
 				>
 			</File>
 			<File
@@ -5877,79 +5877,79 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhv.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhv.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvacld.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvacld.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvask.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvask.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvcvtest.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvcvtest.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvdel.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvdel.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvdest.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvdest.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhveval.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhveval.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvgetic.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvgetic.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvinit.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvinit.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvld.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvld.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvmask.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvmask.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvmdel.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvmdel.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvmpar.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvmpar.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvnoi.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvnoi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvpar.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvpar.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvpzld.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvpzld.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvset.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvset.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvtemp.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvtemp.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\devices\hisimhv\hsmhvtrunc.c"
+				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvtrunc.c"
 				>
 			</File>
 			<File