diff --git a/src/fsfw/cfdp/handler/defs.h b/src/fsfw/cfdp/handler/defs.h
index 7c1c4bf7..cafc3afc 100644
--- a/src/fsfw/cfdp/handler/defs.h
+++ b/src/fsfw/cfdp/handler/defs.h
@@ -12,7 +12,7 @@ namespace cfdp {
 enum class CfdpState { IDLE, BUSY_CLASS_1_NACKED, BUSY_CLASS_2_ACKED, SUSPENDED };
 
 static constexpr uint8_t SSID = SUBSYSTEM_ID::CFDP;
-static constexpr uint8_t CID = CLASS_ID::CFDP;
+static constexpr uint8_t CID = CLASS_ID::CFDP_HANDLER;
 
 struct PacketInfo {
   PacketInfo(PduType type, store_address_t storeId,
@@ -58,6 +58,8 @@ static constexpr Event SERIALIZATION_ERROR = event::makeEvent(SSID, 2, severity:
 static constexpr Event FILESTORE_ERROR = event::makeEvent(SSID, 3, severity::LOW);
 //! [EXPORT] : [COMMENT] P1: Transaction step ID, P2: 0 for source file name, 1 for dest file name
 static constexpr Event FILENAME_TOO_LARGE_ERROR = event::makeEvent(SSID, 4, severity::LOW);
+//! [EXPORT] : [COMMENT] CFDP request handling failed. P2: Returncode.
+static constexpr Event HANDLING_CFDP_REQUEST_FAILED = event::makeEvent(SSID, 5, severity::LOW);
 
 }  // namespace events
 
diff --git a/src/fsfw/returnvalues/FwClassIds.h b/src/fsfw/returnvalues/FwClassIds.h
index 9a5cc812..9a4fa992 100644
--- a/src/fsfw/returnvalues/FwClassIds.h
+++ b/src/fsfw/returnvalues/FwClassIds.h
@@ -61,7 +61,8 @@ enum : uint8_t {
   HAS_ACTIONS_IF,                 // HF
   DEVICE_COMMUNICATION_IF,        // DC
   BSP,                            // BSP
-  CFDP,                           // CFDP
+  CFDP_BASE,                      // CFDP
+  CFDP_HANDLER,                   // CFDP
   TIME_STAMPER_IF,                // TSI
   SGP4PROPAGATOR_CLASS,           // SGP4
   MUTEX_IF,                       // MUX