6 files changed, 23 insertions, 23 deletions
diff --git a/clang/test/Modules/Inputs/declare-use/module.map b/clang/test/Modules/Inputs/declare-use/module.map
index ae3e90801ec..774fc37760c 100644
--- a/clang/test/Modules/Inputs/declare-use/module.map
+++ b/clang/test/Modules/Inputs/declare-use/module.map
@@ -1,43 +1,43 @@
-module A {
+module XA {
   header "a.h"
 }
 
-module B {
+module XB {
   header "b.h"
 }
 
-module C {
+module XC {
   header "c.h"
-  use A
+  use XA
 }
 
-module D {
+module XD {
   header "d.h"
-  use A
+  use XA
 }
 
-module E {
+module XE {
   header "e.h"
-  use A
-  use B
+  use XA
+  use XB
 }
 
-module F {
+module XF {
   header "f.h"
-  use A
-  use B
+  use XA
+  use XB
 }
 
-module G {
+module XG {
   header "g.h"
   header "g1.h"
-  use C
-  use E
+  use XC
+  use XE
 }
 
-module H {
+module XH {
   header "h.h"
   header "h1.h"
-  use C
-  use E
+  use XC
+  use XE
 }
diff --git a/clang/test/Modules/Inputs/private1/module.map b/clang/test/Modules/Inputs/private1/module.map
index 445c8010db9..0904fe68a62 100644
--- a/clang/test/Modules/Inputs/private1/module.map
+++ b/clang/test/Modules/Inputs/private1/module.map
@@ -1,4 +1,4 @@
-module libPrivate1 {
+module libPrivate {
   header "public1.h"
   private header "private1.h"
 }
diff --git a/clang/test/Modules/Inputs/private2/module.map b/clang/test/Modules/Inputs/private2/module.map
index 6c5efb60209..3d2a5786f9b 100644
--- a/clang/test/Modules/Inputs/private2/module.map
+++ b/clang/test/Modules/Inputs/private2/module.map
@@ -1,4 +1,4 @@
-module libPrivate2 {
+module libPrivateN2 {
   header "public2.h"
   private header "private2.h"
 }
diff --git a/clang/test/Modules/declare-use1.cpp b/clang/test/Modules/declare-use1.cpp
index 5bb7e2a47af..4508017c12d 100644
--- a/clang/test/Modules/declare-use1.cpp
+++ b/clang/test/Modules/declare-use1.cpp
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodules-decluse -fmodule-name=G -I %S/Inputs/declare-use %s -verify
+// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodules-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify
 
 #include "g.h"
 #include "e.h"
diff --git a/clang/test/Modules/declare-use2.cpp b/clang/test/Modules/declare-use2.cpp
index 807962cbdb4..a2ec55e5e5c 100644
--- a/clang/test/Modules/declare-use2.cpp
+++ b/clang/test/Modules/declare-use2.cpp
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodules-decluse -fmodule-name=H -I %S/Inputs/declare-use %s -verify
+// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodules-decluse -fmodule-name=XH -I %S/Inputs/declare-use %s -verify
 
 #include "h.h"
 #include "e.h"
diff --git a/clang/test/Modules/private1.cpp b/clang/test/Modules/private1.cpp
index e4eec0a515c..811a2333d1d 100644
--- a/clang/test/Modules/private1.cpp
+++ b/clang/test/Modules/private1.cpp
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -x objective-c -fmodules-cache-path=%t -fmodules -I %S/Inputs/private0 -I %S/Inputs/private1 -I %S/Inputs/private2 %s -verify
 
 #include "common.h"
-@import libPrivate1;
+@import libPrivateN2;
 #include "private1.h" // expected-error {{use of private header from outside its module}}
 #include "public2.h"
 #include "private2.h" // expected-error {{use of private header from outside its module}}