diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index fa015300d6..196cbd691d 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -233,6 +233,8 @@ switch ($action) {
 
             $style = json_decode(io_safe_output($item['style']), true);
 
+            $name_from_template = $style['name_label'];
+
             $show_in_same_row = $style['show_in_same_row'];
             $show_in_landscape = $style['show_in_landscape'];
             $hide_notinit_agents = $style['hide_notinit_agents'];
@@ -869,18 +871,33 @@ $class = 'databox filters';
             </td>
             <td style="">
                 <?php
-                html_print_input_text(
-                    'name',
-                    $name,
-                    '',
-                    80,
-                    100,
-                    false,
-                    false,
-                    false,
-                    '',
-                    'fullwidth'
-                );
+                if ($name_from_template != '') {
+                    html_print_input_text(
+                        'name',
+                        $name_from_template,
+                        '',
+                        80,
+                        100,
+                        false,
+                        false,
+                        false,
+                        '',
+                        'fullwidth'
+                    );
+                } else {
+                    html_print_input_text(
+                        'name',
+                        $name,
+                        '',
+                        80,
+                        100,
+                        false,
+                        false,
+                        false,
+                        '',
+                        'fullwidth'
+                    );
+                }
                 ?>
             </td>
         </tr>
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 00c6fa245a..4eaeeed45b 100755
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -489,11 +489,18 @@ foreach ($items as $item) {
         $row[4] = '-';
     }
 
-    if ($item['name'] == '' && $item['description'] == '') {
-        $row[5] = '-';
-    } else {
-        $text = empty($item['name']) ? $item['description'] : $item['name'];
+    $style = json_decode(io_safe_output($item['style']), true);
+
+    if ($style['name_label'] != '') {
+        $text = empty($style['name_label']) ? $item['description'] : $style['name_label'];
         $row[5] = ui_print_truncate_text($text, 'description', true, true);
+    } else {
+        if ($item['name'] == '' && $item['description'] == '') {
+            $row[5] = '-';
+        } else {
+            $text = empty($item['name']) ? $item['description'] : $item['name'];
+            $row[5] = ui_print_truncate_text($text, 'description', true, true);
+        }
     }
 
     $row[6] = '';