diff --git a/inc/Services/MemoryManagementService.hpp b/inc/Services/MemoryManagementService.hpp
index 1834880026bc001d7c12f47224fc8168dfe40a36..1c208342843cffea3c0c294e338a5df302977aea 100644
--- a/inc/Services/MemoryManagementService.hpp
+++ b/inc/Services/MemoryManagementService.hpp
@@ -29,7 +29,7 @@ public:
 		RAM_D2,
 		RAM_D3,
 		ITCMRAM,
-		FLASH,
+		FLASH_MEMORY,
 		EXTERNAL,
 	};
 
diff --git a/src/Services/MemoryManagementService.cpp b/src/Services/MemoryManagementService.cpp
index ce0d5f9e679b969314929acb923d76056f018e57..fc3e1b19be2be7f12ec4ae0ed264bf0e570df9f4 100644
--- a/src/Services/MemoryManagementService.cpp
+++ b/src/Services/MemoryManagementService.cpp
@@ -32,7 +32,7 @@ void MemoryManagementService::loadRawData(Message& request) {
 	uint8_t readData[ECSSMaxStringSize];
 	uint16_t iterationCount = request.readUint16();
 
-	if (memoryID == MemoryManagementService::MemoryID::FLASH) {
+	if (memoryID == MemoryManagementService::MemoryID::FLASH_MEMORY) {
 		// TODO: Define FLASH specific access code when we transfer to embedded
 	} else {
 		for (std::size_t j = 0; j < iterationCount; j++) {
@@ -171,7 +171,7 @@ bool MemoryManagementService::addressValidator(MemoryManagementService::MemoryID
 				validIndicator = true;
 			}
 			break;
-		case MemoryManagementService::MemoryID::FLASH:
+		case MemoryManagementService::MemoryID::FLASH_MEMORY:
 			if ((address >= FlashLowerLim) && (address <= FlashUpperLim)) {
 				validIndicator = true;
 			}
@@ -191,7 +191,7 @@ inline bool MemoryManagementService::memoryIdValidator(MemoryManagementService::
 	       (memId == MemoryManagementService::MemoryID::RAM_D3) ||
 	       (memId == MemoryManagementService::MemoryID::DTCMRAM) ||
 	       (memId == MemoryManagementService::MemoryID::ITCMRAM) ||
-	       (memId == MemoryManagementService::MemoryID::FLASH) ||
+	       (memId == MemoryManagementService::MemoryID::FLASH_MEMORY) ||
 	       (memId == MemoryManagementService::MemoryID::EXTERNAL);
 }