diff --git a/ACSLToken.cpp b/ACSLToken.cpp
index 93f505a938b4b28ec2e429f44f065e633f13be4e..35b9ce00fe1cc3ca0296670a62d878552dc2dc34 100644
--- a/ACSLToken.cpp
+++ b/ACSLToken.cpp
@@ -134,7 +134,7 @@ KeywordToken::mapUnicode[] = {
 
 };
 
-std::tr1::unordered_map<std::string, KeywordToken::Type>
+std::unordered_map<std::string, KeywordToken::Type>
 KeywordToken::_unicodeKeywords(
     mapUnicode,
     mapUnicode + sizeof(mapUnicode) / sizeof(mapUnicode[0]));
@@ -238,7 +238,7 @@ KeywordToken::mapUnprotected[] = {
   std::make_pair("allocates", TAllocates)
 };
 
-std::tr1::unordered_map<std::string, KeywordToken::Type>
+std::unordered_map<std::string, KeywordToken::Type>
 KeywordToken::_unprotectedKeywords(
   mapUnprotected,
   mapUnprotected + sizeof(mapUnprotected) / sizeof(mapUnprotected[0]));
@@ -429,13 +429,13 @@ KeywordToken::mapProtected[] = {
   };
 */
 
-std::tr1::unordered_map<std::string, KeywordToken::Type>
+std::unordered_map<std::string, KeywordToken::Type>
 KeywordToken::_protectedKeywords(
   mapProtected,
   mapProtected + sizeof(mapProtected) / sizeof(mapProtected[0]));
 
 /*
-std::tr1::unordered_map<std::string, KeywordToken::Type>
+std::unordered_map<std::string, KeywordToken::Type>
 KeywordToken::_protectedKeywords =
   { { "forall", TForall },
     { "exists", TLExists },
diff --git a/ACSLToken.h b/ACSLToken.h
index 81b2ae6f5a30c5bfe58f19f2e906f979f11ec9ee..b0989a1245e9604704b1f226e208dbf23db9fcea 100644
--- a/ACSLToken.h
+++ b/ACSLToken.h
@@ -28,7 +28,7 @@
 #ifndef ACSL_TokenH
 
 #include "DescentParse.h"
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <sstream>
 
 /** @file */
@@ -258,7 +258,7 @@ class KeywordToken : public AbstractToken {
         TEnd
     };
 
-  typedef std::tr1::unordered_map<std::string, Type> Map;
+  typedef std::unordered_map<std::string, Type> Map;
   typedef std::pair<std::string, KeywordToken::Type> Connection;
 
   static Connection mapUnicode[];
@@ -559,7 +559,7 @@ public:
 
   virtual std::string text() const;
 
-  typedef std::tr1::unordered_map<std::string, Type> Map;
+  typedef std::unordered_map<std::string, Type> Map;
   typedef std::pair<std::string, OperatorPunctuatorToken::Type> Connection;
 
   static Connection mapUnicode[];
diff --git a/tests/da/CLII.cpp b/tests/da/CLII.cpp
index 15f3fd3d9e60d78cf727ecae2ada7a51700f46db..9d3f77af506270efac03f7848003ee9ed625578e 100644
--- a/tests/da/CLII.cpp
+++ b/tests/da/CLII.cpp
@@ -26521,7 +26521,7 @@ public:
 
     virtual char const * what() const throw()
     {
-        return "tr1::bad_weak_ptr";
+        return "bad_weak_ptr";
     }
 };