diff --git a/src/spicelib/devices/hicum2/Makefile.am b/src/spicelib/devices/hicum2/Makefile.am
index 26a9ff34c..9567f9530 100644
--- a/src/spicelib/devices/hicum2/Makefile.am
+++ b/src/spicelib/devices/hicum2/Makefile.am
@@ -1,28 +1,28 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LTLIBRARIES = libhicum.la
+noinst_LTLIBRARIES = libhicum2.la
 
-libhicum_la_SOURCES =	\
-	hicum.c		\
-	hicumacld.c	\
-	hicumask.c	\
-	hicumconv.c	\
-	hicumdefs.h	\
-	hicumext.h	\
-	hicumgetic.c	\
-	hicuminit.c	\
-	hicuminit.h	\
-	hicumitf.h	\
-	hicumload.c	\
-	hicummask.c	\
-	hicummpar.c	\
-	hicumnoise.c	\
-	hicumparam.c	\
-	hicumpzld.c	\
-	hicumsetup.c	\
-	hicumsoachk.c	\
-	hicumtemp.c	\
-	hicumtrunc.c
+libhicum2_la_SOURCES =	\
+	hicum2.c		\
+	hicum2acld.c	\
+	hicum2ask.c	\
+	hicum2conv.c	\
+	hicum2defs.h	\
+	hicum2ext.h	\
+	hicum2getic.c	\
+	hicum2init.c	\
+	hicum2init.h	\
+	hicum2itf.h	\
+	hicum2load.c	\
+	hicum2mask.c	\
+	hicum2mpar.c	\
+	hicum2noise.c	\
+	hicum2param.c	\
+	hicum2pzld.c	\
+	hicum2setup.c	\
+	hicum2soachk.c	\
+	hicum2temp.c	\
+	hicum2trunc.c
 
 
 
diff --git a/src/spicelib/devices/hicum2/hicum.c b/src/spicelib/devices/hicum2/hicum2.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicum.c
rename to src/spicelib/devices/hicum2/hicum2.c
diff --git a/src/spicelib/devices/hicum2/hicumacld.c b/src/spicelib/devices/hicum2/hicum2acld.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumacld.c
rename to src/spicelib/devices/hicum2/hicum2acld.c
diff --git a/src/spicelib/devices/hicum2/hicumask.c b/src/spicelib/devices/hicum2/hicum2ask.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumask.c
rename to src/spicelib/devices/hicum2/hicum2ask.c
diff --git a/src/spicelib/devices/hicum2/hicumconv.c b/src/spicelib/devices/hicum2/hicum2conv.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumconv.c
rename to src/spicelib/devices/hicum2/hicum2conv.c
diff --git a/src/spicelib/devices/hicum2/hicumdefs.h b/src/spicelib/devices/hicum2/hicum2defs.h
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumdefs.h
rename to src/spicelib/devices/hicum2/hicum2defs.h
diff --git a/src/spicelib/devices/hicum2/hicumext.h b/src/spicelib/devices/hicum2/hicum2ext.h
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumext.h
rename to src/spicelib/devices/hicum2/hicum2ext.h
diff --git a/src/spicelib/devices/hicum2/hicumgetic.c b/src/spicelib/devices/hicum2/hicum2getic.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumgetic.c
rename to src/spicelib/devices/hicum2/hicum2getic.c
diff --git a/src/spicelib/devices/hicum2/hicuminit.c b/src/spicelib/devices/hicum2/hicum2init.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicuminit.c
rename to src/spicelib/devices/hicum2/hicum2init.c
diff --git a/src/spicelib/devices/hicum2/hicuminit.h b/src/spicelib/devices/hicum2/hicum2init.h
similarity index 100%
rename from src/spicelib/devices/hicum2/hicuminit.h
rename to src/spicelib/devices/hicum2/hicum2init.h
diff --git a/src/spicelib/devices/hicum2/hicumitf.h b/src/spicelib/devices/hicum2/hicum2itf.h
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumitf.h
rename to src/spicelib/devices/hicum2/hicum2itf.h
diff --git a/src/spicelib/devices/hicum2/hicumload.c b/src/spicelib/devices/hicum2/hicum2load.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumload.c
rename to src/spicelib/devices/hicum2/hicum2load.c
diff --git a/src/spicelib/devices/hicum2/hicummask.c b/src/spicelib/devices/hicum2/hicum2mask.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicummask.c
rename to src/spicelib/devices/hicum2/hicum2mask.c
diff --git a/src/spicelib/devices/hicum2/hicummpar.c b/src/spicelib/devices/hicum2/hicum2mpar.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicummpar.c
rename to src/spicelib/devices/hicum2/hicum2mpar.c
diff --git a/src/spicelib/devices/hicum2/hicumnoise.c b/src/spicelib/devices/hicum2/hicum2noise.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumnoise.c
rename to src/spicelib/devices/hicum2/hicum2noise.c
diff --git a/src/spicelib/devices/hicum2/hicumparam.c b/src/spicelib/devices/hicum2/hicum2param.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumparam.c
rename to src/spicelib/devices/hicum2/hicum2param.c
diff --git a/src/spicelib/devices/hicum2/hicumpzld.c b/src/spicelib/devices/hicum2/hicum2pzld.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumpzld.c
rename to src/spicelib/devices/hicum2/hicum2pzld.c
diff --git a/src/spicelib/devices/hicum2/hicumsetup.c b/src/spicelib/devices/hicum2/hicum2setup.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumsetup.c
rename to src/spicelib/devices/hicum2/hicum2setup.c
diff --git a/src/spicelib/devices/hicum2/hicumsoachk.c b/src/spicelib/devices/hicum2/hicum2soachk.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumsoachk.c
rename to src/spicelib/devices/hicum2/hicum2soachk.c
diff --git a/src/spicelib/devices/hicum2/hicumtemp.c b/src/spicelib/devices/hicum2/hicum2temp.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumtemp.c
rename to src/spicelib/devices/hicum2/hicum2temp.c
diff --git a/src/spicelib/devices/hicum2/hicumtrunc.c b/src/spicelib/devices/hicum2/hicum2trunc.c
similarity index 100%
rename from src/spicelib/devices/hicum2/hicumtrunc.c
rename to src/spicelib/devices/hicum2/hicum2trunc.c