diff --git a/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecoder2.h b/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecoder2.h
index 6dbb2cbd7fbbc..f756b81c35eb1 100644
--- a/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecoder2.h
+++ b/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecoder2.h
@@ -34,7 +34,7 @@
 
 #include "HMPIDReconstruction/HmpidEquipment.h"
 
-#define MAXDESCRIPTIONLENGHT 50
+#define MAXDESCRIPTIONLENGHT 70
 
 // ---- RDH 6  standard dimension -------
 #define RAWBLOCKDIMENSION_W 2048
diff --git a/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidEquipment.h b/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidEquipment.h
index c15034f04b054..185dc653b22a2 100644
--- a/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidEquipment.h
+++ b/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidEquipment.h
@@ -31,7 +31,7 @@ namespace hmpid
 {
 
 const int MAXERRORS = 13;
-const int MAXHMPIDERRORS = 6;
+const int MAXHMPIDERRORS = 5;
 
 const int ERR_NOTKNOWN = 0;
 const int ERR_ROWMARKEMPTY = 1;
diff --git a/Detectors/HMPID/reconstruction/src/HmpidDecoder2.cxx b/Detectors/HMPID/reconstruction/src/HmpidDecoder2.cxx
index 6bbfb552f5154..d3bcd3f28d162 100644
--- a/Detectors/HMPID/reconstruction/src/HmpidDecoder2.cxx
+++ b/Detectors/HMPID/reconstruction/src/HmpidDecoder2.cxx
@@ -46,12 +46,11 @@ char HmpidDecoder2::sErrorDescription[MAXERRORS][MAXDESCRIPTIONLENGHT] = {"Word
 
 /// HMPID Firmware Error Messages Definitions
 char HmpidDecoder2::sHmpidErrorDescription[MAXHMPIDERRORS][MAXDESCRIPTIONLENGHT] = {
-  "L0 Missing",
-  "L1 is received without L0",
-  "L1A signal arrived before the L1 Latency",
-  "L1A signal arrived after the L1 Latency",
-  "L1A is missing or L1 timeout",
-  "L1A Message is missing or L1 Message"};
+  "L1-Trigger received without L0",
+  "L1-Trigger received before the L1-Latency",
+  "L1-Trigger received after the L1-Time-Latency-Window",
+  "L1-Trigger after L1-Message or after timeout (12.8us)",
+  "L1-Message before L1-Trigger or after timeout (12.8us)"};
 
 /// Constructor : accepts the number of equipments to define
 ///               The mapping is the default at P2