diff --git a/CheckFunctionUsage.cpp b/CheckFunctionUsage.cpp
index 59bb3fbd4..a075bff6c 100644
--- a/CheckFunctionUsage.cpp
+++ b/CheckFunctionUsage.cpp
@@ -71,7 +71,7 @@ void CheckFunctionUsage::parseTokens( const Tokenizer &tokenizer )
 
         if ( funcname )
         {
-            FunctionUsage &func = _functions[ funcname->aaaa() ];
+            FunctionUsage &func = _functions[ funcname->str() ];
 
             // No filename set yet..
             if (func.filename.empty())
@@ -123,7 +123,7 @@ void CheckFunctionUsage::parseTokens( const Tokenizer &tokenizer )
 
         if ( funcname )
         {
-            FunctionUsage &func = _functions[ funcname->aaaa() ];
+            FunctionUsage &func = _functions[ funcname->str() ];
 
             if ( func.filename.empty() || func.filename == "+" )
                 func.usedOtherFile = true;
diff --git a/testsimplifytokens.cpp b/testsimplifytokens.cpp
index 31638f278..d4169b23e 100644
--- a/testsimplifytokens.cpp
+++ b/testsimplifytokens.cpp
@@ -49,7 +49,7 @@ private:
         std::string ret;
         for ( const TOKEN *tok = tokenizer.tokens(); tok; tok = tok->next() )
         {
-            ret += std::string(tok->aaaa()) + " ";
+            ret += tok->str() + " ";
         }
 
         return ret;