diff --git a/defaultcfg/version.h b/FSFWVersion.h
similarity index 100%
rename from defaultcfg/version.h
rename to FSFWVersion.h
diff --git a/defaultcfg/FSFWConfig.h b/defaultcfg/FSFWConfig.h
deleted file mode 100644
index 2001f306..00000000
--- a/defaultcfg/FSFWConfig.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef CONFIG_FSFWCONFIG_H_
-#define CONFIG_FSFWCONFIG_H_
-
-#include "version.h"
-
-//! Used to determine whether C++ ostreams are used
-//! Those can lead to code bloat.
-#define FSFW_CPP_OSTREAM_ENABLED 	1
-
-//! Reduced printout to further decrese code size
-//! Be careful, this also turns off most diagnostic prinouts!
-#define FSFW_REDUCED_PRINTOUT		0
-
-//! Can be used to enable debugging printouts for developing the FSFW
-#define FSFW_DEBUGGING              0
-
-//! Defines the FIFO depth of each commanding service base which
-//! also determines how many commands a CSB service can handle in one cycle
-//! simulataneously. This will increase the required RAM for
-//! each CSB service !
-#define FSFW_CSB_FIFO_DEPTH			6
-
-//! If -DDEBUG is supplied in the build defines, there will be
-//! additional output which requires the translation files translateObjects
-//! and translateEvents (and their compiles source files)
-#ifdef DEBUG
-#define FSFW_DEBUG_OUTPUT 			1
-//! Specify whether info events are printed too.
-#define FSFW_DEBUG_INFO				1
-#include <translateObjects.h>
-#include <translateEvents.h>
-#else
-#define FSFW_DEBUG_OUTPUT			0
-#endif
-
-//! When using the newlib nano library, C99 support for stdio facilities
-//! will not be provided. This define should be set to 1 if this is the case.
-#define FSFW_NO_C99_IO 	1
-
-
-#endif /* CONFIG_FSFWCONFIG_H_ */
diff --git a/defaultcfg/config/version.h b/defaultcfg/config/OBSWVersion.h
similarity index 100%
rename from defaultcfg/config/version.h
rename to defaultcfg/config/OBSWVersion.h