diff --git a/mission/devices/MGMHandlerLIS3MDL.cpp b/mission/devices/MGMHandlerLIS3MDL.cpp
index de27ddbe..099f0da4 100644
--- a/mission/devices/MGMHandlerLIS3MDL.cpp
+++ b/mission/devices/MGMHandlerLIS3MDL.cpp
@@ -98,7 +98,7 @@ ReturnValue_t MGMHandlerLIS3MDL::setupMGM() {
 	registers[3] = (1 << MGMLIS3MDL::OMZ1);
 	registers[4] = 0;
 
-	return prepareRegisterWrite();
+	return prepareCtrlRegisterWrite();
 
 }
 
@@ -120,7 +120,7 @@ ReturnValue_t MGMHandlerLIS3MDL::buildCommandFromCommand(
 
         rawPacket = commandBuffer;
         rawPacketLen = sizeof(commandBuffer);
-        return RETURN_OK;
+        return HasReturnvaluesIF::RETURN_OK;
 	case(MGMLIS3MDL::IDENTIFY_DEVICE): {
 	    return identifyDevice();
 	}
@@ -319,7 +319,7 @@ ReturnValue_t MGMHandlerLIS3MDL::setOperatingMode(const uint8_t *commandData,
 		break;
 	}
 
-	return prepareRegisterWrite();
+	return prepareCtrlRegisterWrite();
 }
 
 void MGMHandlerLIS3MDL::fillCommandAndReplyMap() {
@@ -340,7 +340,7 @@ void MGMHandlerLIS3MDL::fillCommandAndReplyMap() {
 	insertInCommandAndReplyMap(MGMLIS3MDL::ACCURACY_OP_MODE_SET, 1);
 }
 
-ReturnValue_t MGMHandlerLIS3MDL::prepareRegisterWrite() {
+ReturnValue_t MGMHandlerLIS3MDL::prepareCtrlRegisterWrite() {
 
 	commandBuffer[0] = writeCommand(MGMLIS3MDL::CTRL_REG1, true);
 
diff --git a/mission/devices/MGMHandlerLIS3MDL.h b/mission/devices/MGMHandlerLIS3MDL.h
index 99108303..eaac4381 100644
--- a/mission/devices/MGMHandlerLIS3MDL.h
+++ b/mission/devices/MGMHandlerLIS3MDL.h
@@ -135,7 +135,7 @@ private:
 	 * saved register
 	 *
 	 */
-	ReturnValue_t prepareRegisterWrite();
+	ReturnValue_t prepareCtrlRegisterWrite();
 
 	enum InternalState {
 		STATE_NONE, STATE_FIRST_CONTACT, STATE_SETUP, STATE_CHECK_REGISTERS