diff --git a/pom.xml b/pom.xml
index a36985f6334c7ccd8f5dfc0dc9588dcf5c6ea52a..bba5374737a3e618a68c2b411c6e365c675a8374 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.26-SNAPSHOT</version>
+   <version>2.5.26</version>
    <packaging>nar</packaging>
    <name>Electrometers library</name>
    <description>Electrometers library</description>
diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp
index 5cd851f7a3b19078f72d2e6b94e2819644c39f1c..6695583ca0ec9bce8ec25f3035428d4b67df4548 100644
--- a/src/AbstractElectrometerClass.cpp
+++ b/src/AbstractElectrometerClass.cpp
@@ -136,7 +136,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #include "AbstractElectrometerClass.h"
 #include "ElectrometerException.h"
 
diff --git a/src/KeithleyDDCProtocol.cpp b/src/KeithleyDDCProtocol.cpp
index d8884e2808087fc081e24d241d0d9bfb5add3121..443bdbb0b6a151e71976db62ce192418eae02a0b 100644
--- a/src/KeithleyDDCProtocol.cpp
+++ b/src/KeithleyDDCProtocol.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <helpers/XString.h>
+#include <Xstring.h>
 #include "KeithleyDDCProtocol.h"
 
 // ============================================================================
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index ab3dd233cf3e912f5ff45293c4101f9b418c2094..27af68007198cbcf861ab0c6490bc472c1a2770b 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #ifndef WIN32
 # include <unistd.h>
 #endif
diff --git a/src/Keithley_485.cpp b/src/Keithley_485.cpp
index c5540036fcdc13bc10e452e460ba4de9450920e5..5a514d6eae1336cfec907ab44f9455aa89d2918f 100644
--- a/src/Keithley_485.cpp
+++ b/src/Keithley_485.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #include "KeithleyDDCProtocol.h"
 #include "Keithley_485.h"
 
diff --git a/src/Keithley_486.cpp b/src/Keithley_486.cpp
index add4177b9c8b6dae3b0533574f76b1f2fcad6dc9..ba2dcbe1b46f6eaf0c7c91462c745f246c9d9f75 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 <XString.h>
+#include <Xstring.h>
 #include "Keithley_486.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_487.cpp b/src/Keithley_487.cpp
index 231cffa55e763d2411832c674c6be96136e292c0..fd0f17fd5084cf95e322abec4e297bf0c9d5c05f 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 <XString.h>
+#include <Xstring.h>
 #include "Keithley_487.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_617.cpp b/src/Keithley_617.cpp
index 01d5749d8c1bae7d43d4507d1b0f12a1815cacac..dc70d1891c4eada6197066597cd7ce722eaca780 100644
--- a/src/Keithley_617.cpp
+++ b/src/Keithley_617.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #include "Keithley_617.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_6485.cpp b/src/Keithley_6485.cpp
index fda7b0e5a2f20d148e71c7a2249d12832159f9ff..5088fec357564144431f5914cc35858ae2f434bb 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 <XString.h>
+#include <Xstring.h>
 #include "Keithley_6485.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/Keithley_6487.cpp b/src/Keithley_6487.cpp
index 10c84a766857dd5bc28e4bac75475869eb6bf264..95e499548ea4d3850adca8ede4be1fad647129f4 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 <XString.h>
+#include <Xstring.h>
 #include "Keithley_6487.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/Keithley_6512.cpp b/src/Keithley_6512.cpp
index fabb24550d91cf3c40bcea8074228e8182b2495c..8919229c04d557b2cdb1013c82a06938f38cc4b4 100644
--- a/src/Keithley_6512.cpp
+++ b/src/Keithley_6512.cpp
@@ -18,7 +18,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #include "Keithley_6512.h"
 #include "KeithleyDDCProtocol.h"
 
diff --git a/src/Keithley_6514.cpp b/src/Keithley_6514.cpp
index 1086df254c5c851a109f1b4fb5642c579d158ca2..6d56793f80f4acd5cac848cf4ebef379a6f9f6a5 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 <XString.h>
+#include <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 62da72afbdca2be70e6c3f5935c9d3a2c55c0d4b..d65dd9af32f694f4a17986cdf22eaeb49d7c0764 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 <XString.h>
+#include <Xstring.h>
 #include "Keithley_6517.h"
 #include "KeithleySCPIProtocol.h"
 /*
diff --git a/src/N_PhotoConducteur.cpp b/src/N_PhotoConducteur.cpp
index 9c3ff0e0f3f8d20a23cf903daf70817b6a5fe651..a40516cad4ad41494a365959eb3830f22dc7da8b 100644
--- a/src/N_PhotoConducteur.cpp
+++ b/src/N_PhotoConducteur.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #include "N_PhotoConducteur.h"
 #include "NovelecProtocol.h"
 /*
diff --git a/src/N_PhotoVoltaique.cpp b/src/N_PhotoVoltaique.cpp
index 6b078d026345ff1e529adcee09dac428a61d090c..2a7046532b80c606255b53191f57b9ab7d7b3d59 100644
--- a/src/N_PhotoVoltaique.cpp
+++ b/src/N_PhotoVoltaique.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #include "N_PhotoVoltaique.h"
 #include "NovelecProtocol.h"
 /*
diff --git a/src/NovelecProtocol.cpp b/src/NovelecProtocol.cpp
index cf173e62ca6040414f563863fa32688a9fcbbd18..60529a59da46359c164d2a5335cb5be6e0293453 100644
--- a/src/NovelecProtocol.cpp
+++ b/src/NovelecProtocol.cpp
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #include "NovelecProtocol.h"
 
 //- commands numbers
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index 433ecf1dcd2dee5f1a0117a89b2ae47008bd337c..4c6329b7c01a2cc0a3739b12d3786d4ecab0fa64 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <XString.h>
+#include <Xstring.h>
 #include "NovelecProtocol.h"
 #include "Novelec_MCCE2.h"