diff --git a/Makefile b/Makefile
index 6c5397d..0d7eecc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ DIRS := configure
 DIRS += src
 src_DEPEND_DIRS = configure
 
-EMBEDDED_TOPS := test
+EMBEDDED_TOPS := testTop
 EMBEDDED_TOPS += arrayPerformance
 EMBEDDED_TOPS += $(wildcard example*)
 
@@ -20,7 +20,7 @@ endef
 
 $(foreach dir, $(EMBEDDED_TOPS), $(eval $(call dir_DEP,$(dir))))
 
-exampleDatabase_DEPEND_DIRS += test
-examplePowerSupply_DEPEND_DIRS += test
+exampleDatabase_DEPEND_DIRS += testTop
+examplePowerSupply_DEPEND_DIRS += testTop
 
 include $(TOP)/configure/RULES_TOP
diff --git a/exampleDatabase/configure/RELEASE b/exampleDatabase/configure/RELEASE
index 96eed71..e9fe356 100644
--- a/exampleDatabase/configure/RELEASE
+++ b/exampleDatabase/configure/RELEASE
@@ -27,7 +27,7 @@
 # If this example is built in a directory under pvDatabaseCPP,
 # use the following definitions:
 
-PVDATABASETEST = $(TOP)/../test
+PVDATABASETEST = $(TOP)/../testTop
 PVDATABASE = $(TOP)/..
 
 -include $(TOP)/../configure/RELEASE.local
@@ -36,7 +36,7 @@ PVDATABASE = $(TOP)/..
 # If you copied this example from pvDatabaseCPP to be built as a
 # standalone TOP, adjust and use the following definitions:
 
-#PVDATABASETEST = /path/to/epics/pvDatabaseCPP/test
+#PVDATABASETEST = /path/to/epics/pvDatabaseCPP/testTop
 #PVDATABASE = /path/to/epics/pvDatabaseCPP
 
 #-include $(TOP)/../RELEASE.local
diff --git a/examplePowerSupply/configure/RELEASE b/examplePowerSupply/configure/RELEASE
index 96eed71..e9fe356 100644
--- a/examplePowerSupply/configure/RELEASE
+++ b/examplePowerSupply/configure/RELEASE
@@ -27,7 +27,7 @@
 # If this example is built in a directory under pvDatabaseCPP,
 # use the following definitions:
 
-PVDATABASETEST = $(TOP)/../test
+PVDATABASETEST = $(TOP)/../testTop
 PVDATABASE = $(TOP)/..
 
 -include $(TOP)/../configure/RELEASE.local
@@ -36,7 +36,7 @@ PVDATABASE = $(TOP)/..
 # If you copied this example from pvDatabaseCPP to be built as a
 # standalone TOP, adjust and use the following definitions:
 
-#PVDATABASETEST = /path/to/epics/pvDatabaseCPP/test
+#PVDATABASETEST = /path/to/epics/pvDatabaseCPP/testTop
 #PVDATABASE = /path/to/epics/pvDatabaseCPP
 
 #-include $(TOP)/../RELEASE.local
diff --git a/test/Makefile b/testTop/Makefile
similarity index 100%
rename from test/Makefile
rename to testTop/Makefile
diff --git a/test/configure/CONFIG b/testTop/configure/CONFIG
similarity index 100%
rename from test/configure/CONFIG
rename to testTop/configure/CONFIG
diff --git a/test/configure/CONFIG_SITE b/testTop/configure/CONFIG_SITE
similarity index 100%
rename from test/configure/CONFIG_SITE
rename to testTop/configure/CONFIG_SITE
diff --git a/test/configure/Makefile b/testTop/configure/Makefile
similarity index 100%
rename from test/configure/Makefile
rename to testTop/configure/Makefile
diff --git a/test/configure/RELEASE b/testTop/configure/RELEASE
similarity index 95%
rename from test/configure/RELEASE
rename to testTop/configure/RELEASE
index 7a7db11..9ee677d 100644
--- a/test/configure/RELEASE
+++ b/testTop/configure/RELEASE
@@ -1,4 +1,4 @@
-# pvDatabaseCPP/test RELEASE - Location of external support modules
+# pvDatabaseCPP/testTop RELEASE - Location of external support modules
 #
 # IF YOU CHANGE this file or any file it includes you must
 # subsequently do a "gnumake rebuild" in the application's
diff --git a/test/configure/RULES b/testTop/configure/RULES
similarity index 100%
rename from test/configure/RULES
rename to testTop/configure/RULES
diff --git a/test/configure/RULES.ioc b/testTop/configure/RULES.ioc
similarity index 100%
rename from test/configure/RULES.ioc
rename to testTop/configure/RULES.ioc
diff --git a/test/configure/RULES_DIRS b/testTop/configure/RULES_DIRS
similarity index 100%
rename from test/configure/RULES_DIRS
rename to testTop/configure/RULES_DIRS
diff --git a/test/configure/RULES_TOP b/testTop/configure/RULES_TOP
similarity index 100%
rename from test/configure/RULES_TOP
rename to testTop/configure/RULES_TOP
diff --git a/test/src/Makefile b/testTop/src/Makefile
similarity index 100%
rename from test/src/Makefile
rename to testTop/src/Makefile
diff --git a/test/src/powerSupply.cpp b/testTop/src/powerSupply.cpp
similarity index 100%
rename from test/src/powerSupply.cpp
rename to testTop/src/powerSupply.cpp
diff --git a/test/src/powerSupply.h b/testTop/src/powerSupply.h
similarity index 100%
rename from test/src/powerSupply.h
rename to testTop/src/powerSupply.h
diff --git a/test/src/powerSupplyRegister.cpp b/testTop/src/powerSupplyRegister.cpp
similarity index 100%
rename from test/src/powerSupplyRegister.cpp
rename to testTop/src/powerSupplyRegister.cpp
diff --git a/test/src/powerSupplyRegister.dbd b/testTop/src/powerSupplyRegister.dbd
similarity index 100%
rename from test/src/powerSupplyRegister.dbd
rename to testTop/src/powerSupplyRegister.dbd
diff --git a/test/src/testExampleRecord.cpp b/testTop/src/testExampleRecord.cpp
similarity index 100%
rename from test/src/testExampleRecord.cpp
rename to testTop/src/testExampleRecord.cpp
diff --git a/test/src/testPVCopy.cpp b/testTop/src/testPVCopy.cpp
similarity index 100%
rename from test/src/testPVCopy.cpp
rename to testTop/src/testPVCopy.cpp
diff --git a/test/src/testPVRecord.cpp b/testTop/src/testPVRecord.cpp
similarity index 100%
rename from test/src/testPVRecord.cpp
rename to testTop/src/testPVRecord.cpp