diff --git a/tcdistribution/CFDPDistributor.cpp b/tcdistribution/CFDPDistributor.cpp
index 9fe29499..5e07a1db 100644
--- a/tcdistribution/CFDPDistributor.cpp
+++ b/tcdistribution/CFDPDistributor.cpp
@@ -66,7 +66,7 @@ CFDPDistributor::TcMqMapIter CFDPDistributor::selectDestination() {
 
 ReturnValue_t CFDPDistributor::registerService(AcceptsTelecommandsIF* service) {
     uint16_t serviceId = service->getIdentifier();
-#if PUS_DISTRIBUTOR_DEBUGGING == 1
+#if CFDP_DISTRIBUTOR_DEBUGGING == 1
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::info << "Service ID: " << static_cast<int>(serviceId) << std::endl;
 #else
@@ -78,10 +78,10 @@ ReturnValue_t CFDPDistributor::registerService(AcceptsTelecommandsIF* service) {
     if (not returnPair.second) {
 #if FSFW_VERBOSE_LEVEL >= 1
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::error << "PUSDistributor::registerService: Service ID already"
+        sif::error << "CFDPDistributor::registerService: Service ID already"
                 " exists in map" << std::endl;
 #else
-        sif::printError("PUSDistributor::registerService: Service ID already exists in map\n");
+        sif::printError("CFDPDistributor::registerService: Service ID already exists in map\n");
 #endif
 #endif
         return SERVICE_ID_ALREADY_EXISTS;