diff --git a/pom.xml b/pom.xml
index 7dedecbb851ee65582081ab9dea638b8b17e4d3f..ae94ed85ed6154d3d5739ed84fa40dffc1264b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
    </parent>
    <groupId>fr.soleil.lib</groupId>
    <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
-   <version>2.5.24-SNAPSHOT</version>
+   <version>2.5.24</version>
    <packaging>nar</packaging>
    <name>Electrometers library</name>
    <description>Electrometers library</description>
diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp
index 46dc216db617f86159e8db8b69552bc08e192d01..1ae451bcc4fe1f84fedd0c2e9eac9a12899494c6 100644
--- a/src/AbstractElectrometerClass.cpp
+++ b/src/AbstractElectrometerClass.cpp
@@ -136,7 +136,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "AbstractElectrometerClass.h"
 #include "ElectrometerException.h"
 
diff --git a/src/KeithleyDDCProtocol.cpp b/src/KeithleyDDCProtocol.cpp
index 53377f72d0c24ba2a9b82e883ddff06823338be9..d8884e2808087fc081e24d241d0d9bfb5add3121 100644
--- a/src/KeithleyDDCProtocol.cpp
+++ b/src/KeithleyDDCProtocol.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "KeithleyDDCProtocol.h"
 
 // ============================================================================
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index a38faa67012cb90b1c91bc7976a6a16a1701c037..564ab93f5a9212eea0de2e6413b51cf1abe35d46 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #ifndef WIN32
 # include <unistd.h>
 #endif
diff --git a/src/Keithley_485.cpp b/src/Keithley_485.cpp
index 09cd71e4a9ef0f612a78c6dfca7b14ce07956d76..e29153022e9948a1887be502bcf51a1b7075bf8e 100644
--- a/src/Keithley_485.cpp
+++ b/src/Keithley_485.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "KeithleyDDCProtocol.h"
 #include "Keithley_485.h"
 
diff --git a/src/Keithley_486.cpp b/src/Keithley_486.cpp
index 1aaf3a3c0cec9000d4e0041be024116465be8b74..a781d94d2daf07a8f31ca18a4559275eead89c27 100644
--- a/src/Keithley_486.cpp
+++ b/src/Keithley_486.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "Keithley_486.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_487.cpp b/src/Keithley_487.cpp
index 0d4a9b6ab1a12bbc39d19f88f4e746a20503c1f4..8b3436cfed2da0de0081386317332a90509da221 100644
--- a/src/Keithley_487.cpp
+++ b/src/Keithley_487.cpp
@@ -19,7 +19,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "Keithley_487.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_617.cpp b/src/Keithley_617.cpp
index d9592c6adca160bc725810a17e8466b2147a6151..3c0026b9986486c1d87e9a06cef1646045b1dbc0 100644
--- a/src/Keithley_617.cpp
+++ b/src/Keithley_617.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "Keithley_617.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_6485.cpp b/src/Keithley_6485.cpp
index 6c48266281123dd39b3a229f735e1011f0a2b63b..72f3b56740643f734ad0f73a56fd21206bb54f54 100644
--- a/src/Keithley_6485.cpp
+++ b/src/Keithley_6485.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "Keithley_6485.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/Keithley_6487.cpp b/src/Keithley_6487.cpp
index f68e87a672f00e3cbf44f97e92cdc4cfb9d2b24f..420d317ffc2f88eeb47fccfcb8be6b6b68980270 100644
--- a/src/Keithley_6487.cpp
+++ b/src/Keithley_6487.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "Keithley_6487.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/Keithley_6512.cpp b/src/Keithley_6512.cpp
index 3955dfa86a7aa4810e2edded48b80b4dd30c1fa7..0a4d73dee1c93f42276979c138910dfdf1c170fe 100644
--- a/src/Keithley_6512.cpp
+++ b/src/Keithley_6512.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "Keithley_6512.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_6514.cpp b/src/Keithley_6514.cpp
index a2bcd40b63f56dd251606d7b3e65bab316123eba..f3318daa5c7e3ec6976b13960850c3db356cc888 100644
--- a/src/Keithley_6514.cpp
+++ b/src/Keithley_6514.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include <tango.h>  //- Tango exceptions
 #include "Keithley_6514.h"
 #include "KeithleySCPIProtocol.h"
diff --git a/src/Keithley_6517.cpp b/src/Keithley_6517.cpp
index 61e90240af18057125de88b07fd923b9dad5ccc1..7ef123cd5ae1b9e84249085bdec2cd69b2a1836e 100644
--- a/src/Keithley_6517.cpp
+++ b/src/Keithley_6517.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 #include <string>
 #include <math.h>   //- for ceil
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "Keithley_6517.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/N_PhotoConducteur.cpp b/src/N_PhotoConducteur.cpp
index 30d811ea51b875090b200137d2d94f01535466be..d97cc1e85978332d2938e5ded586df960bcd3e5a 100644
--- a/src/N_PhotoConducteur.cpp
+++ b/src/N_PhotoConducteur.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "N_PhotoConducteur.h"
 #include "NovelecProtocol.h"
 /*
diff --git a/src/N_PhotoVoltaique.cpp b/src/N_PhotoVoltaique.cpp
index 7460499c0a6b17fe138f2c8fe931f0a33286633f..a78a09ad3ab7caf772b415cddea8d4e4f5dfead2 100644
--- a/src/N_PhotoVoltaique.cpp
+++ b/src/N_PhotoVoltaique.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "N_PhotoVoltaique.h"
 #include "NovelecProtocol.h"
 /*
diff --git a/src/NovelecProtocol.cpp b/src/NovelecProtocol.cpp
index bbe03cc3509997ae6759ce19e8a2ba2780477e6f..e2ab5226f34af6efc852f0bad55b17d91e53afa5 100644
--- a/src/NovelecProtocol.cpp
+++ b/src/NovelecProtocol.cpp
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "NovelecProtocol.h"
 
 //- commands numbers
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index 103e6fe0f08b7cb1d51dcc7f189caee3d4532350..903c6a6d66e6388dfe270cccf3583376fd5fb411 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
 #include "NovelecProtocol.h"
 #include "Novelec_MCCE2.h"