diff --git a/inc/Platform/ARM/MemoryAddressLimits_STM32F7.hpp b/inc/Platform/STM32F7/MemoryAddressLimits.hpp
similarity index 100%
rename from inc/Platform/ARM/MemoryAddressLimits_STM32F7.hpp
rename to inc/Platform/STM32F7/MemoryAddressLimits.hpp
diff --git a/inc/Services/MemoryManagementService.hpp b/inc/Services/MemoryManagementService.hpp
index 04b8201906647b92e06401d529258ceb398b823a..371239da0668ea625fd0a4104aac276bfac26860 100644
--- a/inc/Services/MemoryManagementService.hpp
+++ b/inc/Services/MemoryManagementService.hpp
@@ -6,7 +6,7 @@
 #include "Service.hpp"
 #include "Services/RequestVerificationService.hpp"
 #include "Helpers/CRCHelper.hpp"
-#include "Platform/ARM/MemoryAddressLimits_STM32F7.hpp"
+#include "Platform/STM32F7/MemoryAddressLimits.hpp"
 
 
 class MemoryManagementService : public Service {
diff --git a/test/Message.cpp b/test/Message.cpp
index d31c2be299db33b3f079344c54b913fc8c537beb..dce148d340fff2b12dc09fabebc86608d3200493 100644
--- a/test/Message.cpp
+++ b/test/Message.cpp
@@ -134,7 +134,7 @@ TEST_CASE("Requirement 7.3.5 (Signed integer)", "[message][ecss]") {
 
 	SECTION("7.4.3") {
 		// Make sure the endianness of the message data is correct
-		// As per the ECSS standard, stored data should be big-endian. However, ARM and ARM
+		// As per the ECSS standard, stored data should be big-endian. However, ARM and x86
 		// processors store data in little endian format. As a result, special care needs to be
 		// taken for compliance.
 		CHECK(message.data[1] == 0xe4);