diff --git a/cmds/st.cmd b/cmds/st.cmd
index 9f3ce2a8e025155acef7f337347885a22eb9e371..1217c0c948836b3d5dc6ab5bca5ff2fc2958e1a1 100644
--- a/cmds/st.cmd
+++ b/cmds/st.cmd
@@ -1,4 +1,4 @@
 # This should be a test startup script
 
 
-iocshLoad("/home/jimlarsson/rheotest/iocsh/rheotest.iocsh")
+iocshLoad("/home/jimlarsson/modules/rheometerMCR702e/iocsh/rheometer.iocsh")
diff --git a/iocsh/rheotest.iocsh b/iocsh/rheometer.iocsh
similarity index 83%
rename from iocsh/rheotest.iocsh
rename to iocsh/rheometer.iocsh
index 899f5541e98f8411f4275527a817c9b58ec8255d..451fe63bce950abe549abec011c16890c26128f4 100644
--- a/iocsh/rheotest.iocsh
+++ b/iocsh/rheometer.iocsh
@@ -2,7 +2,7 @@
 #
 #   iocshLoad("$(rheotest_DIR)/rheotest.iocsh")
 require rheotest,0.2
-epicsEnvSet("STREAM_PROTOCOL_PATH", "$(rheotest_DIR)/db")
+epicsEnvSet("STREAM_PROTOCOL_PATH", "$(rheometermrc702e_DIR)/db")
 #drvAsynIPPortConfigure("rheo", "127.0.0.1:5555")
 
 drvAsynIPPortConfigure("rheo", "172.30.32.60:1025")
diff --git a/rheotest.Makefile b/rheometer.Makefile
similarity index 98%
rename from rheotest.Makefile
rename to rheometer.Makefile
index dc85b57cf6d1c5b7aeebba45e6a0be0ae9ec7524..a62ec625d5b890f6b01ead627d4bb30d722a1f7d 100644
--- a/rheotest.Makefile
+++ b/rheometer.Makefile
@@ -47,7 +47,7 @@ REQUIRED += stream
 #
 ############################################################################
 
-APP:=rheotestApp
+APP:=rheometerApp
 APPDB:=$(APP)/Db
 APPSRC:=$(APP)/src
 APPCMDS:=$(APP)/cmds
@@ -72,7 +72,7 @@ TEMPLATES += $(wildcard $(APPDB)/*.proto)
 #
 ############################################################################
 
-SOURCES   += $(APPSRC)/rheotestMain.cpp
+SOURCES   += $(APPSRC)/rheometerMain.cpp
 
 
 ############################################################################
diff --git a/rheotestApp/Db/rheo_comm.db b/rheometerApp/Db/rheo_comm.db
similarity index 100%
rename from rheotestApp/Db/rheo_comm.db
rename to rheometerApp/Db/rheo_comm.db
diff --git a/rheotestApp/Db/rheo_comm.proto b/rheometerApp/Db/rheo_comm.proto
similarity index 100%
rename from rheotestApp/Db/rheo_comm.proto
rename to rheometerApp/Db/rheo_comm.proto
diff --git a/rheotestApp/src/rheotestMain.cpp b/rheometerApp/src/rheotestMain.cpp
similarity index 100%
rename from rheotestApp/src/rheotestMain.cpp
rename to rheometerApp/src/rheotestMain.cpp
diff --git a/rheotestApp/Db/.rheo_comm.db.swp b/rheotestApp/Db/.rheo_comm.db.swp
deleted file mode 100644
index 701432f58c375804f6ec7c7c332d176f5104532e..0000000000000000000000000000000000000000
Binary files a/rheotestApp/Db/.rheo_comm.db.swp and /dev/null differ