diff --git a/datapool/StaticDataSetBase.cpp b/datapool/DataSetBase.cpp
similarity index 98%
rename from datapool/StaticDataSetBase.cpp
rename to datapool/DataSetBase.cpp
index 3815534e1..b788d05da 100644
--- a/datapool/StaticDataSetBase.cpp
+++ b/datapool/DataSetBase.cpp
@@ -1,4 +1,4 @@
-#include <framework/datapool/StaticDataSetBase.h>
+#include <framework/datapool/DataSetBase.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
 DataSetBase::DataSetBase() {
diff --git a/datapool/StaticDataSetBase.h b/datapool/DataSetBase.h
similarity index 97%
rename from datapool/StaticDataSetBase.h
rename to datapool/DataSetBase.h
index 708849ced..8f7d892a9 100644
--- a/datapool/StaticDataSetBase.h
+++ b/datapool/DataSetBase.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
-#define FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
+#ifndef FRAMEWORK_DATAPOOL_DATASETBASE_H_
+#define FRAMEWORK_DATAPOOL_DATASETBASE_H_
 #include <framework/datapool/DataSetIF.h>
 #include <framework/datapool/PoolVariableIF.h>
 #include <framework/ipc/MutexIF.h>
@@ -146,4 +146,4 @@ private:
 	ReturnValue_t handleUnreadDatasetCommit(uint32_t lockTimeout);
 };
 
-#endif /* FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_ */
+#endif /* FRAMEWORK_DATAPOOL_DATASETBASE_H_ */
diff --git a/datapoolglob/GlobalDataSet.h b/datapoolglob/GlobalDataSet.h
index dec66dbc1..f0bf7daa8 100644
--- a/datapoolglob/GlobalDataSet.h
+++ b/datapoolglob/GlobalDataSet.h
@@ -1,7 +1,7 @@
 #ifndef DATASET_H_
 #define DATASET_H_
 
-#include <framework/datapool/StaticDataSetBase.h>
+#include <framework/datapool/DataSetBase.h>
 
 /**
  * @brief	The DataSet class manages a set of locally checked out variables
diff --git a/datapoollocal/LocalDataSet.h b/datapoollocal/LocalDataSet.h
index 52a227e5a..aea699d85 100644
--- a/datapoollocal/LocalDataSet.h
+++ b/datapoollocal/LocalDataSet.h
@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
 #define FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
+#include <framework/datapool/DataSetBase.h>
 #include <framework/datapool/DataSetIF.h>
-#include <framework/datapool/StaticDataSetBase.h>
 #include <framework/datapoollocal/OwnsLocalDataPoolIF.h>
 #include <framework/serialize/SerializeIF.h>