diff --git a/src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListenerListener.java b/src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListener.java
similarity index 59%
rename from src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListenerListener.java
rename to src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListener.java
index 2cdd03d5e79d13e3a0b7551df6abffd30f5f947e..941f46e390fea4d480e341143ba7e4ec7c1c42ee 100644
--- a/src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListenerListener.java
+++ b/src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListener.java
@@ -2,11 +2,11 @@ package teetime.framework.exceptionHandling;
 
 import teetime.framework.Stage;
 
-public class LoggingExceptionListenerListener extends AbstractExceptionListener {
+public class LoggingExceptionListener extends AbstractExceptionListener {
 
 	@Override
 	public FurtherExecution onStageException(final Exception e, final Stage throwingStage) {
-		logger.warn("Exception arised from" + throwingStage.getId(), e);
+		logger.warn("Exception occurred in " + throwingStage.getId(), e);
 		return FurtherExecution.CONTINUE;
 	}
 
diff --git a/src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListenerFactory.java b/src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListenerFactory.java
index 0e040225d1a1099c1a7b6412da0c5eefcbf9f1b8..a9f3bcc7d6b525ccfcded50a97b30e17f9bd4df1 100644
--- a/src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListenerFactory.java
+++ b/src/main/java/teetime/framework/exceptionHandling/LoggingExceptionListenerFactory.java
@@ -4,7 +4,7 @@ public class LoggingExceptionListenerFactory implements IExceptionListenerFactor
 
 	@Override
 	public AbstractExceptionListener create() {
-		return new LoggingExceptionListenerListener();
+		return new LoggingExceptionListener();
 	}
 
 }
diff --git a/src/main/java/teetime/framework/exceptionHandling/TerminatingExceptionListener.java b/src/main/java/teetime/framework/exceptionHandling/TerminatingExceptionListener.java
index 14a3f9d7d3dfd54d889b7cbf5d788e637c0f90d6..7149eebb76c4527d9bb7f4b2291f12f28754c7ee 100644
--- a/src/main/java/teetime/framework/exceptionHandling/TerminatingExceptionListener.java
+++ b/src/main/java/teetime/framework/exceptionHandling/TerminatingExceptionListener.java
@@ -6,7 +6,7 @@ public class TerminatingExceptionListener extends AbstractExceptionListener {
 
 	@Override
 	public FurtherExecution onStageException(final Exception e, final Stage throwingStage) {
-		logger.warn("Exception arised from" + throwingStage.getId(), e);
+		logger.warn("Exception occurred in " + throwingStage.getId(), e);
 		return FurtherExecution.TERMINATE;
 	}