diff --git a/src/main/java/teetime/framework/RunnableConsumerStage.java b/src/main/java/teetime/framework/RunnableConsumerStage.java
index 7964914242c4fcc6fac05c6958dc97b76dcd7439..ae4b2dda68a0e053a2065957d06513066292ed85 100644
--- a/src/main/java/teetime/framework/RunnableConsumerStage.java
+++ b/src/main/java/teetime/framework/RunnableConsumerStage.java
@@ -40,19 +40,14 @@ final class RunnableConsumerStage extends AbstractRunnableStage {
 		this.inputPorts = stage.getInputPorts(); // FIXME should getInputPorts() really be defined in Stage?
 	}
 
+	@SuppressWarnings("PMD.GuardLogStatement")
 	@Override
 	protected void beforeStageExecution(final Stage stage) throws InterruptedException {
-		logger.trace("ENTRY beforeStageExecution");
-
 		logger.trace("Waiting for start signals..." + inputPorts);
 		for (InputPort<?> inputPort : inputPorts) {
 			inputPort.waitForStartSignal();
 		}
 		logger.trace("Starting..." + stage);
-
-		// stage.onSignal(signal, inputPort);
-
-		logger.trace("EXIT beforeStageExecution");
 	}
 
 	@Override
diff --git a/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java b/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
index d65e58f59c433bd527fe18a637dc50b0fc9c6f3b..ac34f1b42d9b141eda700c4219ceb06f8b81eea7 100644
--- a/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
+++ b/src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java
@@ -28,7 +28,7 @@ public class ChwWorkComparisonMethodcallWithPorts extends AbstractProfiledPerfor
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {
-		return "ChwWork";
+		return HostName.CHW_WORK.toString();
 	}
 
 	@Override
diff --git a/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
index 6c7a37bb07ea43b72abfce361e74eedf3398b964..d7762b8c40ea5beaa6d925b5935c009e6833d443 100644
--- a/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java
@@ -16,15 +16,16 @@
 package teetime.examples.experiment01;
 
 import static org.junit.Assert.assertEquals;
+import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.PerformanceTest;
 import util.test.AbstractProfiledPerformanceAssertion;
+import util.test.PerformanceTest;
 
 class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {
-		return "ChwWork";
+		return HostName.CHW_WORK.toString();
 	}
 
 	@Override
diff --git a/src/performancetest/java/teetime/examples/experiment09pipeimpls/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment09pipeimpls/ChwWorkPerformanceCheck.java
index 384049059db2a2bb7a45ca4929a7e30e8c3f9da0..cc670a79a849d0b9b8ce76be1dcef445da89c1ca 100644
--- a/src/performancetest/java/teetime/examples/experiment09pipeimpls/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment09pipeimpls/ChwWorkPerformanceCheck.java
@@ -16,12 +16,13 @@
 package teetime.examples.experiment09pipeimpls;
 
 import static org.junit.Assert.assertEquals;
+import teetime.examples.HostName;
 
 class ChwWorkPerformanceCheck extends AbstractPerformanceCheck {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {
-		return "ChwWork";
+		return HostName.CHW_WORK.toString();
 	}
 
 	@Override
diff --git a/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
index f20539b6e24a0e36dad90d6d7a9cd07425fad3e9..ea4c302b269369302e0fe415e80db707ddf5602a 100644
--- a/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java
@@ -16,15 +16,16 @@
 package teetime.examples.experiment11;
 
 import static org.junit.Assert.assertEquals;
+import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.PerformanceTest;
 import util.test.AbstractProfiledPerformanceAssertion;
+import util.test.PerformanceTest;
 
 class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
 	@Override
 	public String getCorrespondingPerformanceProfile() {
-		return "ChwWork";
+		return HostName.CHW_WORK.toString();
 	}
 
 	@Override
diff --git a/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java b/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
index c9c07e70add55ee979112f01846f5991eda82b7a..210b13f6ffa9a3978da77dbf5d49124351c71272 100644
--- a/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
+++ b/src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java
@@ -16,12 +16,18 @@
 package teetime.examples.experiment16;
 
 import static org.junit.Assert.assertEquals;
+import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
 import util.test.AbstractProfiledPerformanceAssertion;
 import util.test.PerformanceTest;
 
 class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
+	@Override
+	public String getCorrespondingPerformanceProfile() {
+		return HostName.CHW_WORK.toString();
+	}
+
 	@Override
 	public void check() {
 		PerformanceResult test16a = PerformanceTest.measurementRepository.performanceResults
@@ -43,8 +49,4 @@ class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 		assertEquals(2.0, speedupC, 0.3);
 	}
 
-	@Override
-	public String getCorrespondingPerformanceProfile() {
-		return "ChwWork";
-	}
 }