4 files changed, 9 insertions, 9 deletions
diff --git a/polly/lib/Exchange/JSONExporter.cpp b/polly/lib/Exchange/JSONExporter.cpp
index d9a2ef1f05e..d9c569b45df 100755
--- a/polly/lib/Exchange/JSONExporter.cpp
+++ b/polly/lib/Exchange/JSONExporter.cpp
@@ -83,7 +83,7 @@ struct JSONImporter : public ScopPass {
 char JSONExporter::ID = 0;
 std::string JSONExporter::getFileName(Scop *S) const {
   std::string FunctionName =
-    S->getRegion().getEntry()->getParent()->getNameStr();
+    S->getRegion().getEntry()->getParent()->getName();
   std::string FileName = FunctionName + "___" + S->getNameStr() + ".jscop";
   return FileName;
 }
@@ -142,7 +142,7 @@ bool JSONExporter::runOnScop(Scop &scop) {
   std::string ErrInfo;
   tool_output_file F(FileName.c_str(), ErrInfo);
 
-  std::string FunctionName = R.getEntry()->getParent()->getNameStr();
+  std::string FunctionName = R.getEntry()->getParent()->getName();
   errs() << "Writing JScop '" << R.getNameStr() << "' in function '"
     << FunctionName << "' to '" << FileName << "'.\n";
 
@@ -182,7 +182,7 @@ Pass *polly::createJSONExporterPass() {
 char JSONImporter::ID = 0;
 std::string JSONImporter::getFileName(Scop *S) const {
   std::string FunctionName =
-    S->getRegion().getEntry()->getParent()->getNameStr();
+    S->getRegion().getEntry()->getParent()->getName();
   std::string FileName = FunctionName + "___" + S->getNameStr() + ".jscop";
 
   if (ImportPostfix != "")
@@ -207,7 +207,7 @@ bool JSONImporter::runOnScop(Scop &scop) {
 
   std::string FileName = ImportDir + "/" + getFileName(S);
 
-  std::string FunctionName = R.getEntry()->getParent()->getNameStr();
+  std::string FunctionName = R.getEntry()->getParent()->getName();
   errs() << "Reading JScop '" << R.getNameStr() << "' in function '"
     << FunctionName << "' from '" << FileName << "'.\n";
   OwningPtr<MemoryBuffer> result;
diff --git a/polly/lib/Exchange/ScopLib.cpp b/polly/lib/Exchange/ScopLib.cpp
index 81db7e3767a..dc183cf0655 100644
--- a/polly/lib/Exchange/ScopLib.cpp
+++ b/polly/lib/Exchange/ScopLib.cpp
@@ -76,7 +76,7 @@ void ScopLib::initializeArrays() {
          VE = ArrayMap.end(); VI != VE; ++VI)
       if ((*VI).second == i) {
         const Value *V = (*VI).first;
-        std::string name = V->getNameStr();
+        std::string name = V->getName();
         scoplib->arrays[i] = (char*) malloc(sizeof(char*) * (name.size() + 1));
         strcpy(scoplib->arrays[i], name.c_str());
       }
diff --git a/polly/lib/Exchange/ScopLibExporter.cpp b/polly/lib/Exchange/ScopLibExporter.cpp
index 24f4ab405ea..583240d51cb 100755
--- a/polly/lib/Exchange/ScopLibExporter.cpp
+++ b/polly/lib/Exchange/ScopLibExporter.cpp
@@ -54,7 +54,7 @@ char ScopLibExporter::ID = 0;
 
 std::string ScopLibExporter::getFileName(Scop *S) const {
   std::string FunctionName =
-    S->getRegion().getEntry()->getParent()->getNameStr();
+    S->getRegion().getEntry()->getParent()->getName();
   std::string FileName = FunctionName + "___" + S->getNameStr() + ".scoplib";
   return FileName;
 }
@@ -76,7 +76,7 @@ bool ScopLibExporter::runOnScop(Scop &scop) {
   scoplib.print(F);
   fclose(F);
 
-  std::string FunctionName = R->getEntry()->getParent()->getNameStr();
+  std::string FunctionName = R->getEntry()->getParent()->getName();
   errs() << "Writing Scop '" << R->getNameStr() << "' in function '"
     << FunctionName << "' to '" << FileName << "'.\n";
 
diff --git a/polly/lib/Exchange/ScopLibImporter.cpp b/polly/lib/Exchange/ScopLibImporter.cpp
index 0a4b97b69d6..bf90857f893 100755
--- a/polly/lib/Exchange/ScopLibImporter.cpp
+++ b/polly/lib/Exchange/ScopLibImporter.cpp
@@ -62,7 +62,7 @@ char ScopLibImporter::ID = 0;
 namespace {
 std::string ScopLibImporter::getFileName(Scop *S) const {
   std::string FunctionName =
-    S->getRegion().getEntry()->getParent()->getNameStr();
+    S->getRegion().getEntry()->getParent()->getName();
   std::string FileName = FunctionName + "___" + S->getNameStr() + ".scoplib";
   return FileName;
 }
@@ -85,7 +85,7 @@ bool ScopLibImporter::runOnRegion(Region *R, RGPassManager &RGM) {
     return false;
   }
 
-  std::string FunctionName = R->getEntry()->getParent()->getNameStr();
+  std::string FunctionName = R->getEntry()->getParent()->getName();
   errs() << "Reading Scop '" << R->getNameStr() << "' in function '"
     << FunctionName << "' from '" << FileName << "'.\n";