diff --git a/src/as/Makefile b/src/as/Makefile
index a2cb72749..856629c44 100644
--- a/src/as/Makefile
+++ b/src/as/Makefile
@@ -6,7 +6,7 @@ asLibrary_SRCS += asDbLib.c
 asLibrary_SRCS += asCa.c
 
 LIBRARY_HOST = As
-LIBRARY_IOC = asLibrary
+LIBRARY_IOC = as
 DLL_LIBS  = Db Com
 
 #	All systems link the libs As, Com, Db (and again Com ??),
diff --git a/src/bpt/Makefile b/src/bpt/Makefile
index 236e2b24d..ba1dc2d82 100644
--- a/src/bpt/Makefile
+++ b/src/bpt/Makefile
@@ -8,9 +8,9 @@ PROD += makeBpt
 
 MENUS += menuConvert.h
 
-bptLibrary_SRCS += cvtBpt.c
+bpt_SRCS += cvtBpt.c
 
-LIBRARY_IOC = bptLibrary
+LIBRARY_IOC = bpt
 DLL_LIBS = Db Com
 
 BPTS += bptTypeJdegC.dbd
diff --git a/src/db/Makefile b/src/db/Makefile
index 78839787b..5aa9c9b69 100644
--- a/src/db/Makefile
+++ b/src/db/Makefile
@@ -56,7 +56,7 @@ SRCS += initHooks.c
 SRCS += dbcar.c 
 
 
-LIBRARY = dbLib
+LIBRARY = db
 DLL_LIBS = Db Com
 
 include $(TOP)/configure/RULES
diff --git a/src/misc/Makefile b/src/misc/Makefile
index e3b41e4ad..dcffa0345 100644
--- a/src/misc/Makefile
+++ b/src/misc/Makefile
@@ -2,7 +2,7 @@
 TOP=../..
 include $(TOP)/configure/CONFIG
 
-LIBRARY = miscLib
+LIBRARY = misc
 
 miscLib_SRCS =  epicsRelease.c
 
diff --git a/src/registry/Makefile b/src/registry/Makefile
index 8e18e5161..b897248b3 100644
--- a/src/registry/Makefile
+++ b/src/registry/Makefile
@@ -15,12 +15,12 @@ INC += registry.h
 
 SCRIPTS += registerRecordDeviceDriver.pl
 
-registryLibrary_SRCS += registry.c
-registryLibrary_SRCS += registryRecordType.c
-registryLibrary_SRCS += registryDeviceSupport.c
-registryLibrary_SRCS += registryDriverSupport.c
+registry_SRCS += registry.c
+registry_SRCS += registryRecordType.c
+registry_SRCS += registryDeviceSupport.c
+registry_SRCS += registryDriverSupport.c
 
-LIBRARY = registryLibrary
+LIBRARY = registry
 
 OBJS = registerRecordDeviceDriver
 
diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile
index aaf18e97c..697572ec1 100644
--- a/src/rsrv/Makefile
+++ b/src/rsrv/Makefile
@@ -5,10 +5,10 @@ include $(TOP)/configure/CONFIG
 USR_INCLUDES = -I../../ca
 USR_CFLAGS += -UUNIX -DiocCore
 
-rsrvLib_SRCS = \
+rsrv_SRCS = \
 	caserverio.c caservertask.c camsgtask.c camessage.c \
 	rsrv_init.c cast_server.c online_notify.c globalsource.c 
 
-LIBRARY = rsrvLib
+LIBRARY = rsrv
 
 include $(TOP)/configure/RULES
diff --git a/src/vxWorks/Makefile b/src/vxWorks/Makefile
index ed687b4ed..ed6c06c24 100644
--- a/src/vxWorks/Makefile
+++ b/src/vxWorks/Makefile
@@ -9,10 +9,11 @@ include $(TOP)/configure/CONFIG
 DIRS += include 
 DIRS += libvxWorks
 DIRS += db
+DIRS += rec
 DIRS += drv
 DIRS += dev
 DIRS += devOpt
-DIRS += sequencer
+#DIRS += sequencer
 DIRS += iocCore
 
 include $(TOP)/configure/RULES_DIRS
diff --git a/src/vxWorks/db/Makefile b/src/vxWorks/db/Makefile
index 6ade2044e..2d7a78bd9 100644
--- a/src/vxWorks/db/Makefile
+++ b/src/vxWorks/db/Makefile
@@ -6,12 +6,12 @@ INC += drvTS.h
 INC += devLib.h
 INC += tsDefs.h
 
-vxDbLib_SRCS += drvTS.c
-vxDbLib_SRCS += devLib.c
-vxDbLib_SRCS += devLibVxWorks.c
-vxDbLib_SRCS += tsSubr.c
+vxDb_SRCS += drvTS.c
+vxDb_SRCS += devLib.c
+vxDb_SRCS += devLibVxWorks.c
+vxDb_SRCS += tsSubr.c
 
-LIBRARY_vxWorks = vxDbLib
+LIBRARY_vxWorks = vxDb
 
 include $(TOP)/configure/RULES
 
diff --git a/src/vxWorks/iocCore/Makefile b/src/vxWorks/iocCore/Makefile
index 852f80ab4..82dfe09f5 100644
--- a/src/vxWorks/iocCore/Makefile
+++ b/src/vxWorks/iocCore/Makefile
@@ -5,17 +5,18 @@ include $(TOP)/configure/CONFIG
 LIBRARY_vxWorks = iocCore
 
 LIBOBJS = \
+	$(INSTALL_BIN)/ComLibrary \
 	$(INSTALL_BIN)/asLibrary \
-	$(INSTALL_BIN)/caLib \
-	$(INSTALL_BIN)/dbLib \
-	$(INSTALL_BIN)/libCom \
-	$(INSTALL_BIN)/dbStaticLib \
-	$(INSTALL_BIN)/miscLib \
 	$(INSTALL_BIN)/bptLibrary \
+	$(INSTALL_BIN)/dbLibrary \
+	$(INSTALL_BIN)/dbStaticLibrary \
+	$(INSTALL_BIN)/dbSubsLibrary \
+	$(INSTALL_BIN)/caLibrary \
+	$(INSTALL_BIN)/miscLibrary \
 	$(INSTALL_BIN)/registryLibrary \
-	$(INSTALL_BIN)/rsrvLib \
-	$(INSTALL_BIN)/vxComLib \
-	$(INSTALL_BIN)/vxDbLib
+	$(INSTALL_BIN)/rsrvLibrary \
+	$(INSTALL_BIN)/vxComLibrary \
+	$(INSTALL_BIN)/vxDbLibrary
 
 include $(TOP)/configure/RULES
 
diff --git a/src/vxWorks/libvxWorks/Makefile b/src/vxWorks/libvxWorks/Makefile
index b688dc0a5..4b257ca9b 100644
--- a/src/vxWorks/libvxWorks/Makefile
+++ b/src/vxWorks/libvxWorks/Makefile
@@ -4,9 +4,9 @@ include $(TOP)/configure/CONFIG
 
 INC += epicsDynLink.h
 
-vxComLib_SRCS += veclist.c
-vxComLib_SRCS += epicsDynLink.c
+vxCom_SRCS += veclist.c
+vxCom_SRCS += epicsDynLink.c
 
-LIBRARY_vxWorks += vxComLib
+LIBRARY_vxWorks += vxCom
 
 include $(TOP)/configure/RULES