diff --git a/master/pdo_mapping.c b/master/pdo_mapping.c
index 78b56eb6..daae329a 100644
--- a/master/pdo_mapping.c
+++ b/master/pdo_mapping.c
@@ -318,14 +318,14 @@ int ec_pdo_mapping_equal(
 
 /*****************************************************************************/
 
-/** Finds a Pdo with the given index.
+/** Finds a Pdo with the given index and returns a const pointer.
  */
-const ec_pdo_t *ec_pdo_mapping_find_pdo(
+const ec_pdo_t *ec_pdo_mapping_find_pdo_const(
         const ec_pdo_mapping_t *pm, /**< Pdo mapping. */
         uint16_t index /**< Pdo index. */
         )
 {
-    ec_pdo_t *pdo;
+    const ec_pdo_t *pdo;
 
     list_for_each_entry(pdo, &pm->pdos, list) {
         if (pdo->index != index)
diff --git a/master/pdo_mapping.h b/master/pdo_mapping.h
index e566d986..22700db7 100644
--- a/master/pdo_mapping.h
+++ b/master/pdo_mapping.h
@@ -73,7 +73,8 @@ int ec_pdo_mapping_copy(ec_pdo_mapping_t *, const ec_pdo_mapping_t *);
 uint16_t ec_pdo_mapping_total_size(const ec_pdo_mapping_t *);
 int ec_pdo_mapping_equal(const ec_pdo_mapping_t *, const ec_pdo_mapping_t *);
 
-const ec_pdo_t *ec_pdo_mapping_find_pdo(const ec_pdo_mapping_t *, uint16_t);
+const ec_pdo_t *ec_pdo_mapping_find_pdo_const(const ec_pdo_mapping_t *,
+        uint16_t);
 
 /*****************************************************************************/
 
diff --git a/master/slave.c b/master/slave.c
index 81ef1016..934a6e1b 100644
--- a/master/slave.c
+++ b/master/slave.c
@@ -1253,7 +1253,7 @@ const ec_pdo_t *ec_slave_find_pdo(
     for (i = 0; i < slave->sii.sync_count; i++) {
         sync = &slave->sii.syncs[i];
 
-        if (!(pdo = ec_pdo_mapping_find_pdo(&sync->mapping, index)))
+        if (!(pdo = ec_pdo_mapping_find_pdo_const(&sync->mapping, index)))
             continue;
 
         return pdo;