References dialog paths broken when bundle name consists of multiple words

I have entity type called Demo Entity and it has a bundle with the same name. So edit link for the entity is:
admin/structure/entity-type/demo_entity/demo_entity/[entity_id]/edit

In function eck_references_dialog_entity_admin_paths() a token [bundle-sanitized] is used:

foreach (EntityType::loadAll() as $entity_type) {
    $admin_paths["{$entity_type->name}"] = array(
      'add' => "{$path}/{$entity_type->name}/[bundle-sanitized]/add",
      'edit' => "{$path}/{$entity_type->name}/[bundle-sanitized]/[entity_id]/edit"
    );
  }

Problem is that [bundle-sanitized] converts underscore to hyphen, so in references dialog link, the following path is used:

admin/structure/entity-type/demo_entity/demo-entity/[entity_id]/edit

Notice how bundle is now demo-entity instead of demo_entity. This means that our link is now broken and references dialog doesn't work.

Using [bundle] instead of [bundle-sanitized] seems to fix this, but I'm not sure if this is a safe way to fix this?