diff --git a/test/streaming/clmcDashboard.json b/test/streaming/dashboard.json
similarity index 100%
rename from test/streaming/clmcDashboard.json
rename to test/streaming/dashboard.json
diff --git a/test/streaming/clmcSource.json b/test/streaming/influx.json
similarity index 100%
rename from test/streaming/clmcSource.json
rename to test/streaming/influx.json
diff --git a/test/streaming/clmcKapacitor.json b/test/streaming/kapacitor.json
similarity index 100%
rename from test/streaming/clmcKapacitor.json
rename to test/streaming/kapacitor.json
diff --git a/test/streaming/manual.md b/test/streaming/manual.md
index a231356848fa32ce92683c63831c28b98971fc91..4d3d8be792f7b8fb32b04b427847cbb7e3203681 100644
--- a/test/streaming/manual.md
+++ b/test/streaming/manual.md
@@ -37,9 +37,11 @@ The following command brings up the services
 ## Automatic set-up of the CLMC dashboard demonstrator
 To automatically set up a demonstrator CLMC dashboard and Kapacitor, run the following:
 
+### TO-DO: RE-FACTOR AUTOMATION FOR CONFIGURING KAPACITOR (kapacitor.conf)
+
 ```
 cd ./test/streaming/
-./config-dashboard.sh
+./setup.sh
 ```
 
 And then point your browser to:
diff --git a/test/streaming/clmcDemoRule.json b/test/streaming/rules.json
similarity index 100%
rename from test/streaming/clmcDemoRule.json
rename to test/streaming/rules.json
diff --git a/test/streaming/config-dashboard.sh b/test/streaming/setup.sh
similarity index 80%
rename from test/streaming/config-dashboard.sh
rename to test/streaming/setup.sh
index d817a65c535e7f7f6f7bb4d948526c7471caa636..35017f75de6d1b59a3d731a57b168e54e0dccc46 100644
--- a/test/streaming/config-dashboard.sh
+++ b/test/streaming/setup.sh
@@ -24,14 +24,14 @@
 #//
 #/////////////////////////////////////////////////////////////////////////
 
-# Set up CLMC data source
-curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/sources -d @./clmcSource.json
+# Set up Influx data source
+curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/sources -d @./influx.json
 
-# Set up CLMC Kapacitor
-curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/sources/1/kapacitors -d @./clmcKapacitor.json
+# Set up Kapacitor
+curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/sources/1/kapacitors -d @./kapacitor.json
 
-# Set up CLMC demo rule
-curl -i -X POST -H "Content-Type: application/json" http://localhost:9092/kapacitor/v1/tasks -d @./clmcDemoRule.json
+# Set up rules
+curl -i -X POST -H "Content-Type: application/json" http://localhost:9092/kapacitor/v1/tasks -d @./rules.json
 
-# Set up CLMC Dashboard
-curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/dashboards -d @./clmcDashboard.json
\ No newline at end of file
+# Set up dashboard
+curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/dashboards -d @./dashboard.json
\ No newline at end of file