diff --git a/test/Constraints/sr2705.swift b/test/Constraints/issue-45309.swift
similarity index 64%
rename from test/Constraints/sr2705.swift
rename to test/Constraints/issue-45309.swift
index 89459982ac4..454a893f145 100644
--- a/test/Constraints/sr2705.swift
+++ b/test/Constraints/issue-45309.swift
@@ -1,39 +1,39 @@
-// RUN: %target-swift-emit-silgen %s -verify | %FileCheck %s
+// RUN: %target-swift-emit-silgen %s -verify -module-name M | %FileCheck %s
 
 // https://github.com/apple/swift/issues/45309
 
 func f<T>(_: () -> T) {}
 func f<T>(_: @autoclosure () -> T) {}
 
-// CHECK: function_ref @$s6sr27051fyyxyXElF
+// CHECK: function_ref @$s1M1fyyxyXElF
 f { } // OK
 
 func f1<T>(_: () -> T, _: () -> T) {}
 func f1<T>(_: @autoclosure () -> T, _: @autoclosure () -> T) {}
 
-// CHECK: function_ref @$s6sr27052f1yyxyXE_xyXEtlF 
+// CHECK: function_ref @$s1M2f1yyxyXE_xyXEtlF
 f1({}, {}) // OK
 
 func f2<T>(_: () -> T, _: () -> T) { }
 func f2<T>(_: () -> T, _: @autoclosure () -> T) { }
 
-// CHECK: function_ref @$s6sr27052f2yyxyXE_xyXEtlF 
+// CHECK: function_ref @$s1M2f2yyxyXE_xyXEtlF
 f2({}, {}) // OK
 
 func f3(_: () -> Int) {}
 func f3(_: @autoclosure () -> Int) {}
 
-// CHECK: function_ref @$s6sr27052f3yySiyXEF 
+// CHECK: function_ref @$s1M2f3yySiyXEF
 f3 { 0 } // OK
  
 func autoclosure(f: () -> Int) { }
 func autoclosure(f: @autoclosure () -> Int) { }
 func autoclosure(f: Int) { }
 
-// CHECK: function_ref @$s6sr270511autoclosure1fySiyXE_tF
+// CHECK: function_ref @$s1M11autoclosure1fySiyXE_tF
 autoclosure(f: { 0 }) // OK
 
-// CHECK: function_ref @$s6sr27052fnyySiyXEF 
+// CHECK: function_ref @$s1M2fnyySiyXEF
 let _ = autoclosure as (() -> (Int)) -> () // OK
 
 func test(_: (@autoclosure () -> Int) -> Void) {}
@@ -41,5 +41,5 @@ func test(_: (() -> Int) -> Void) {}
 
 func fn(_: () -> Int) {}
 
-// CHECK: function_ref @$s6sr27054testyyySiyXEXEF
+// CHECK: function_ref @$s1M4testyyySiyXEXEF
 test(fn) // OK
diff --git a/test/Constraints/sr4664.swift b/test/Constraints/issue-47241.swift
similarity index 100%
rename from test/Constraints/sr4664.swift
rename to test/Constraints/issue-47241.swift
diff --git a/test/Constraints/sr5252.swift b/test/Constraints/issue-47827.swift
similarity index 100%
rename from test/Constraints/sr5252.swift
rename to test/Constraints/issue-47827.swift
diff --git a/test/Constraints/sr7098.swift b/test/Constraints/issue-49646.swift
similarity index 100%
rename from test/Constraints/sr7098.swift
rename to test/Constraints/issue-49646.swift
diff --git a/test/Constraints/sr7425.swift b/test/Constraints/issue-49968.swift
similarity index 100%
rename from test/Constraints/sr7425.swift
rename to test/Constraints/issue-49968.swift
diff --git a/test/Constraints/sr7875.swift b/test/Constraints/issue-50410.swift
similarity index 100%
rename from test/Constraints/sr7875.swift
rename to test/Constraints/issue-50410.swift
diff --git a/test/Constraints/sr7884.swift b/test/Constraints/issue-50419.swift
similarity index 100%
rename from test/Constraints/sr7884.swift
rename to test/Constraints/issue-50419.swift
diff --git a/test/Constraints/sr9102.swift b/test/Constraints/issue-51599.swift
similarity index 100%
rename from test/Constraints/sr9102.swift
rename to test/Constraints/issue-51599.swift
diff --git a/test/Constraints/sr9626.swift b/test/Constraints/issue-52072.swift
similarity index 66%
rename from test/Constraints/sr9626.swift
rename to test/Constraints/issue-52072.swift
index 2ff7fbd2e94..ac2505ad208 100644
--- a/test/Constraints/sr9626.swift
+++ b/test/Constraints/issue-52072.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-sil -verify %s | %FileCheck %s
+// RUN: %target-swift-frontend -emit-sil -verify -module-name M %s | %FileCheck %s
 
 // https://github.com/apple/swift/issues/52072
 
