diff --git a/pus/servicepackets/Service1Packets.h b/pus/servicepackets/Service1Packets.h
index 8c5cb005..dbd31028 100644
--- a/pus/servicepackets/Service1Packets.h
+++ b/pus/servicepackets/Service1Packets.h
@@ -1,9 +1,3 @@
-#ifndef MISSION_PUS_SERVICEPACKETS_SERVICE1PACKETS_H_
-#define MISSION_PUS_SERVICEPACKETS_SERVICE1PACKETS_H_
-
-#include "../../serialize/SerializeAdapter.h"
-#include "../../tmtcservices/VerificationCodes.h"
-
 /**
  * @defgroup spacepackets PUS Packet Definitions
  *  This group contains all implemented TM or TM packages that are sent to
@@ -11,12 +5,18 @@
  *  packet structures in Mission Information Base (MIB).
  */
 
+#ifndef MISSION_PUS_SERVICEPACKETS_SERVICE1PACKETS_H_
+#define MISSION_PUS_SERVICEPACKETS_SERVICE1PACKETS_H_
+
+#include "../../serialize/SerializeAdapter.h"
+#include "../../tmtcservices/VerificationCodes.h"
+
 /**
  * @brief 	FailureReport class to serialize a failure report
  * @brief 	Subservice 1, 3, 5, 7
  * @ingroup spacepackets
  */
-class FailureReport: public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 2, 4, 6, 8
+class FailureReport: public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 3, 5, 7
 public:
 	FailureReport(uint8_t failureSubtype_, uint16_t packetId_,
 			uint16_t packetSequenceControl_, uint8_t stepNumber_,
@@ -111,7 +111,7 @@ private:
  * @brief       Subservices 2, 4, 6, 8
  * @ingroup     spacepackets
  */
-class SuccessReport: public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 3, 5, 7
+class SuccessReport: public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 2, 4, 6, 8
 public:
 	SuccessReport(uint8_t subtype_, uint16_t packetId_,
 			uint16_t packetSequenceControl_,uint8_t stepNumber_) :