diff --git a/src/fsfw/tmtcpacket/ccsds/PacketId.h b/src/fsfw/tmtcpacket/ccsds/PacketId.h
index 2c77652c2..518b2d415 100644
--- a/src/fsfw/tmtcpacket/ccsds/PacketId.h
+++ b/src/fsfw/tmtcpacket/ccsds/PacketId.h
@@ -79,6 +79,9 @@ struct PacketId : public SerializeIF {
   ccsds::PacketType packetType = ccsds::PacketType::TM;
   bool secHeaderFlag = false;
   uint16_t apid = 0;
+
+  using SerializeIF::deSerialize;
+  using SerializeIF::serialize;
 };
 
 #endif  // FSFW_TMTCPACKET_PACKETID_H
diff --git a/src/fsfw/tmtcpacket/ccsds/PacketSeqCtrl.h b/src/fsfw/tmtcpacket/ccsds/PacketSeqCtrl.h
index cd4e153ee..a1e734608 100644
--- a/src/fsfw/tmtcpacket/ccsds/PacketSeqCtrl.h
+++ b/src/fsfw/tmtcpacket/ccsds/PacketSeqCtrl.h
@@ -55,6 +55,9 @@ struct PacketSeqCtrl : public SerializeIF {
 
   ccsds::SequenceFlags seqFlags = ccsds::SequenceFlags::CONTINUATION;
   uint16_t seqCount = 0;
+
+  using SerializeIF::deSerialize;
+  using SerializeIF::serialize;
 };
 
 #endif  // FSFW_TMTCPACKET_PACKETSEQCTRL_H
diff --git a/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp b/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp
index b40724ba0..f51b9b2b4 100644
--- a/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp
+++ b/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.cpp
@@ -104,13 +104,6 @@ ReturnValue_t PusTcCreator::setSerializableUserData(SerializeIF &serializable) {
   return HasReturnvaluesIF::RETURN_OK;
 }
 
-ReturnValue_t PusTcCreator::serialize(uint8_t **buffer, size_t *size, size_t maxSize) const {
-  return serialize(buffer, size, maxSize, SerializeIF::Endianness::NETWORK);
-}
-
-ReturnValue_t PusTcCreator::serialize(uint8_t *buffer, size_t &serLen, size_t maxSize) const {
-  return SerializeIF::serialize(buffer, serLen, maxSize, SerializeIF::Endianness::NETWORK);
-}
 void PusTcCreator::setup() {
   spCreator.setPacketType(ccsds::PacketType::TC);
   spCreator.setSecHeaderFlag();
diff --git a/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h b/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h
index ea6c1d581..72691c40d 100644
--- a/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h
+++ b/src/fsfw/tmtcpacket/pus/tc/PusTcCreator.h
@@ -40,8 +40,6 @@ class PusTcCreator : public PusTcIF, public SerializeIF, public CustomUserDataIF
   PusTcParams &getPusParams();
   SpacePacketParams &getSpParams();
 
-  ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize) const override;
-  ReturnValue_t serialize(uint8_t *buffer, size_t &serLen, size_t maxSize) const override;
   [[nodiscard]] size_t getSerializedSize() const override;
 
   [[nodiscard]] uint16_t getPacketIdRaw() const override;
@@ -55,7 +53,11 @@ class PusTcCreator : public PusTcIF, public SerializeIF, public CustomUserDataIF
   ReturnValue_t setRawUserData(const uint8_t *data, size_t len) override;
   ReturnValue_t setSerializableUserData(SerializeIF &serializable) override;
 
+  // Load all big endian helpers into the class namespace
+  using SerializeIF::serializeBe;
+
  private:
+  // Forbidden to use, enforce big endian serialization
   ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize,
                           Endianness streamEndianness) const override;
   // Forbidden to use
diff --git a/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp b/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp
index eefcbec7f..b766ae1dc 100644
--- a/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp
+++ b/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.cpp
@@ -150,11 +150,3 @@ void PusTmCreator::setSubservice(uint8_t subservice) {
   pusParams.secHeader.subservice = subservice;
 }
 bool PusTmCreator::crcCalculationEnabled() const { return calculateCrcOnSerialization; }