@@ -15,10 +15,10 @@ func test2<T: BaseClass>(box: Box<T>) -> T.Type {
   return T.self
 }
 
-// CHECK: [[F1:%.*]] = function_ref @$s6sr96263BoxVyACyxGxmcfC
+// CHECK: [[F1:%.*]] = function_ref @$s1M3BoxVyACyxGxmcfC
 // CHECK-NEXT: apply [[F1]]<SubClass>({{.*}}, {{.*}})
 _ = test1(box: .init(SubClass.self))
 
-// CHECK: [[F2:%.*]] = function_ref @$s6sr96265test23boxxmAA3BoxVyxG_tAA9BaseClassCRbzlF
+// CHECK: [[F2:%.*]] = function_ref @$s1M5test23boxxmAA3BoxVyxG_tAA9BaseClassCRbzlF
 // CHECK-NEXT: apply [[F2]]<SubClass>({{.*}})
 _ = test2(box: .init(SubClass.self))
diff --git a/test/Constraints/sr10324.swift b/test/Constraints/issue-52724.swift
similarity index 100%
rename from test/Constraints/sr10324.swift
rename to test/Constraints/issue-52724.swift
diff --git a/test/Constraints/sr10595.swift b/test/Constraints/issue-52995.swift
similarity index 100%
rename from test/Constraints/sr10595.swift
rename to test/Constraints/issue-52995.swift
diff --git a/test/Constraints/sr10728.swift b/test/Constraints/issue-53125.swift
similarity index 100%
rename from test/Constraints/sr10728.swift
rename to test/Constraints/issue-53125.swift
diff --git a/test/Constraints/sr10757.swift b/test/Constraints/issue-53147.swift
similarity index 100%
rename from test/Constraints/sr10757.swift
rename to test/Constraints/issue-53147.swift
diff --git a/test/Constraints/sr10906.swift b/test/Constraints/issue-53296.swift
similarity index 100%
rename from test/Constraints/sr10906.swift
rename to test/Constraints/issue-53296.swift
diff --git a/test/Constraints/sr10914.swift b/test/Constraints/issue-53305.swift
similarity index 100%
rename from test/Constraints/sr10914.swift
rename to test/Constraints/issue-53305.swift
diff --git a/test/Constraints/sr12277.swift b/test/Constraints/issue-54705.swift
similarity index 100%
rename from test/Constraints/sr12277.swift
rename to test/Constraints/issue-54705.swift
diff --git a/test/Constraints/sr12365.swift b/test/Constraints/issue-54799.swift
similarity index 100%
rename from test/Constraints/sr12365.swift
rename to test/Constraints/issue-54799.swift
diff --git a/test/Constraints/sr12383.swift b/test/Constraints/issue-54820.swift
similarity index 100%
rename from test/Constraints/sr12383.swift
rename to test/Constraints/issue-54820.swift
diff --git a/test/Constraints/sr12520.swift b/test/Constraints/issue-54962.swift
similarity index 100%
rename from test/Constraints/sr12520.swift
rename to test/Constraints/issue-54962.swift
diff --git a/test/Constraints/sr12964.swift b/test/Constraints/issue-55410.swift
similarity index 100%
rename from test/Constraints/sr12964.swift
rename to test/Constraints/issue-55410.swift
diff --git a/test/Constraints/sr13183.swift b/test/Constraints/issue-55623.swift
similarity index 100%
rename from test/Constraints/sr13183.swift
rename to test/Constraints/issue-55623.swift
diff --git a/test/Constraints/sr13815.swift b/test/Constraints/issue-56212.swift
similarity index 100%
rename from test/Constraints/sr13815.swift
rename to test/Constraints/issue-56212.swift
diff --git a/test/Constraints/sr13951.swift b/test/Constraints/issue-56348.swift
similarity index 100%
rename from test/Constraints/sr13951.swift
rename to test/Constraints/issue-56348.swift
diff --git a/test/Constraints/sr13992.swift b/test/Constraints/issue-56387.swift
similarity index 100%
rename from test/Constraints/sr13992.swift
rename to test/Constraints/issue-56387.swift
diff --git a/test/Constraints/sr15742.swift b/test/Constraints/issue-58019.swift
similarity index 100%
rename from test/Constraints/sr15742.swift
rename to test/Constraints/issue-58019.swift