diff --git a/mert/TER/tercalc.cpp b/mert/TER/tercalc.cpp
index ad7a5a15a..fac17c82b 100644
--- a/mert/TER/tercalc.cpp
+++ b/mert/TER/tercalc.cpp
@@ -892,7 +892,7 @@ namespace TERCPPNS_TERCpp
         }
     }
 
-    vector<vecTerShift> * terCalc::calculerPermutations ( vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCpp::terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign )
+    vector<vecTerShift> * terCalc::calculerPermutations ( vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCPPNS_TERCpp::terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign )
     {
         vector<vecTerShift> * allshifts = new vector<vecTerShift>(0);
 // 	to_return.clear();
@@ -1072,11 +1072,11 @@ namespace TERCPPNS_TERCpp
     }
 
 
-    alignmentStruct terCalc::permuter ( vector< string >& words, TERCpp::terShift& s )
+    alignmentStruct terCalc::permuter ( vector< string >& words, TERCPPNS_TERCpp::terShift& s )
     {
         return permuter ( words, s.start, s.end, s.newloc );
     }
-    alignmentStruct terCalc::permuter ( vector< string >& words, TERCpp::terShift* s )
+    alignmentStruct terCalc::permuter ( vector< string >& words, TERCPPNS_TERCpp::terShift* s )
     {
         return permuter ( words, s->start, s->end, s->newloc );
     }
diff --git a/mert/TER/tercalc.h b/mert/TER/tercalc.h
index bb1c68f15..7fac9d4e3 100644
--- a/mert/TER/tercalc.h
+++ b/mert/TER/tercalc.h
@@ -98,9 +98,9 @@ namespace TERCPPNS_TERCpp
             terAlignment TER ( vector<string>& hyp, vector<string>& ref , float avRefLength );
             terAlignment TER ( vector<string>& hyp, vector<string>& ref );
             terAlignment TER ( vector<int>& hyp, vector<int>& ref );
-            bestShiftStruct * findBestShift ( vector< string >& cur, vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCpp::terAlignment& med_align );
+            bestShiftStruct * findBestShift ( vector< string >& cur, vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCPPNS_TERCpp::terAlignment& med_align );
             void calculateTerAlignment ( terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign );
-            vector<vecTerShift> * calculerPermutations ( vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCpp::terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign );
+            vector<vecTerShift> * calculerPermutations ( vector< string >& hyp, vector< string >& ref, hashMapInfos& rloc, TERCPPNS_TERCpp::terAlignment& align, vector<bool>* herr, vector<bool>* rerr, vector<int>* ralign );
             alignmentStruct permuter ( vector<string>& words, terShift& s );
             alignmentStruct permuter ( vector<string>& words, terShift* s );
             alignmentStruct permuter ( vector<string>& words, int start, int end, int newloc );
diff --git a/mert/TER/tools.cpp b/mert/TER/tools.cpp
index 3c14884df..d03deb1f9 100644
--- a/mert/TER/tools.cpp
+++ b/mert/TER/tools.cpp
@@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "tools.h"
 
 using namespace std;
-using namespace TERCPPNS_boost::xpressive;
+using namespace boost::xpressive;
 namespace TERCPPNS_Tools
 {