diff --git a/TODO b/TODO
index 936337c7..3d310374 100644
--- a/TODO
+++ b/TODO
@@ -36,7 +36,6 @@ Version 1.4.0:
 * Check the position of the acknowledge state.
 * Remove the xmldev files.
 * Remove some debugging (add_sync_manager, clearing station addresses).
-* Rename "Scanning pdo mapping/configuration".
 * Separate CoE debugging.
 * Make ecrt_master_slave_config() return no error when slave is not present
   or invalid.
diff --git a/master/fsm_coe_map.c b/master/fsm_coe_map.c
index dc365d25..239577aa 100644
--- a/master/fsm_coe_map.c
+++ b/master/fsm_coe_map.c
@@ -209,7 +209,7 @@ void ec_fsm_coe_map_state_pdo_count(
     if (ec_fsm_coe_exec(fsm->fsm_coe)) return;
 
     if (!ec_fsm_coe_success(fsm->fsm_coe)) {
-        EC_ERR("Failed to read number of mapped Pdos from slave %u.\n",
+        EC_ERR("Failed to read number of assigned Pdos from slave %u.\n",
                 fsm->slave->ring_position);
         fsm->state = ec_fsm_coe_map_state_error;
         return;
diff --git a/master/fsm_slave_scan.c b/master/fsm_slave_scan.c
index 58264fdf..4e045918 100644
--- a/master/fsm_slave_scan.c
+++ b/master/fsm_slave_scan.c
@@ -636,7 +636,7 @@ void ec_fsm_slave_scan_enter_pdos(
     ec_slave_t *slave = fsm->slave;
 
     if (slave->master->debug_level)
-        EC_DBG("Scanning Pdo mapping/configuration of slave %u.\n",
+        EC_DBG("Scanning Pdo assignment and mapping of slave %u.\n",
                 slave->ring_position);
     fsm->state = ec_fsm_slave_scan_state_pdos;
     ec_fsm_coe_map_start(fsm->fsm_coe_map, slave);
@@ -659,7 +659,7 @@ void ec_fsm_slave_scan_state_pdos(
         return;
     }
 
-    // fetching of Pdo mapping finished
+    // fetching of Pdo assignment/mapping finished
     fsm->state = ec_fsm_slave_scan_state_end;
 }