diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index ddfa9866ad..14384aaec3 100755
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -238,19 +238,6 @@ function output_xml_report($id)
                 echo '<line_separator><![CDATA['.io_safe_output($item['line_separator']).']]></line_separator>';
                 echo '<column_separator><![CDATA['.io_safe_output($item['header_definition']).']]></column_separator>';
             break;
-
-            /*
-                case 'TTRT':
-                break;
-
-                case 'TTO':
-                break;
-
-                case 'MTBF':
-                break;
-
-                case 'MTTR':
-            break;*/
         }
 
         echo "</item>\n";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index ea9a5f50e8..dae61e3a78 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -375,19 +375,6 @@ function process_upload_xml_report($xml, $group_filter=0)
                     $values['line_separator'] = io_safe_input($item['line_separator']);
                     $values['column_separator'] = io_safe_input($item['column_separator']);
                 break;
-
-                /*
-                    case 'TTRT':
-                    break;
-
-                    case 'TTO':
-                    break;
-
-                    case 'MTBF':
-                    break;
-
-                    case 'MTTR':
-                break;*/
             }
 
             if (empty($agents_item)) {
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index b59dbc2ee5..e7201ab155 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -482,51 +482,6 @@ switch ($action) {
                     $period = $item['period'];
                 break;
 
-                /*
-                    case 'TTRT':
-                    $description = $item['description'];
-                    $idAgentModule = $item['id_agent_module'];
-                    $idAgent = db_get_value_filter(
-                        'id_agente',
-                        'tagente_modulo',
-                        ['id_agente_modulo' => $idAgentModule]
-                    );
-                    $period = $item['period'];
-                    break;
-
-                    case 'TTO':
-                    $description = $item['description'];
-                    $idAgentModule = $item['id_agent_module'];
-                    $idAgent = db_get_value_filter(
-                        'id_agente',
-                        'tagente_modulo',
-                        ['id_agente_modulo' => $idAgentModule]
-                    );
-                    $period = $item['period'];
-                    break;
-
-                    case 'MTBF':
-                    $description = $item['description'];
-                    $idAgentModule = $item['id_agent_module'];
-                    $idAgent = db_get_value_filter(
-                        'id_agente',
-                        'tagente_modulo',
-                        ['id_agente_modulo' => $idAgentModule]
-                    );
-                    $period = $item['period'];
-                    break;
-
-                    case 'MTTR':
-                    $description = $item['description'];
-                    $idAgentModule = $item['id_agent_module'];
-                    $idAgent = db_get_value_filter(
-                        'id_agente',
-                        'tagente_modulo',
-                        ['id_agente_modulo' => $idAgentModule]
-                    );
-                    $period = $item['period'];
-                    break;
-                */
                 case 'alert_report_module':
                     $description = $item['description'];
                     $idAgentModule = $item['id_agent_module'];
@@ -791,11 +746,6 @@ switch ($action) {
                 case 'avg_value':
                 case 'projection_graph':
                 case 'prediction_date':
-                    /*
-                        case 'TTRT':
-                        case 'TTO':
-                        case 'MTBF':
-                    case 'MTTR':*/
                 case 'simple_baseline_graph':
                 case 'event_report_log':
                 case 'increment':
@@ -3757,10 +3707,6 @@ $(document).ready (function () {
             case 'event_report_module':
             case 'simple_graph':
             case 'simple_baseline_graph':
-/*          case 'TTRT':
-            case 'TTO':
-            case 'MTBF':
-            case 'MTTR':*/
             case 'prediction_date':
             case 'projection_graph':
             case 'avg_value':
@@ -3798,10 +3744,6 @@ $(document).ready (function () {
             case 'event_report_module':
             case 'simple_graph':
             case 'simple_baseline_graph':
-/*          case 'TTRT':
-            case 'TTO':
-            case 'MTBF':
-            case 'MTTR':*/
             case 'prediction_date':
             case 'projection_graph':
             case 'avg_value':
@@ -4833,38 +4775,6 @@ function chooseType() {
             $("#row_period").show();
             $("#row_historical_db_check").hide();
             break;
-/*
-        case 'TTRT':
-            $("#row_description").show();
-            $("#row_agent").show();
-            $("#row_module").show();
-            $("#row_period").show();
-            $("#row_historical_db_check").hide();
-            break;
-
-        case 'TTO':
-            $("#row_description").show();
-            $("#row_agent").show();
-            $("#row_module").show();
-            $("#row_period").show();
-            $("#row_historical_db_check").hide();
-            break;
-
-        case 'MTBF':
-            $("#row_description").show();
-            $("#row_agent").show();
-            $("#row_module").show();
-            $("#row_period").show();
-            $("#row_historical_db_check").hide();
-            break;
-
-        case 'MTTR':
-            $("#row_description").show();
-            $("#row_agent").show();
-            $("#row_module").show();
-            $("#row_period").show();
-            $("#row_historical_db_check").hide();
-            break;*/
 
         case 'alert_report_module':
             $("#row_description").show();
@@ -5218,10 +5128,6 @@ function chooseType() {
         case 'min_value':
         case 'max_value':
         case 'avg_value':
- /*     case 'TTRT':
-        case 'TTO':
-        case 'MTBF':
-        case 'MTTR':*/
         case 'simple_baseline_graph':
             $("#row_label").show();
             break;
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 40ce45b5bb..823713877b 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -2006,11 +2006,6 @@ switch ($action) {
                             case 'avg_value':
                             case 'projection_graph':
                             case 'prediction_date':
-                                /*
-                                    case 'TTRT':
-                                    case 'TTO':
-                                    case 'MTBF':
-                                case 'MTTR':*/
                             case 'simple_baseline_graph':
                             case 'nt_top_n':
                                 if ($label != '') {
@@ -2613,11 +2608,6 @@ switch ($action) {
                             case 'avg_value':
                             case 'projection_graph':
                             case 'prediction_date':
-                                /*
-                                    case 'TTRT':
-                                    case 'TTO':
-                                    case 'MTBF':
-                                case 'MTTR':*/
                             case 'simple_baseline_graph':
                             case 'nt_top_n':
                                 if ($label != '') {
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 1d0355cf97..a5ae07df3e 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -506,43 +506,6 @@ function reporting_make_reporting_data(
                 );
             break;
 
-            /*
-                case 'MTTR':
-                $report['contents'][] = reporting_value(
-                    $report,
-                    $content,
-                    'MTTR',
-                    $pdf
-                );
-                break;
-
-                case 'MTBF':
-                $report['contents'][] = reporting_value(
-                    $report,
-                    $content,
-                    'MTBF',
-                    $pdf
-                );
-                break;
-
-                case 'TTO':
-                $report['contents'][] = reporting_value(
-                    $report,
-                    $content,
-                    'TTO',
-                    $pdf
-                );
-                break;
-
-                case 'TTRT':
-                $report['contents'][] = reporting_value(
-                    $report,
-                    $content,
-                    'TTRT',
-                    $pdf
-                );
-                break;
-            */
             case 'agent_configuration':
                 $report['contents'][] = io_safe_output(
                     reporting_agent_configuration(
@@ -3276,6 +3239,7 @@ function reporting_database_serialized($report, $content)
     }
 
     $return['keys'] = $keys;
+    $return['agent_name_db'] = agents_get_name($id_agent);
     $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
 
@@ -4303,6 +4267,7 @@ function reporting_monitor_report($report, $content)
         );
     }
 
+    $return['agent_name_db'] = agents_get_name($id_agent);
     $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
 
@@ -4475,6 +4440,7 @@ function reporting_prediction_date($report, $content)
     $agent_name = io_safe_output(
         modules_get_agentmodule_agent_alias($content['id_agent_module'])
     );
+    $agent_name_db = io_safe_output(modules_get_agentmodule_agent_name($content['id_agent_module']));
 
     $return['title'] = $content['name'];
     $return['subtitle'] = $agent_name.' - '.$module_name;
@@ -4482,6 +4448,7 @@ function reporting_prediction_date($report, $content)
     $return['date'] = reporting_get_date_text($report, $content);
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
 
+    $return['agent_name_db'] = $agent_name_db;
     $return['agent_name'] = $agent_name;
     $return['module_name'] = $module_name;
 
@@ -4526,12 +4493,14 @@ function reporting_projection_graph(
 
     $module_name = io_safe_output(modules_get_agentmodule_name($content['id_agent_module']));
     $agent_name = io_safe_output(modules_get_agentmodule_agent_alias($content['id_agent_module']));
+    $agent_name_db = io_safe_output(modules_get_agentmodule_agent_name($content['id_agent_module']));
 
     $return['title']       = $content['name'];
     $return['subtitle']    = $agent_name.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date']        = reporting_get_date_text($report, $content);
     $return['label']       = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    $return['agent_name_db'] = $agent_name_db;
     $return['agent_name']  = $agent_name;
     $return['module_name'] = $module_name;
 
@@ -4727,23 +4696,6 @@ function reporting_value($report, $content, $type, $pdf=false)
         case 'sum':
             $return['type'] = 'sumatory';
         break;
-
-        /*
-            case 'MTTR':
-            $return['type'] = 'MTTR';
-            break;
-
-            case 'MTBF':
-            $return['type'] = 'MTBF';
-            break;
-
-            case 'TTO':
-            $return['type'] = 'TTO';
-            break;
-
-            case 'TTRT':
-            $return['type'] = 'TTRT';
-        break;*/
     }
 
     if (empty($content['name'])) {
@@ -4763,23 +4715,6 @@ function reporting_value($report, $content, $type, $pdf=false)
             case 'sum':
                 $content['name'] = __('Summatory');
             break;
-
-            /*
-                case 'MTTR':
-                $content['name'] = __('MTTR');
-                break;
-
-                case 'MTBF':
-                $content['name'] = __('MTBF');
-                break;
-
-                case 'TTO':
-                $content['name'] = __('TTO');
-                break;
-
-                case 'TTRT':
-                $content['name'] = __('TTRT');
-            break;*/
         }
     }
 
@@ -4796,6 +4731,9 @@ function reporting_value($report, $content, $type, $pdf=false)
     $agent_name = io_safe_output(
         modules_get_agentmodule_agent_alias($content['id_agent_module'])
     );
+    $agent_name_db = io_safe_output(
+        modules_get_agentmodule_agent_name($content['id_agent_module'])
+    );
     $unit = db_get_value(
         'unit',
         'tagente_modulo',
@@ -4812,6 +4750,7 @@ function reporting_value($report, $content, $type, $pdf=false)
     $return['id_agent'] = $content['id_agent'];
     $return['id_agent_module'] = $content['id_agent_module'];
 
+    $return['agent_name_db'] = $agent_name_db;
     $return['agent_name'] = $agent_name;
     $return['module_name'] = $module_name;
 
@@ -4952,51 +4891,6 @@ function reporting_value($report, $content, $type, $pdf=false)
                 $formated_value = format_for_graph($value, $config['graph_precision']).' '.$unit;
             }
         break;
-
-        /*
-            case 'MTTR':
-            $value = reporting_get_agentmodule_mttr(
-                $content['id_agent_module'],
-                $content['period'],
-                $report['datetime']
-            );
-            $formated_value = null;
-            break;
-
-            case 'MTBF':
-            $value = reporting_get_agentmodule_mtbf(
-                $content['id_agent_module'],
-                $content['period'],
-                $report['datetime']
-            );
-            $formated_value = null;
-            break;
-
-            case 'TTO':
-            $value = reporting_get_agentmodule_tto(
-                $content['id_agent_module'],
-                $content['period'],
-                $report['datetime']
-            );
-            if ($value == 0) {
-                $formated_value = null;
-            } else {
-                $formated_value = human_time_description_raw($value);
-            }
-            break;
-
-            case 'TTRT':
-            $value = reporting_get_agentmodule_ttr(
-                $content['id_agent_module'],
-                $content['period'],
-                $report['datetime']
-            );
-            if ($value == 0) {
-                $formated_value = null;
-            } else {
-                $formated_value = human_time_description_raw($value);
-            }
-        break;*/
     }
 
     $return['data'] = [
@@ -7755,6 +7649,7 @@ function reporting_simple_graph(
 
     $return['title'] = $content['name'];
     $return['subtitle'] = $agent_alias.' - '.$module_name;
+    $return['agent_name_db'] = agents_get_name($id_agent);
     $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
     $return['description'] = $content['description'];
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index cf1fa60e70..5dc38d3b9d 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -288,23 +288,6 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
                 reporting_html_sum_value($table, $item, $mini);
             break;
 
-            /*
-                case 'MTTR':
-                reporting_html_MTTR_value($table, $item, $mini, true, true);
-                break;
-
-                case 'MTBF':
-                reporting_html_MTBF_value($table, $item, $mini, true, true);
-                break;
-
-                case 'TTO':
-                reporting_html_TTO_value($table, $item, $mini, false, true);
-                break;
-
-                case 'TTRT':
-                reporting_html_TTRT_value($table, $item, $mini, false, true);
-                break;
-            */
             case 'agent_configuration':
                 reporting_html_agent_configuration($table, $item);
             break;
@@ -2729,31 +2712,6 @@ function reporting_html_agent_configuration(
 }
 
 
-/*
-    function reporting_html_TTRT_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
-    {
-    reporting_html_value($table, $item, $mini, $only_value, $check_empty);
-    }
-
-
-    function reporting_html_TTO_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
-    {
-    reporting_html_value($table, $item, $mini, $only_value, $check_empty);
-    }
-
-
-    function reporting_html_MTBF_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
-    {
-    reporting_html_value($table, $item, $mini, $only_value, $check_empty);
-    }
-
-
-    function reporting_html_MTTR_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
-    {
-    reporting_html_value($table, $item, $mini, $only_value, $check_empty);
-    }
-*/
-
 function reporting_html_sum_value(&$table, $item, $mini)
 {
     reporting_html_value($table, $item, $mini);
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index 319690946e..e20fdd01fa 100755
--- a/pandora_console/include/functions_reports.php
+++ b/pandora_console/include/functions_reports.php
@@ -679,24 +679,6 @@ function reports_get_report_types($template=false, $not_editor=false)
         'name'     => __('Module Histogram graph'),
     ];
 
-    /*
-        $types['TTRT'] = [
-        'optgroup' => __('ITIL'),
-        'name'     => __('TTRT'),
-        ];
-        $types['TTO'] = [
-        'optgroup' => __('ITIL'),
-        'name'     => __('TTO'),
-        ];
-        $types['MTBF'] = [
-        'optgroup' => __('ITIL'),
-        'name'     => __('MTBF'),
-        ];
-        $types['MTTR'] = [
-        'optgroup' => __('ITIL'),
-        'name'     => __('MTTR'),
-        ];
-    */
     $types['SLA'] = [
         'optgroup' => __('SLA'),
         'name'     => __('S.L.A.'),