diff --git a/datapool/DataSetBase.cpp b/datapool/StaticDataSetBase.cpp
similarity index 98%
rename from datapool/DataSetBase.cpp
rename to datapool/StaticDataSetBase.cpp
index b788d05da..3815534e1 100644
--- a/datapool/DataSetBase.cpp
+++ b/datapool/StaticDataSetBase.cpp
@@ -1,4 +1,4 @@
-#include <framework/datapool/DataSetBase.h>
+#include <framework/datapool/StaticDataSetBase.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
 DataSetBase::DataSetBase() {
diff --git a/datapool/DataSetBase.h b/datapool/StaticDataSetBase.h
similarity index 97%
rename from datapool/DataSetBase.h
rename to datapool/StaticDataSetBase.h
index 8f7d892a9..708849ced 100644
--- a/datapool/DataSetBase.h
+++ b/datapool/StaticDataSetBase.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_DATAPOOL_DATASETBASE_H_
-#define FRAMEWORK_DATAPOOL_DATASETBASE_H_
+#ifndef FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_
+#define FRAMEWORK_DATAPOOL_STATICDATASETBASE_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_DATASETBASE_H_ */
+#endif /* FRAMEWORK_DATAPOOL_STATICDATASETBASE_H_ */
diff --git a/datapoolglob/GlobalDataSet.h b/datapoolglob/GlobalDataSet.h
index f0bf7daa8..dec66dbc1 100644
--- a/datapoolglob/GlobalDataSet.h
+++ b/datapoolglob/GlobalDataSet.h
@@ -1,7 +1,7 @@
 #ifndef DATASET_H_
 #define DATASET_H_
 
-#include <framework/datapool/DataSetBase.h>
+#include <framework/datapool/StaticDataSetBase.h>
 
 /**
  * @brief	The DataSet class manages a set of locally checked out variables
diff --git a/datapoollocal/LocalDataSet.h b/datapoollocal/LocalDataSet.h
index aea699d85..52a227e5a 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>
 
diff --git a/returnvalues/HasReturnvaluesIF.h b/returnvalues/HasReturnvaluesIF.h
index 04acd66e9..d231f4ee9 100644
--- a/returnvalues/HasReturnvaluesIF.h
+++ b/returnvalues/HasReturnvaluesIF.h
@@ -12,8 +12,7 @@ typedef uint16_t ReturnValue_t;
 class HasReturnvaluesIF {
 public:
 	static const ReturnValue_t RETURN_OK = 0;
-	//! This will be the all-ones value irrespective of used unsigned datatype.
-	static const ReturnValue_t RETURN_FAILED = -1;
+	static const ReturnValue_t RETURN_FAILED = 1;
 	virtual ~HasReturnvaluesIF() {}
 
 	static ReturnValue_t makeReturnCode(uint8_t interfaceId, uint8_t number) {
@@ -21,4 +20,4 @@ public:
 	}
 };
 
-#endif /* HASRETURNVALUESIF_H_ */
+#endif /* FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_ */