diff --git a/core/experiments/checksum-oostubs/CMakeLists.txt b/core/experiments/checksum-oostubs/CMakeLists.txt
index 328a3bd6..0e8df5f5 100644
--- a/core/experiments/checksum-oostubs/CMakeLists.txt
+++ b/core/experiments/checksum-oostubs/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(EXPERIMENT_NAME checksum-oostubs)
-set(EXPERIMENT_TYPE CoolChecksumExperiment) # FIXME naming conflict
+set(EXPERIMENT_TYPE ChecksumOOStuBSExperiment)
 configure_file(../instantiate-experiment.ah.in
                ${CMAKE_CURRENT_BINARY_DIR}/instantiate-${EXPERIMENT_NAME}.ah @ONLY
 )
diff --git a/core/experiments/checksum-oostubs/campaign.cc b/core/experiments/checksum-oostubs/campaign.cc
index 180e4c05..ae1ea43e 100644
--- a/core/experiments/checksum-oostubs/campaign.cc
+++ b/core/experiments/checksum-oostubs/campaign.cc
@@ -65,9 +65,9 @@ const unsigned memoryMap[49][2] = {
 
 
 
-bool CoolChecksumCampaign::run()
+bool ChecksumOOStuBSCampaign::run()
 {
-	Logger log("CoolChecksumCampaign");
+	Logger log("ChecksumOOStuBS Campaign");
 
 	ifstream test(results_csv);
 	if (test.is_open()) {
diff --git a/core/experiments/checksum-oostubs/campaign.hpp b/core/experiments/checksum-oostubs/campaign.hpp
index 315466f2..39473072 100644
--- a/core/experiments/checksum-oostubs/campaign.hpp
+++ b/core/experiments/checksum-oostubs/campaign.hpp
@@ -1,18 +1,17 @@
-#ifndef __COOLCAMPAIGN_HPP__
-#define __COOLCAMPAIGN_HPP__
+#ifndef __CHECKSUM_OOSTUBS_CAMPAIGN_HPP__
+#define __CHECKSUM_OOSTUBS_CAMPAIGN_HPP__
 
 #include "controller/Campaign.hpp"
 #include "controller/ExperimentData.hpp"
 #include "checksum-oostubs.pb.h"
 
-class CoolChecksumExperimentData : public fi::ExperimentData {
+class ChecksumOOStuBSExperimentData : public fi::ExperimentData {
 public:
 	OOStuBSProtoMsg msg;
-	CoolChecksumExperimentData() : fi::ExperimentData(&msg) {}
+	ChecksumOOStuBSExperimentData() : fi::ExperimentData(&msg) {}
 };
 
-
-class CoolChecksumCampaign : public fi::Campaign {
+class ChecksumOOStuBSCampaign : public fi::Campaign {
 public:
 	virtual bool run();
 };
diff --git a/core/experiments/checksum-oostubs/experiment.cc b/core/experiments/checksum-oostubs/experiment.cc
index d4608f46..9394bce0 100644
--- a/core/experiments/checksum-oostubs/experiment.cc
+++ b/core/experiments/checksum-oostubs/experiment.cc
@@ -15,12 +15,11 @@
 // you need to have the tracing plugin enabled for this
 #include "plugins/tracing/TracingPlugin.hpp"
 
-#include "checksum-oostubs.pb.h"
 #include "ecc_region.hpp"
 
 using std::endl;
 
-bool CoolChecksumExperiment::run()
+bool ChecksumOOStuBSExperiment::run()
 {
 	char const *statename = "checksum-oostubs.state";
 	Logger log("Checksum-OOStuBS", false);
@@ -113,7 +112,7 @@ bool CoolChecksumExperiment::run()
 
 	// get an experiment parameter set
 	log << "asking job server for experiment parameters" << endl;
-	CoolChecksumExperimentData param;
+	ChecksumOOStuBSExperimentData param;
 /*
 	if (!m_jc.getParam(param)) {
 		log << "Dying." << endl;
diff --git a/core/experiments/checksum-oostubs/experiment.hpp b/core/experiments/checksum-oostubs/experiment.hpp
index 2ae6052e..9dea2527 100644
--- a/core/experiments/checksum-oostubs/experiment.hpp
+++ b/core/experiments/checksum-oostubs/experiment.hpp
@@ -1,13 +1,13 @@
-#ifndef __COOLEXPERIMENT_HPP__
-#define __COOLEXPERIMENT_HPP__
+#ifndef __CHECKSUM_OOSTUBS_EXPERIMENT_HPP__
+#define __CHECKSUM_OOSTUBS_EXPERIMENT_HPP__
   
 #include "controller/ExperimentFlow.hpp"
 #include "jobserver/JobClient.hpp"
 
-class CoolChecksumExperiment : public fi::ExperimentFlow {
+class ChecksumOOStuBSExperiment : public fi::ExperimentFlow {
 	fi::JobClient m_jc;
 public:
-	CoolChecksumExperiment() : m_jc("ios.cs.tu-dortmund.de") {}
+	ChecksumOOStuBSExperiment() : m_jc("ios.cs.tu-dortmund.de") {}
 	bool run();
 };
 
diff --git a/core/experiments/checksum-oostubs/main.cc b/core/experiments/checksum-oostubs/main.cc
index 2270895f..813071a5 100644
--- a/core/experiments/checksum-oostubs/main.cc
+++ b/core/experiments/checksum-oostubs/main.cc
@@ -6,7 +6,7 @@
 
 int main(int argc, char **argv)
 {
-	CoolChecksumCampaign c;
+	ChecksumOOStuBSCampaign c;
 	if (fi::campaignmanager.runCampaign(&c)) {
 		return 0;
 	} else {