diff --git a/src/experiments/weather-monitor/campaign.cc b/src/experiments/weather-monitor/campaign.cc
index a503cc3b..b4c5617d 100644
--- a/src/experiments/weather-monitor/campaign.cc
+++ b/src/experiments/weather-monitor/campaign.cc
@@ -19,8 +19,8 @@
 using namespace std;
 using namespace fail;
 
-char const * const trace_filename   = "trace.pb";
-char const * const results_filename = "weathermonitor.csv";
+char const * const trace_filename   = "trace.tc" WEATHER_SUFFIX;
+char const * const results_filename = "weathermonitor" WEATHER_SUFFIX ".csv";
 
 // equivalence class type: addr, [i1, i2]
 // addr: byte to inject a bit-flip into
diff --git a/src/experiments/weather-monitor/experiment.cc b/src/experiments/weather-monitor/experiment.cc
index d12170a4..4ba30c9e 100644
--- a/src/experiments/weather-monitor/experiment.cc
+++ b/src/experiments/weather-monitor/experiment.cc
@@ -34,7 +34,7 @@ using namespace fail;
 
 bool WeatherMonitorExperiment::run()
 {
-	char const *statename = "bochs.state";
+	char const *statename = "bochs.state" WEATHER_SUFFIX;
 	Logger log("Weathermonitor", false);
 	BPSingleEvent bp;
 	
@@ -75,7 +75,7 @@ bool WeatherMonitorExperiment::run()
 	//tp.setLogIPOnly(true);
 
 	// record trace
-	char const *tracefile = "trace.pb";
+	char const *tracefile = "trace.tc" WEATHER_SUFFIX;
 	ofstream of(tracefile);
 	tp.setTraceFile(&of);
 
diff --git a/src/experiments/weather-monitor/experimentInfo.hpp b/src/experiments/weather-monitor/experimentInfo.hpp
index 27f43253..5a55d461 100644
--- a/src/experiments/weather-monitor/experimentInfo.hpp
+++ b/src/experiments/weather-monitor/experimentInfo.hpp
@@ -8,6 +8,8 @@
 
 #if WEATHERMONITOR_VARIANT == 0 // without vptr guards
 
+// suffix for simulator state, trace file
+#define WEATHER_SUFFIX				".vanilla"
 // main() address:
 // nm -C vanilla.elf|fgrep main
 #define WEATHER_FUNC_MAIN			0x00100f70
@@ -44,6 +46,8 @@
 
 #elif WEATHERMONITOR_VARIANT == 1 // with guards
 
+// suffix for simulator state, trace file
+#define WEATHER_SUFFIX				".guarded"
 // main() address:
 // nm -C guarded.elf|fgrep main
 #define WEATHER_FUNC_MAIN			0x00100fc0
@@ -80,6 +84,8 @@
 
 #elif WEATHERMONITOR_VARIANT == 2 // with guards + plausibility check
 
+// suffix for simulator state, trace file
+#define WEATHER_SUFFIX				".plausibility"
 // main() address:
 // nm -C plausibility.elf|fgrep main
 #define WEATHER_FUNC_MAIN			0x00100fd0
diff --git a/src/experiments/weather-monitor/experimentInfo.hpp.sh b/src/experiments/weather-monitor/experimentInfo.hpp.sh
index 0d72628b..211dffae 100755
--- a/src/experiments/weather-monitor/experimentInfo.hpp.sh
+++ b/src/experiments/weather-monitor/experimentInfo.hpp.sh
@@ -21,6 +21,8 @@ EOF
 
 function alldefs() {
 cat <<EOF
+// suffix for simulator state, trace file
+#define WEATHER_SUFFIX				".`basename $1|sed s/\\\\..*$//`"
 // main() address:
 // nm -C $(basename $1)|fgrep main
 #define WEATHER_FUNC_MAIN			0x`addrof $1 main`