3 files changed, 8 insertions, 7 deletions
diff --git a/doxygen/siphon/process.py b/doxygen/siphon/process.py
index c7f8f1a232b..34e829c5298 100644
--- a/doxygen/siphon/process.py
+++ b/doxygen/siphon/process.py
@@ -257,6 +257,7 @@ class Siphon(object):
                     "directory": o['meta']['directory'],
                     "file": o['meta']['file'],
                     "macro": o['macro'],
+                    "name": o['name'],
                     "key": key,
                     "label": self.item_label(group, key),
                 }
diff --git a/doxygen/siphon_templates/clicmd/item_format.md b/doxygen/siphon_templates/clicmd/item_format.md
index 77d0484bfb7..288dae40f24 100644
--- a/doxygen/siphon_templates/clicmd/item_format.md
+++ b/doxygen/siphon_templates/clicmd/item_format.md
@@ -31,7 +31,7 @@
 ### Long help
 
 {{ v['long_help'] }}
-{%- endif %}
+{% endif %}
 {% if 'siphon_block' in item['meta'] %}
 {% set sb = item["meta"]["siphon_block"] %}
 {% if sb %}
@@ -42,14 +42,14 @@
 {{ sb }}
 {% endif %}
 {% endif %}
-{% if "item" in meta or "function" in v %}
+{% if 'name' in meta or 'function' in v %}
 {# Gives some developer-useful linking #}
 
 ### Declaration and implementation
-{% if "item" in meta %}
+{% if "name" in meta %}
 
 {{ "Declaration: @ref %s (@ref %s line %d)" %
-   (meta['item'], meta["file"], item["meta"]["line_start"]) }}
+   (meta['name'], meta["file"], item["meta"]["line_start"]) }}
 {% endif %}
 {% if "function" in v %}
 
diff --git a/doxygen/siphon_templates/syscfg/item_format.md b/doxygen/siphon_templates/syscfg/item_format.md
index 5d3bb5c83fb..53136115bbc 100644
--- a/doxygen/siphon_templates/syscfg/item_format.md
+++ b/doxygen/siphon_templates/syscfg/item_format.md
@@ -25,14 +25,14 @@
 {{ sb }}
 {% endif %}
 {% endif %}
-{% if "item" in meta or "function" in item %}
+{% if "name" in meta or "function" in item %}
 {# Gives some developer-useful linking #}
 
 ### Declaration and implementation
-{% if "item" in meta %}
+{% if "name" in meta %}
 
 {{ "Declaration: @ref %s (@ref %s line %d)" %
-   (meta['item'], meta["file"], item["meta"]["line_start"]) }}
+   (meta['name'], meta["file"], item["meta"]["line_start"]) }}
 {% endif %}
 {% if "function" in item %}