diff --git a/memory/MemoryHelper.cpp b/memory/MemoryHelper.cpp
index 7c8f7610..b07f450c 100644
--- a/memory/MemoryHelper.cpp
+++ b/memory/MemoryHelper.cpp
@@ -2,7 +2,7 @@
 #include <framework/memory/MemoryHelper.h>
 #include <framework/memory/MemoryMessage.h>
 #include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/serialize/EndianSwapper.h>
+#include <framework/serialize/EndianConverter.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
 MemoryHelper::MemoryHelper(HasMemoryIF* workOnThis,
diff --git a/serialize/EndianSwapper.h b/serialize/EndianConverter.h
similarity index 100%
rename from serialize/EndianSwapper.h
rename to serialize/EndianConverter.h
diff --git a/serialize/SerializeAdapter.h b/serialize/SerializeAdapter.h
index 2be39d5c..bb364eae 100644
--- a/serialize/SerializeAdapter.h
+++ b/serialize/SerializeAdapter.h
@@ -2,8 +2,7 @@
 #define SERIALIZEADAPTER_H_
 
 #include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/serialize/EndianSwapper.h>
-#include <framework/container/IsDerivedFrom.h>
+#include <framework/serialize/EndianConverter.h>
 #include <framework/serialize/SerializeIF.h>
 #include <type_traits>