-
-ReturnValue_t PusTmCreator::serialize(uint8_t** buffer, size_t* size, size_t maxSize) const {
-  return serialize(buffer, size, maxSize, SerializeIF::Endianness::NETWORK);
-}
-
-ReturnValue_t PusTmCreator::serialize(uint8_t* buffer, size_t& serLen, size_t maxSize) const {
-  return SerializeIF::serialize(buffer, serLen, maxSize, SerializeIF::Endianness::NETWORK);
-}
\ No newline at end of file
diff --git a/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.h b/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.h
index 9f3dcd24a..706a7b709 100644
--- a/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.h
+++ b/src/fsfw/tmtcpacket/pus/tm/PusTmCreator.h
@@ -82,9 +82,6 @@ class PusTmCreator : public SerializeIF, public PusTmIF, public CustomUserDataIF
   uint8_t getScTimeRefStatus() override;
   uint16_t getMessageTypeCounter() override;
   uint16_t getDestId() override;
-  // Override these to use default big endianness
-  ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize) const override;
-  ReturnValue_t serialize(uint8_t* buffer, size_t& serLen, size_t maxSize) const override;
   ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
                           Endianness streamEndianness) const override;
   [[nodiscard]] size_t getSerializedSize() const override;
@@ -92,6 +89,9 @@ class PusTmCreator : public SerializeIF, public PusTmIF, public CustomUserDataIF
   ReturnValue_t setRawUserData(const uint8_t* data, size_t len) override;
   ReturnValue_t setSerializableUserData(SerializeIF& serializable) override;
 
+  // Load all big endian (network endian) helpers into scope
+  using SerializeIF::serializeBe;
+
  private:
   // Forbidden to use
   ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
diff --git a/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.cpp b/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.cpp
index 5ddc32453..28d15e462 100644
--- a/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.cpp
+++ b/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.cpp
@@ -466,7 +466,8 @@ ReturnValue_t MgmLIS3MDLHandler::initializeLocalDataPool(localpool::DataPool &lo
                                                          LocalDataPoolManager &poolManager) {
   localDataPoolMap.emplace(MGMLIS3MDL::FIELD_STRENGTHS, &mgmXYZ);
   localDataPoolMap.emplace(MGMLIS3MDL::TEMPERATURE_CELCIUS, &temperature);
-  poolManager.subscribeForPeriodicPacket(dataset.getSid(), false, 10.0, false);
+  poolManager.subscribeForRegularPeriodicPacket(
+      subdp::RegularHkPeriodicParams(dataset.getSid(), false, 10.0));
   return HasReturnvaluesIF::RETURN_OK;
 }
 
diff --git a/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp b/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
index c329f5a67..e8f61b9f2 100644
--- a/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
+++ b/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
@@ -305,12 +305,13 @@ void MgmRM3100Handler::fillCommandAndReplyMap() {
   insertInCommandAndReplyMap(RM3100::READ_DATA, 3, &primaryDataset);
 }
 
-void MgmRM3100Handler::modeChanged(void) { internalState = InternalState::NONE; }
+void MgmRM3100Handler::modeChanged() { internalState = InternalState::NONE; }
 
 ReturnValue_t MgmRM3100Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                         LocalDataPoolManager &poolManager) {
   localDataPoolMap.emplace(RM3100::FIELD_STRENGTHS, &mgmXYZ);
-  poolManager.subscribeForPeriodicPacket(primaryDataset.getSid(), false, 10.0, false);
+  poolManager.subscribeForRegularPeriodicPacket(
+      subdp::RegularHkPeriodicParams(primaryDataset.getSid(), false, 10.0));
   return HasReturnvaluesIF::RETURN_OK;
 }
 
