diff --git a/CEP/Pipeline/mac/src/eventwrappers.h b/CEP/Pipeline/mac/src/GenericEventWrapper.h
similarity index 86%
rename from CEP/Pipeline/mac/src/eventwrappers.h
rename to CEP/Pipeline/mac/src/GenericEventWrapper.h
index d6d3cd8d518633c4935e58ee2e0edfed783088f2..285f7897156218f7d72504459fa5fb11a1270814 100644
--- a/CEP/Pipeline/mac/src/eventwrappers.h
+++ b/CEP/Pipeline/mac/src/GenericEventWrapper.h
@@ -1,8 +1,8 @@
-#ifndef EP_EVENTWRAPPERS_H
-#define EP_EVENTWRAPPERS_H
+#ifndef EP_GENERICEVENTWRAPPER_H
+#define EP_GENERICEVENTWRAPPER_H
 
 /*!
-	\file eventwrappers.h
+	\file GenericEventWrapper.h
 	\ingroup pipeline
 */
 
diff --git a/CEP/Pipeline/mac/src/controlwrappers.h b/CEP/Pipeline/mac/src/controlwrappers.h
index 1636fe74c7dfe2a5d136ed26790740c3f4e87377..655d58be5317053cff6f6e68ceda9f3ca4a4b131 100644
--- a/CEP/Pipeline/mac/src/controlwrappers.h
+++ b/CEP/Pipeline/mac/src/controlwrappers.h
@@ -7,7 +7,7 @@
 */
 
 // #include "Controller_Protocol.ph"
-#include "eventwrappers.h"
+#include "GenericEventWrapper.h"
 
 typedef LOFAR::TYPES::uint16 uint16;
 typedef LOFAR::TYPES::uint32 uint32;
diff --git a/CEP/Pipeline/mac/src/echowrappers.h b/CEP/Pipeline/mac/src/echowrappers.h
index 364be6fa4606a2cc3235af1a35b45e686e48c470..9230a648575189bd5c7fae8a978ba7998740f499 100644
--- a/CEP/Pipeline/mac/src/echowrappers.h
+++ b/CEP/Pipeline/mac/src/echowrappers.h
@@ -7,7 +7,7 @@
 */
 
 #include <MACIO/Echo_Protocol.ph>
-#include "eventwrappers.h"
+#include "GenericEventWrapper.h"
 
 /*!
 	\class EchoPingEventWrapper
diff --git a/CEP/Pipeline/mac/src/ep_interface.h b/CEP/Pipeline/mac/src/ep_interface.h
index 10a468688824405111e753c626cdb1a5167174d9..b6abacb959036a3d9181cb83d6722b1cf781ff4a 100644
--- a/CEP/Pipeline/mac/src/ep_interface.h
+++ b/CEP/Pipeline/mac/src/ep_interface.h
@@ -9,7 +9,7 @@
 #include <MACIO/EventPort.h>
 #include <string>
 
-#include "eventwrappers.h"
+#include "GenericEventWrapper.h"
 
 /*!
   \class EP_Interface