diff --git a/unittests/tmtcpacket/testCcsds.cpp b/unittests/tmtcpacket/testCcsds.cpp
index 095020ae4..7c88c0c6b 100644
--- a/unittests/tmtcpacket/testCcsds.cpp
+++ b/unittests/tmtcpacket/testCcsds.cpp
@@ -60,9 +60,9 @@ TEST_CASE("CCSDS Packet ID", "[ccsds-packet-id]") {
 
   SECTION("Invalid Deser") {
     size_t deserLen = 0;
-    REQUIRE(packetId.SerializeIF::deSerialize(buf.data(), deserLen, 1) ==
+    REQUIRE(packetId.deSerialize(buf.data(), deserLen, 1, SerializeIF::Endianness::NETWORK) ==
             SerializeIF::STREAM_TOO_SHORT);
-    REQUIRE(packetId.SerializeIF::deSerialize(buf.data(), deserLen, 0) ==
+    REQUIRE(packetId.deSerialize(buf.data(), deserLen, 0, SerializeIF::Endianness::NETWORK) ==
             SerializeIF::STREAM_TOO_SHORT);
   }
 
@@ -77,8 +77,8 @@ TEST_CASE("CCSDS Packet ID", "[ccsds-packet-id]") {
     buf[0] = 0x1a;
     buf[1] = 0xff;
     size_t deserLen = 0xff;
-    REQUIRE(packetId.SerializeIF::deSerialize(buf.data(), deserLen, buf.size()) ==
-            HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(packetId.deSerialize(buf.data(), deserLen, buf.size(),
+                                 SerializeIF::Endianness::NETWORK) == HasReturnvaluesIF::RETURN_OK);
     CHECK(packetId.apid == 0x2ff);
     CHECK(deserLen == 2);
     CHECK(packetId.packetType == ccsds::PacketType::TC);
@@ -113,7 +113,7 @@ TEST_CASE("CCSDS Packet Seq Ctrl", "[ccsds-packet-seq-ctrl]") {
     buf[0] = 0xbf;
     buf[1] = 0xfe;
     size_t deserLen = 0xff;
-    REQUIRE(psc.SerializeIF::deSerialize(buf.data(), deserLen, buf.size()) ==
+    REQUIRE(psc.deSerialize(buf.data(), deserLen, buf.size(), SerializeIF::Endianness::NETWORK) ==
             HasReturnvaluesIF::RETURN_OK);
     CHECK(psc.seqFlags == ccsds::SequenceFlags::LAST_SEGMENT);
     CHECK(deserLen == 2);
@@ -128,7 +128,9 @@ TEST_CASE("CCSDS Packet Seq Ctrl", "[ccsds-packet-seq-ctrl]") {
 
   SECTION("Invalid Deser") {
     size_t deserLen = 0;
-    REQUIRE(psc.SerializeIF::deSerialize(buf.data(), deserLen, 1) == SerializeIF::STREAM_TOO_SHORT);
-    REQUIRE(psc.SerializeIF::deSerialize(buf.data(), deserLen, 0) == SerializeIF::STREAM_TOO_SHORT);
+    REQUIRE(psc.deSerialize(buf.data(), deserLen, 1, SerializeIF::Endianness::NETWORK) ==
+            SerializeIF::STREAM_TOO_SHORT);
+    REQUIRE(psc.deSerialize(buf.data(), deserLen, 0, SerializeIF::Endianness::NETWORK) ==
+            SerializeIF::STREAM_TOO_SHORT);
   }
 }
diff --git a/unittests/tmtcpacket/testPusTcCreator.cpp b/unittests/tmtcpacket/testPusTcCreator.cpp
index 5bc349a60..5aed24a00 100644
--- a/unittests/tmtcpacket/testPusTcCreator.cpp
+++ b/unittests/tmtcpacket/testPusTcCreator.cpp
@@ -34,7 +34,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
   }
 
   SECTION("Serialized") {
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(serLen == 13);
     REQUIRE(buf[0] == 0x18);
     REQUIRE(buf[1] == 0x02);
@@ -64,7 +64,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
     auto& params = creator.getPusParams();
     params.sourceId = 0x5ff;
     REQUIRE(creator.getSourceId() == 0x5ff);
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(((buf[9] << 8) | buf[10]) == 0x5ff);
   }
 
@@ -76,7 +76,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
     REQUIRE(creator.getSerializedSize() == 13);
     creator.updateSpLengthField();
     REQUIRE(creator.getSerializedSize() == 16);
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(serLen == 16);
     REQUIRE(buf[11] == 1);
     REQUIRE(buf[12] == 2);
@@ -88,7 +88,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
     auto simpleSer = SimpleSerializable();
     creator.setSerializableUserData(simpleSer);
     REQUIRE(creator.getSerializedSize() == 16);
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(serLen == 16);
     REQUIRE(buf[11] == 1);
     REQUIRE(buf[12] == 2);
@@ -100,7 +100,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
     auto simpleSer = SimpleSerializable();
     creator.setSerializableUserData(simpleSer);
     REQUIRE(creator.getSerializedSize() == 16);
-    REQUIRE(creator.serialize(dataPtr, serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(serLen == 16);
     REQUIRE(buf[11] == 1);
     REQUIRE(buf[12] == 2);
@@ -120,13 +120,13 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
     for (size_t maxSize = 0; maxSize < reqSize; maxSize++) {
       dataPtr = buf.data();
       serLen = 0;
-      REQUIRE(creator.serialize(&dataPtr, &serLen, maxSize) == SerializeIF::BUFFER_TOO_SHORT);
+      REQUIRE(creator.serializeBe(&dataPtr, &serLen, maxSize) == SerializeIF::BUFFER_TOO_SHORT);
     }
   }
 
   SECTION("Invalid PUS Version") {
     auto& params = creator.getPusParams();
     params.pusVersion = 0;
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == PusIF::INVALID_PUS_VERSION);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == PusIF::INVALID_PUS_VERSION);
   }
 }
\ No newline at end of file
diff --git a/unittests/tmtcpacket/testPusTcReader.cpp b/unittests/tmtcpacket/testPusTcReader.cpp
index 3245218a8..1c3469f24 100644
--- a/unittests/tmtcpacket/testPusTcReader.cpp
+++ b/unittests/tmtcpacket/testPusTcReader.cpp
@@ -16,7 +16,7 @@ TEST_CASE("PUS TC Reader", "[pus-tc-reader]") {
   PusTcReader reader;
 
   SECTION("State") {
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.isNull());
     REQUIRE(not reader);
     PusTcReader* readerPtr = nullptr;
@@ -55,14 +55,14 @@ TEST_CASE("PUS TC Reader", "[pus-tc-reader]") {
   }
 
   SECTION("Invalid CRC") {
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
     buf[11] = 0x00;
     REQUIRE(reader.parseDataWithCrcCheck() == PusIF::INVALID_CRC_16);
   }
 
   SECTION("Invalid CRC but no check") {
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
     buf[11] = 0x00;
     REQUIRE(reader.parseDataWithoutCrcCheck() == HasReturnvaluesIF::RETURN_OK);
@@ -72,7 +72,7 @@ TEST_CASE("PUS TC Reader", "[pus-tc-reader]") {
     auto& params = creator.getPusParams();
     std::array<uint8_t, 3> data{1, 2, 3};
     creator.setRawUserData(data.data(), data.size());
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_OK);
     const uint8_t* userDataPtr = reader.getUserData();
diff --git a/unittests/tmtcpacket/testPusTmCreator.cpp b/unittests/tmtcpacket/testPusTmCreator.cpp
index f32e060f9..4c958911b 100644
--- a/unittests/tmtcpacket/testPusTmCreator.cpp
+++ b/unittests/tmtcpacket/testPusTmCreator.cpp
@@ -90,7 +90,7 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
     REQUIRE(creator.getApid() == 0x3ff);
     REQUIRE(creator.getDestId() == 0xfff);
     REQUIRE(creator.getMessageTypeCounter() == 0x313);
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     // Message Sequence Count
     REQUIRE(((buf[9] << 8) | buf[10]) == 0x313);
     // Destination ID
@@ -108,8 +108,7 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
     std::array<uint8_t, 3> data{1, 2, 3};
     creator.setRawUserData(data.data(), data.size());
     REQUIRE(creator.getFullPacketLen() == 25);
-    REQUIRE(creator.SerializeIF::serialize(&dataPtr, &serLen, buf.size()) ==
-            HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(buf[20] == 1);
     REQUIRE(buf[21] == 2);
     REQUIRE(buf[22] == 3);
@@ -119,7 +118,8 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
     auto simpleSer = SimpleSerializable();
     creator.setSerializableUserData(simpleSer);
     REQUIRE(creator.getFullPacketLen() == 25);
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size(), SerializeIF::Endianness::NETWORK) ==
+            HasReturnvaluesIF::RETURN_OK);
     REQUIRE(buf[20] == 1);
     REQUIRE(buf[21] == 2);
     REQUIRE(buf[22] == 3);
@@ -143,7 +143,7 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
     for (size_t maxSize = 0; maxSize < reqSize; maxSize++) {
       dataPtr = buf.data();
       serLen = 0;
-      REQUIRE(creator.SerializeIF::serialize(&dataPtr, &serLen, maxSize) ==
+      REQUIRE(creator.serialize(&dataPtr, &serLen, maxSize, SerializeIF::Endianness::NETWORK) ==
               SerializeIF::BUFFER_TOO_SHORT);
     }
   }
@@ -151,7 +151,7 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
   SECTION("No CRC Generation") {
     creator.disableCrcCalculation();
     REQUIRE(not creator.crcCalculationEnabled());
-    REQUIRE(creator.serialize(dataPtr, serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(serLen == 22);
     REQUIRE(buf[20] == 0x00);
     REQUIRE(buf[21] == 0x00);
diff --git a/unittests/tmtcpacket/testPusTmReader.cpp b/unittests/tmtcpacket/testPusTmReader.cpp
index 7967dba69..676594423 100644
--- a/unittests/tmtcpacket/testPusTmReader.cpp
+++ b/unittests/tmtcpacket/testPusTmReader.cpp
@@ -62,7 +62,7 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
   }
 
   SECTION("Invalid CRC") {
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     buf[20] = 0;
     REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.parseDataWithCrcCheck() == PusIF::INVALID_CRC_16);
@@ -74,7 +74,7 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
   }
 
   SECTION("Invalid CRC ignored") {
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     buf[20] = 0;
     REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.parseDataWithoutCrcCheck() == HasReturnvaluesIF::RETURN_OK);
@@ -83,7 +83,7 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
   SECTION("Read with source data") {
     std::array<uint8_t, 3> data{1, 2, 3};
     creator.setRawUserData(data.data(), data.size());
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.getUserDataLen() == 3);
@@ -94,7 +94,7 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
   }
 
   SECTION("Invalid stream lengths") {
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     for (size_t i = 0; i < serLen - 1; i++) {
       REQUIRE(reader.setReadOnlyData(buf.data(), i) == SerializeIF::STREAM_TOO_SHORT);
     }
@@ -102,7 +102,7 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
 
   SECTION("Reading timestamp fails") {
     timeStamperAndReader.nextDeserFails = true;
-    REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
+    REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
     REQUIRE(reader.parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_FAILED);
   }
diff --git a/unittests/tmtcpacket/testZcTmWriter.cpp b/unittests/tmtcpacket/testZcTmWriter.cpp
index fc013590e..da596250c 100644
--- a/unittests/tmtcpacket/testZcTmWriter.cpp
+++ b/unittests/tmtcpacket/testZcTmWriter.cpp
@@ -18,7 +18,7 @@ TEST_CASE("TM ZC Helper", "[tm-zc-helper]") {
   size_t serLen = 0;
 
   SECTION("No Crash For Uninitialized Object") {
-    REQUIRE(creator.serialize(dataPtr, serLen, buf.size()) == result::OK);
+    REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == result::OK);
     PusTmZeroCopyWriter writer(timeStamper, dataPtr, serLen);
     REQUIRE(writer.getSequenceCount() == 22);
     writer.setSequenceCount(23);
@@ -28,7 +28,7 @@ TEST_CASE("TM ZC Helper", "[tm-zc-helper]") {
   }
 
   SECTION("Basic") {
-    REQUIRE(creator.serialize(dataPtr, serLen, buf.size()) == result::OK);
+    REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == result::OK);
     PusTmZeroCopyWriter writer(timeStamper, dataPtr, serLen);
     REQUIRE(writer.parseDataWithoutCrcCheck() == result::OK);
     REQUIRE(writer.getSequenceCount() == 22);