diff --git a/src/tests/JIT/Directed/Convert/implicitConv.il b/src/tests/JIT/Directed/Convert/implicitConv.il
index 4c5f3f08267afd..2b1476d73fb8c4 100644
--- a/src/tests/JIT/Directed/Convert/implicitConv.il
+++ b/src/tests/JIT/Directed/Convert/implicitConv.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly ILGEN_0xc60e022c {}
+.assembly 'implicitConv' {}
 .assembly extern mscorlib{auto}
 
 .class ILGEN_0xc60e022c {
diff --git a/src/tests/JIT/Directed/Convert/ldind_conv.il b/src/tests/JIT/Directed/Convert/ldind_conv.il
index d4b74a707c39e0..574aa4407fab22 100644
--- a/src/tests/JIT/Directed/Convert/ldind_conv.il
+++ b/src/tests/JIT/Directed/Convert/ldind_conv.il
@@ -7,7 +7,7 @@
 .assembly extern System.Console { auto }
 .assembly extern System.Runtime { auto }
 
-.assembly test { }
+.assembly 'ldind_conv' { }
 
 .class auto Program extends [System.Runtime]System.Object
 {
diff --git a/src/tests/JIT/Directed/Convert/minopts_convu1.il b/src/tests/JIT/Directed/Convert/minopts_convu1.il
index 38d0371754797a..97162313dd030d 100644
--- a/src/tests/JIT/Directed/Convert/minopts_convu1.il
+++ b/src/tests/JIT/Directed/Convert/minopts_convu1.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly ILGEN_0xb0847955 {}
+.assembly 'minopts_convu1' {}
 .assembly extern mscorlib{auto}
 
 .class ILGEN_0xb0847955 {
diff --git a/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il b/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il
index 6036a85b733a19..9b4ce90ddb9a62 100644
--- a/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il
+++ b/src/tests/JIT/Directed/Convert/signed_overflow_conversions_are_not_treated_as_unsigned.il
@@ -4,7 +4,7 @@
 .assembly extern System.Console { auto }
 .assembly extern xunit.core {}
 .assembly extern System.Runtime { auto }
-.assembly SignedOverflowConversionsAreNotTreatedAsUnsigned { }
+.assembly 'signed_overflow_conversions_are_not_treated_as_unsigned' { }
 
 .class auto SignedOverflowConversionsAreNotTreatedAsUnsigned extends [System.Runtime]System.Object
 {
diff --git a/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il b/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il
index a22fd8ceb87bbf..9552dea1ad5860 100644
--- a/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il
+++ b/src/tests/JIT/Directed/FaultHandlers/CallOrder/CallOrder.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly callorder
+.assembly 'CallOrder'
 {
 }
 //------------------------------------------------------
diff --git a/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il b/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il
index c0b96691a33cf3..e495f357c05338 100644
--- a/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il
+++ b/src/tests/JIT/Directed/FaultHandlers/Nesting/Nesting.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly nesting
+.assembly 'Nesting'
 {
 }
 .class public auto ansi X
diff --git a/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il b/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il
index 2249a55d754513..b765b642febe82 100644
--- a/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il
+++ b/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il
@@ -3,7 +3,6 @@
 
 
 
-.module 'aaa.exe'
 .assembly extern legacy library mscorlib {}
 .assembly extern xunit.core {}
 .assembly extern System.Console
@@ -11,7 +10,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'aaa'// as "aaa"
+.assembly 'Jittailcall2'// as "aaa"
 {
   
   
diff --git a/src/tests/JIT/Directed/RVAInit/extended.il b/src/tests/JIT/Directed/RVAInit/extended.il
index ecc018d9be3b17..29745f7bd2a54b 100644
--- a/src/tests/JIT/Directed/RVAInit/extended.il
+++ b/src/tests/JIT/Directed/RVAInit/extended.il
@@ -17,7 +17,6 @@
 .assembly extended
 {
 }
-.module extended.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 
 .file alignment 512
diff --git a/src/tests/JIT/Directed/RVAInit/gcref1.il b/src/tests/JIT/Directed/RVAInit/gcref1.il
index aee3b7e859b406..192336148157de 100644
--- a/src/tests/JIT/Directed/RVAInit/gcref1.il
+++ b/src/tests/JIT/Directed/RVAInit/gcref1.il
@@ -18,7 +18,6 @@
 .assembly gcref1
 {
 }
-.module gcref1.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 
 
diff --git a/src/tests/JIT/Directed/RVAInit/gcref2.il b/src/tests/JIT/Directed/RVAInit/gcref2.il
index 5c5d3c2c00ef19..411e85c3e22347 100644
--- a/src/tests/JIT/Directed/RVAInit/gcref2.il
+++ b/src/tests/JIT/Directed/RVAInit/gcref2.il
@@ -18,7 +18,6 @@
 .assembly gcref2
 {
 }
-.module gcref1.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 
 
diff --git a/src/tests/JIT/Directed/RVAInit/nested.il b/src/tests/JIT/Directed/RVAInit/nested.il
index c177c47dc5179c..6df75aed2540b3 100644
--- a/src/tests/JIT/Directed/RVAInit/nested.il
+++ b/src/tests/JIT/Directed/RVAInit/nested.il
@@ -18,7 +18,6 @@
 .assembly 'nested'
 {
 }
-.module nested.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 
 .file alignment 512
diff --git a/src/tests/JIT/Directed/RVAInit/oddsize.il b/src/tests/JIT/Directed/RVAInit/oddsize.il
index 0b2a43a8ebc337..8c04d8da0ed1fd 100644
--- a/src/tests/JIT/Directed/RVAInit/oddsize.il
+++ b/src/tests/JIT/Directed/RVAInit/oddsize.il
@@ -8,10 +8,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test
+.assembly 'oddsize'
 {
 }
-.module test.exe
 // MVID: {3DA3EDA0-F1A4-42F9-8E0B-F269420E91A5}
 
 .file alignment 512
diff --git a/src/tests/JIT/Directed/RVAInit/overlap.il b/src/tests/JIT/Directed/RVAInit/overlap.il
index 5b87cd461cdc30..19463e014307f5 100644
--- a/src/tests/JIT/Directed/RVAInit/overlap.il
+++ b/src/tests/JIT/Directed/RVAInit/overlap.il
@@ -17,7 +17,6 @@
 .assembly overlap
 {
 }
-.module overlap.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 
 .file alignment 512
diff --git a/src/tests/JIT/Directed/RVAInit/simplearg.il b/src/tests/JIT/Directed/RVAInit/simplearg.il
index b85763c6d801d6..58f37053de47df 100644
--- a/src/tests/JIT/Directed/RVAInit/simplearg.il
+++ b/src/tests/JIT/Directed/RVAInit/simplearg.il
@@ -11,7 +11,7 @@
   .ver 4:0:0:0
 }
 .assembly extern xunit.core {}
-.assembly repro2
+.assembly 'simplearg'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -19,7 +19,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module repro2.exe
 // MVID: {07A1F03C-A750-4BCF-8997-C0AC2CBDB844}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Directed/UnrollLoop/loop3.il b/src/tests/JIT/Directed/UnrollLoop/loop3.il
index 629704fd2c48e6..be0bc67203a0d3 100644
--- a/src/tests/JIT/Directed/UnrollLoop/loop3.il
+++ b/src/tests/JIT/Directed/UnrollLoop/loop3.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly loop2 {}
+.assembly 'loop3' {}
 .class private auto ansi beforefieldinit A
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il
index ced1a9eed4a280..fc33ce9a308cf2 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/badldsfld.il
@@ -3,7 +3,7 @@
 
 .assembly extern mscorlib {}
 .assembly extern xunit.core {}
-.assembly badldslfd { }
+.assembly 'badldsfld' { }
 .class Test_badldsfld extends [mscorlib]System.Object
 {
 .field int32 i
diff --git a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il
index 502523cb02ff6a..a32015ef545135 100644
--- a/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il
+++ b/src/tests/JIT/Directed/coverage/importer/Desktop/nullsdarr.il
@@ -9,7 +9,7 @@
 }
 .assembly extern xunit.core {}
 .assembly extern legacy library mscorlib {}
-.assembly legacy library arrlen { }
+.assembly legacy library 'nullsdarr' { }
 .class private auto ansi beforefieldinit nullsdarr
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Directed/coverage/importer/nullsdarr.il b/src/tests/JIT/Directed/coverage/importer/nullsdarr.il
index 0e0f78b791fa93..a9e89d3e2ad2ce 100644
--- a/src/tests/JIT/Directed/coverage/importer/nullsdarr.il
+++ b/src/tests/JIT/Directed/coverage/importer/nullsdarr.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly legacy library arrlen {}
+.assembly legacy library 'nullsdarr' {}
 .class private auto ansi beforefieldinit nullsdarr
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il
index 7443055eb2eb0b..cd43d404450441 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/ldfldstatic.il
@@ -8,8 +8,7 @@
 }
 .assembly extern xunit.core {}
 .assembly extern legacy library mscorlib {}
-.assembly ldflds {}
-.module ldfldstatic.exe
+.assembly 'ldfldstatic' {}
 .class private auto ansi beforefieldinit ldfldstatic
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il
index 2fe97a97014523..89c700237f4abe 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly2.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly switchdefaultonly1 {}
+.assembly 'switchdefaultonly2' {}
 .class private auto ansi beforefieldinit switchdefaultonly1
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il
index 8a03aadc3eca48..a6f55389a7a32f 100644
--- a/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il
+++ b/src/tests/JIT/Directed/coverage/oldtests/switchdefaultonly3.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly switchdefaultonly1 {}
+.assembly 'switchdefaultonly3' {}
 .class private auto ansi beforefieldinit switchdefaultonly1
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Directed/forceinlining/AttributeConflict.il b/src/tests/JIT/Directed/forceinlining/AttributeConflict.il
index 77d652a488022b..c61fce4a308a64 100644
--- a/src/tests/JIT/Directed/forceinlining/AttributeConflict.il
+++ b/src/tests/JIT/Directed/forceinlining/AttributeConflict.il
@@ -18,7 +18,6 @@
 {
 }
 
-.module AttributeConflict.exe
 
 .class public auto ansi beforefieldinit P
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Directed/forceinlining/NegativeCases.il b/src/tests/JIT/Directed/forceinlining/NegativeCases.il
index a4e8f8eb264f90..5e330971f12f22 100644
--- a/src/tests/JIT/Directed/forceinlining/NegativeCases.il
+++ b/src/tests/JIT/Directed/forceinlining/NegativeCases.il
@@ -18,7 +18,6 @@
 {
 }
 
-.module NegativeCases.exe
 
 .class public auto ansi beforefieldinit P
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Directed/forceinlining/PositiveCases.il b/src/tests/JIT/Directed/forceinlining/PositiveCases.il
index 02537d0464358f..70d3c080d4e433 100644
--- a/src/tests/JIT/Directed/forceinlining/PositiveCases.il
+++ b/src/tests/JIT/Directed/forceinlining/PositiveCases.il
@@ -18,7 +18,6 @@
 {
 }
 
-.module PositiveCases.exe
 
 .class public sequential ansi sealed beforefieldinit S
        extends [mscorlib]System.ValueType
diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il
index cfc557b9c23978..04d1b8eeffb60d 100644
--- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il
+++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic1.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 4:0:0:0
 }
-.assembly o
+.assembly 'rva_rvaStatic1'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   
@@ -22,7 +22,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module o.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il
index 5ef9b79d8bb96f..249be975165c38 100644
--- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il
+++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic2.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 4:0:0:0
 }
-.assembly o
+.assembly 'rva_rvaStatic2'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   
@@ -22,7 +22,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module o.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il
index 3b2209584a3dcb..4cec2514b139a0 100644
--- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il
+++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic3.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 4:0:0:0
 }
-.assembly o
+.assembly 'rva_rvaStatic3'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   
@@ -22,7 +22,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module o.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il
index 7859bb1d04f4b1..49b8a62952d12d 100644
--- a/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il
+++ b/src/tests/JIT/Directed/intrinsic/interlocked/rva_rvaStatic4.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 4:0:0:0
 }
-.assembly o
+.assembly 'rva_rvaStatic4'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   
@@ -22,7 +22,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module o.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Directed/leave/catch1.il b/src/tests/JIT/Directed/leave/catch1.il
index 2219c41298420a..41ac2254db77d0 100644
--- a/src/tests/JIT/Directed/leave/catch1.il
+++ b/src/tests/JIT/Directed/leave/catch1.il
@@ -11,7 +11,6 @@
 .assembly catch1
 {
 }
-.module catch1.exe
 .class private sealed VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/leave/catch2.il b/src/tests/JIT/Directed/leave/catch2.il
index bad14490a2a9b3..22569aee6e5d3c 100644
--- a/src/tests/JIT/Directed/leave/catch2.il
+++ b/src/tests/JIT/Directed/leave/catch2.il
@@ -11,7 +11,6 @@
 .assembly catch2
 { 
 }
-.module catch2.exe 
 .class private  sealed  VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/leave/catch3.il b/src/tests/JIT/Directed/leave/catch3.il
index fa10779ab8415a..10ff037ce2b7fa 100644
--- a/src/tests/JIT/Directed/leave/catch3.il
+++ b/src/tests/JIT/Directed/leave/catch3.il
@@ -11,7 +11,6 @@
 .assembly catch3
 {
 }
-.module catch3.exe
 .class private sealed VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/leave/filter1.il b/src/tests/JIT/Directed/leave/filter1.il
index 19bb70087f82e3..3c98c8c5af3f06 100644
--- a/src/tests/JIT/Directed/leave/filter1.il
+++ b/src/tests/JIT/Directed/leave/filter1.il
@@ -11,7 +11,6 @@
 .assembly filter1
 {
 }
-.module filter1.exe
 .class private sealed VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/leave/filter2.il b/src/tests/JIT/Directed/leave/filter2.il
index 475e505220ad4b..63ba8df9b4d98b 100644
--- a/src/tests/JIT/Directed/leave/filter2.il
+++ b/src/tests/JIT/Directed/leave/filter2.il
@@ -11,7 +11,6 @@
 .assembly filter2
 { 
 }
-.module filter2.exe 
 .class private  sealed  VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/leave/filter3.il b/src/tests/JIT/Directed/leave/filter3.il
index aa30362476c05f..12a6e3d1fa9262 100644
--- a/src/tests/JIT/Directed/leave/filter3.il
+++ b/src/tests/JIT/Directed/leave/filter3.il
@@ -11,7 +11,6 @@
 .assembly filter3
 {
 }
-.module filter3.exe
 .class private sealed VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/leave/try1.il b/src/tests/JIT/Directed/leave/try1.il
index 8fc2879bf00aa6..f40f7801caee02 100644
--- a/src/tests/JIT/Directed/leave/try1.il
+++ b/src/tests/JIT/Directed/leave/try1.il
@@ -13,7 +13,6 @@
 .assembly try1
 {
 }
-.module try1.exe
 .class private sealed VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/leave/try2.il b/src/tests/JIT/Directed/leave/try2.il
index c2906e820189c7..25b44082a95db4 100644
--- a/src/tests/JIT/Directed/leave/try2.il
+++ b/src/tests/JIT/Directed/leave/try2.il
@@ -11,7 +11,6 @@
 .assembly try2
 { 
 }
-.module try2.exe 
 .class private  sealed  VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/leave/try3.il b/src/tests/JIT/Directed/leave/try3.il
index 209c6478163e85..e9beb1aef661e2 100644
--- a/src/tests/JIT/Directed/leave/try3.il
+++ b/src/tests/JIT/Directed/leave/try3.il
@@ -11,7 +11,6 @@
 .assembly try3
 {
 }
-.module try3.exe
 .class private sealed VT
        extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il b/src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il
index 58622d4213227e..40483bbfb0a0d2 100644
--- a/src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il
+++ b/src/tests/JIT/Directed/pinning/object-pin/Object-Pin.il
@@ -6,7 +6,7 @@
 }
 .assembly extern xunit.core {}
 .assembly extern legacy library mscorlib {}
-.assembly objectpin
+.assembly 'Object-Pin'
 {
 }
 
diff --git a/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il b/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il
index 24d2542dff82de..71cdbf78d35724 100644
--- a/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il
+++ b/src/tests/JIT/Directed/pinvoke/preemptive_cooperative.il
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
-.module extern kernel32.dll
 .assembly extern System.Console { auto }
 .assembly extern xunit.core {}
 .assembly extern System.Threading.Thread { auto }
diff --git a/src/tests/JIT/Directed/pinvoke/sysinfo.il b/src/tests/JIT/Directed/pinvoke/sysinfo.il
index a3dd590d18c9fb..c9d2279c2156a5 100644
--- a/src/tests/JIT/Directed/pinvoke/sysinfo.il
+++ b/src/tests/JIT/Directed/pinvoke/sysinfo.il
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.module extern kernel32
 .assembly extern mscorlib { }
 .assembly extern xunit.core {}
 .assembly extern System.Console
diff --git a/src/tests/JIT/Directed/pinvoke/tail.il b/src/tests/JIT/Directed/pinvoke/tail.il
index cd377c77b6b391..1629d1d1be534f 100644
--- a/src/tests/JIT/Directed/pinvoke/tail.il
+++ b/src/tests/JIT/Directed/pinvoke/tail.il
@@ -9,7 +9,7 @@
 .assembly extern xunit.core {}
 
 .assembly extern mscorlib { }
-.assembly menus { }
+.assembly 'tail' { }
 .namespace JitTest
 {
   .class private auto ansi beforefieldinit Test
diff --git a/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.il b/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.il
index 067ce4cc281c76..cc7a1f75ba9509 100644
--- a/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.il
+++ b/src/tests/JIT/Directed/rvastatics/RVAOrderingTest.il
@@ -6,7 +6,6 @@
 .assembly extern System.Runtime.Extensions { }
 .assembly extern System.Console { }
 .assembly RVAOrderingTest { }
-.module RVAOrderingTest.exe
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/src/tests/JIT/Directed/shift/int8.il b/src/tests/JIT/Directed/shift/int8.il
index 913ab2dc5ba6d7..9bcac3bf3ab778 100644
--- a/src/tests/JIT/Directed/shift/int8.il
+++ b/src/tests/JIT/Directed/shift/int8.il
@@ -13,7 +13,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly int8test
+.assembly 'int8'
 {
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -21,7 +21,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module int8.exe
 // MVID: {DA4EAAAA-684F-4AB1-AC9B-90B895DBBD60}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Directed/shift/nativeint.il b/src/tests/JIT/Directed/shift/nativeint.il
index 4b1e84a8ffa4b8..21c4e2dcf13705 100644
--- a/src/tests/JIT/Directed/shift/nativeint.il
+++ b/src/tests/JIT/Directed/shift/nativeint.il
@@ -13,7 +13,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly nativeinttest
+.assembly 'nativeint'
 {
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -21,7 +21,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module nativeint.exe
 // MVID: {DA4EAAAA-684F-4AB1-AC9B-90B895DBBD60}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Directed/shift/nativeuint.il b/src/tests/JIT/Directed/shift/nativeuint.il
index f2aecf73a64fbf..363606398a66b1 100644
--- a/src/tests/JIT/Directed/shift/nativeuint.il
+++ b/src/tests/JIT/Directed/shift/nativeuint.il
@@ -13,7 +13,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly nativeuinttest
+.assembly 'nativeuint'
 {
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -21,7 +21,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module nativeuint.exe
 // MVID: {DA4EAAAA-684F-4AB1-AC9B-90B895DBBD60}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Directed/tailcall/more_tailcalls.il b/src/tests/JIT/Directed/tailcall/more_tailcalls.il
index 3dae96347c7d93..ef42d5fd330580 100644
--- a/src/tests/JIT/Directed/tailcall/more_tailcalls.il
+++ b/src/tests/JIT/Directed/tailcall/more_tailcalls.il
@@ -43,7 +43,6 @@
   .hash algorithm 0x00008004
   .ver 1:0:0:0
 }
-.module more_tailcalls.dll
 // MVID: {81332D24-430E-4E25-88E2-383124EB3597}
 .custom instance void [System.Runtime]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x00400000
diff --git a/src/tests/JIT/Directed/tailcall/tailcall.il b/src/tests/JIT/Directed/tailcall/tailcall.il
index 0a0cec99a0b31a..c65aa97ccb35b1 100644
--- a/src/tests/JIT/Directed/tailcall/tailcall.il
+++ b/src/tests/JIT/Directed/tailcall/tailcall.il
@@ -13,7 +13,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module tailcall.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Directed/zeroinit/Dev10_863995.il b/src/tests/JIT/Directed/zeroinit/Dev10_863995.il
index 27cde55a025e0e..b9eb386450d181 100644
--- a/src/tests/JIT/Directed/zeroinit/Dev10_863995.il
+++ b/src/tests/JIT/Directed/zeroinit/Dev10_863995.il
@@ -19,7 +19,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Dev10_863995.exe
 // MVID: {264E6DC2-22B6-4B9F-A4E7-582E65FCAB22}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Generics/regression/DDB148379/ddb148379.il b/src/tests/JIT/Generics/regression/DDB148379/ddb148379.il
index daadbbeba9b145..b0dfb21a68e3d8 100644
--- a/src/tests/JIT/Generics/regression/DDB148379/ddb148379.il
+++ b/src/tests/JIT/Generics/regression/DDB148379/ddb148379.il
@@ -18,7 +18,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly crash
+.assembly 'ddb148379'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -26,7 +26,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module crash.exe
 // MVID: {29D488A1-3C00-4F7C-86C0-B123ECE8AAA6}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.il
index b6eab5cdcc11fa..ca71ad7ab50ddd 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.il
@@ -12,7 +12,7 @@
 //Correct behavior expects the code within the try block to throw an exception.
 //Included return code for failure if no exception is thrown.
 
-.assembly Class_test {}
+.assembly 'conv_ovf_i1_un' {}
 .assembly extern mscorlib{auto}
 .class Class_test {
     .method static int32 Main() {
diff --git a/src/tests/JIT/Intrinsics/CreateSpan_il.il b/src/tests/JIT/Intrinsics/CreateSpan_il.il
index 61421a584392c7..d6a269b6f4d5f4 100644
--- a/src/tests/JIT/Intrinsics/CreateSpan_il.il
+++ b/src/tests/JIT/Intrinsics/CreateSpan_il.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )                         // .?_....:
   .ver 7:0:0:0
 }
-.assembly CreateSpan_ro
+.assembly 'CreateSpan_il'
 {
   .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [System.Runtime]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module CreateSpan_ro.dll
 // MVID: {E6E30CA2-CC29-4014-B26A-79C94A13BF58}
 .custom instance void [System.Runtime]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x00400000
diff --git a/src/tests/JIT/Intrinsics/TypeIntrinsics_il.il b/src/tests/JIT/Intrinsics/TypeIntrinsics_il.il
index 5d467fdf116c08..51696870df98b5 100644
--- a/src/tests/JIT/Intrinsics/TypeIntrinsics_il.il
+++ b/src/tests/JIT/Intrinsics/TypeIntrinsics_il.il
@@ -5,7 +5,7 @@
 .assembly extern xunit.core {}
 .assembly extern System.Runtime { auto }
 
-.assembly TypeIntrinsicsTests { }
+.assembly 'TypeIntrinsics_il' { }
 
 .class private auto ansi beforefieldinit Test_TypeIntrinsics_il
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_b.il b/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
index db81e19c9ace58..84c0771680cbb6 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_b.il
@@ -19,7 +19,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'huge_b'
 {
 
 
@@ -27,7 +27,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il b/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
index dba6e8bc32cfe1..0e8b353b4fede2 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_i4.il
@@ -19,7 +19,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'huge_i4'
 {
 
 
@@ -27,7 +27,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il b/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
index 2e35a08a50ad1f..313d277c88bc29 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_objref.il
@@ -15,11 +15,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly 'test'
+.assembly 'huge_objref'
 {
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi sealed TestClass extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
index c48622b05a92e1..bb92a5c83ce8f6 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r4.il
@@ -19,7 +19,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'huge_r4'
 {
 
 
@@ -27,7 +27,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il b/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
index 83eae794fbd1f0..1b13ba7598097c 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_r8.il
@@ -19,7 +19,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'huge_r8'
 {
 
 
@@ -27,7 +27,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il b/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
index 8fb1ba9942ec39..29863e2435b62d 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_struct.il
@@ -19,7 +19,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'huge_struct'
 {
 
 
@@ -27,7 +27,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class value private auto ansi sealed TestStruct extends [mscorlib]System.ValueType
diff --git a/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il b/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
index d8e0d98d4453e2..abdf2a1b4760c2 100644
--- a/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
+++ b/src/tests/JIT/Methodical/Arrays/huge/huge_u8.il
@@ -19,7 +19,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'huge_u8'
 {
 
 
@@ -27,7 +27,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/huge_struct.il b/src/tests/JIT/Methodical/Arrays/huge_struct.il
index 7fa2cab056b309..f774a4efcb79e1 100644
--- a/src/tests/JIT/Methodical/Arrays/huge_struct.il
+++ b/src/tests/JIT/Methodical/Arrays/huge_struct.il
@@ -21,7 +21,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'huge_strcut.exe'
 // MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
index 1eb997d87f3b45..5c7529de4ea8db 100644
--- a/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
+++ b/src/tests/JIT/Methodical/Arrays/lcs/lcs_ldlen.il
@@ -13,7 +13,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'lcs'// as "lcs"
+.assembly 'lcs_ldlen'// as "lcs"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -22,7 +22,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'lcs.exe'
 // MVID: {52ED7FCA-78F1-42F6-8DE5-7388302AFAA6}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Arrays/misc/address.il b/src/tests/JIT/Methodical/Arrays/misc/address.il
index f61177f5180591..3f8ecc1360d62c 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/address.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/address.il
@@ -16,11 +16,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly 'test'
+.assembly 'address'
 {
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/misc/arrres.il b/src/tests/JIT/Methodical/Arrays/misc/arrres.il
index f92613763b9f28..4374f269a72226 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/arrres.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/arrres.il
@@ -20,7 +20,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'arrres.exe'
 .namespace GCTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/misc/gcarr.il b/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
index f4636f2ccb39ee..2341ecc369d3c2 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/gcarr.il
@@ -20,7 +20,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'gcarr.exe'
 .namespace GCTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
index 2f01b499490648..82fbad3f6b1000 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray.il
@@ -12,7 +12,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module initializearray.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
index cc44e1fbd0c47a..f16a742294e447 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/initializearray_enum.il
@@ -76,7 +76,6 @@ class My {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module initializearray_enum.exe
 // MVID: {88A311DA-3D49-42AC-8FA7-6DB1266177BC}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
index 6e524525d680f1..b43b63976f0719 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/ldelem_get.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'ldelem_get'
 {
 
 
@@ -29,7 +29,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/misc/length0.il b/src/tests/JIT/Methodical/Arrays/misc/length0.il
index 261dbf113b8f38..20287f848a20cc 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/length0.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/length0.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'length0'
 {
 
 
@@ -28,7 +28,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il b/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
index ce5398798ed6c7..65dbcefeda3640 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/lengthm2.il
@@ -13,7 +13,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'lengthm2'
 {
 
 
@@ -22,7 +22,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Arrays/misc/selfref.il b/src/tests/JIT/Methodical/Arrays/misc/selfref.il
index a720ba9de5492e..32ed4e32937e9e 100644
--- a/src/tests/JIT/Methodical/Arrays/misc/selfref.il
+++ b/src/tests/JIT/Methodical/Arrays/misc/selfref.il
@@ -22,7 +22,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'selfref.exe'
 // MVID: {57800D71-6F51-4ACF-BC86-8F3D2FBAC8E1}
 .namespace GCTest
 {
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range1.il b/src/tests/JIT/Methodical/Arrays/range/float64_range1.il
index 592e259cd39eda..bcfd27cb05a022 100644
--- a/src/tests/JIT/Methodical/Arrays/range/float64_range1.il
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range1.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'float64_range1'
 {
 
 
@@ -29,7 +29,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/float64_range2.il b/src/tests/JIT/Methodical/Arrays/range/float64_range2.il
index 3e48be20777dba..418a7e1df4fd7d 100644
--- a/src/tests/JIT/Methodical/Arrays/range/float64_range2.il
+++ b/src/tests/JIT/Methodical/Arrays/range/float64_range2.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'float64_range2'
 {
 
 
@@ -29,7 +29,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0.il b/src/tests/JIT/Methodical/Arrays/range/int32_0.il
index c9c5c1c31a8e21..4ffc99fd5c507b 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'int32_0'
 {
 
 
@@ -28,7 +28,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a.il
index adc559d52dc267..be3a994e3b5e47 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_5a.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5a.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'int32_0_5a'
 {
 
 
@@ -28,7 +28,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b.il b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b.il
index adc559d52dc267..f125e1f28996ab 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_0_5b.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_0_5b.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'int32_0_5b'
 {
 
 
@@ -28,7 +28,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_1.il b/src/tests/JIT/Methodical/Arrays/range/int32_1.il
index fec49174d3d5c9..52ae6b78c9e541 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_1.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_1.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'int32_1'
 {
 
 
@@ -28,7 +28,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_m1.il b/src/tests/JIT/Methodical/Arrays/range/int32_m1.il
index 043b36436d06d3..7503b30381cbea 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_m1.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_m1.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'int32_m1'
 {
 
 
@@ -28,7 +28,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range.il b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range.il
index 0a1a52f5276ec5..45120d12bc8222 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_neg_range.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_neg_range.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'int32_neg_range'
 {
 
 
@@ -28,7 +28,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range1.il b/src/tests/JIT/Methodical/Arrays/range/int32_range1.il
index 990833bd6ae738..a024b17480a157 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_range1.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range1.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'int32_range1'
 {
 
 
@@ -29,7 +29,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/int32_range2.il b/src/tests/JIT/Methodical/Arrays/range/int32_range2.il
index a22bb294cdf1c1..73c21051b4aa7e 100644
--- a/src/tests/JIT/Methodical/Arrays/range/int32_range2.il
+++ b/src/tests/JIT/Methodical/Arrays/range/int32_range2.il
@@ -20,7 +20,7 @@
            
   
 }
-.assembly 'test'
+.assembly 'int32_range2'
 {
 
 
@@ -29,7 +29,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
index 9dfbbd6ffd58c3..11bae844f16e08 100644
--- a/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
+++ b/src/tests/JIT/Methodical/Arrays/range/negIndexRngChkElim.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly ILGEN_0x1d013582 {}
+.assembly 'negIndexRngChkElim' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
diff --git a/src/tests/JIT/Methodical/Boxing/functional/sin.il b/src/tests/JIT/Methodical/Boxing/functional/sin.il
index a0a11fa921b8e2..aae1f3aad84f14 100644
--- a/src/tests/JIT/Methodical/Boxing/functional/sin.il
+++ b/src/tests/JIT/Methodical/Boxing/functional/sin.il
@@ -13,7 +13,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module sin_il.exe
 .namespace SinCalc
 {
   .class private auto ansi SinCalc
diff --git a/src/tests/JIT/Methodical/Boxing/misc/concurgc.il b/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
index 0afbb1b0c3d54a..c10bbfef571ea2 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/concurgc.il
@@ -6,7 +6,7 @@
 .assembly extern System.Threading.Thread { auto }
 .assembly extern mscorlib { auto }
 
-.assembly 'concur'// as "concur"
+.assembly 'concurgc'// as "concur"
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Boxing/misc/tailjump.il b/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
index 57130ac19aca4a..08ad58752fd7eb 100644
--- a/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
+++ b/src/tests/JIT/Methodical/Boxing/misc/tailjump.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test' { }
+.assembly 'tailjump' { }
 .assembly extern xunit.core {}
 .namespace BoxTest
 {
diff --git a/src/tests/JIT/Methodical/Boxing/seh/fault.il b/src/tests/JIT/Methodical/Boxing/seh/fault.il
index ff5e4bfe46e498..a0305a85f87f6e 100644
--- a/src/tests/JIT/Methodical/Boxing/seh/fault.il
+++ b/src/tests/JIT/Methodical/Boxing/seh/fault.il
@@ -10,7 +10,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly 'try'// as "try"
+.assembly 'fault'// as "try"
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
index c0f5310000ad3c..c1ec61fd48db25 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_cs.il
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-.module 'sin_il_cs.exe'
 
 .assembly extern System.Console
 {
@@ -8,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib { auto }
-.assembly 'sin_il_cs' {}
+.assembly 'sin_cs' {}
 .assembly extern xunit.core {}
 .assembly extern sinlib_cs
 {
diff --git a/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il b/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
index b1eda3d5ea863c..c769dc5510b992 100644
--- a/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
+++ b/src/tests/JIT/Methodical/Boxing/xlang/sin_il.il
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-.module 'sin_il_il.exe'
 
 .assembly extern System.Console
 {
@@ -8,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib { auto }
-.assembly 'sin_il_il' {}
+.assembly 'sin_il' {}
 .assembly extern xunit.core {}
 .assembly extern sinlib_il
 {
diff --git a/src/tests/JIT/Methodical/Coverage/arglist_pos.il b/src/tests/JIT/Methodical/Coverage/arglist_pos.il
index a4304da439a1ed..198dff0d7d6a1f 100644
--- a/src/tests/JIT/Methodical/Coverage/arglist_pos.il
+++ b/src/tests/JIT/Methodical/Coverage/arglist_pos.il
@@ -15,7 +15,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module arglist_pos.exe
 
 .class public auto ansi arglist_pos extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il
index f637184467a781..4363e068a89aab 100644
--- a/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il
+++ b/src/tests/JIT/Methodical/Coverage/copy_prop_byref_to_native_int.il
@@ -4,7 +4,7 @@
 .assembly extern System.Console { auto }
 .assembly extern System.Runtime { auto }
 
-.assembly CopyPropByrefToNativeInt { }
+.assembly 'copy_prop_byref_to_native_int' { }
 .assembly extern xunit.core {}
 
 .typedef [System.Runtime]System.WeakReference as WeakRef
diff --git a/src/tests/JIT/Methodical/Coverage/hole.il b/src/tests/JIT/Methodical/Coverage/hole.il
index 9ebf0969e6a534..106c4605d41f41 100644
--- a/src/tests/JIT/Methodical/Coverage/hole.il
+++ b/src/tests/JIT/Methodical/Coverage/hole.il
@@ -14,7 +14,6 @@
 }
 .assembly hole {}
 .assembly extern xunit.core {}
-.module hole.exe
 // MVID: {972ABF67-C385-44E6-B525-571BCCECC13C}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
index ec19ddbd50768b..0efd535cafd1d7 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_i.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'conv_i8_i'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_conv_i8_i extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
index 690573ad7bd894..1d1467629ee928 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/conv_i8_u.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'conv_i8_u'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_conv_i8_u extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
index 523547eb5b9c84..4735aac79d686b 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_i.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'convovf_i8_i'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_convovf_i8_i extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u-ia64.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u-ia64.il
index 3efc6feaeec906..ebf86fcd1cf633 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u-ia64.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/convovf_i8_u-ia64.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'convovf_i8_u-ia64'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_convovf_i8_u_ia64 extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge-i386.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge-i386.il
index 398a64744a14d7..a6c467484fe088 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge-i386.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge-i386.il
@@ -9,7 +9,7 @@
 
 .assembly extern mscorlib
 { }
-.assembly 'test'
+.assembly 'i_array_merge-i386'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_i_array_merge_i386 extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge-ia64.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge-ia64.il
index 6c75fc15e4d7ab..ec5ac621e9b6cd 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge-ia64.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge-ia64.il
@@ -9,7 +9,7 @@
 
 .assembly extern mscorlib
 { }
-.assembly 'test'
+.assembly 'i_array_merge-ia64'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_i_array_merge_ia64 extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
index 0aa7706e959949..9ca8d1c88c1831 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_box.il
@@ -16,11 +16,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly 'avg'// as "avg"
+.assembly 'i_box'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 .namespace BoxTest
 {
   .class private auto ansi Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
index a7e5838c437afd..6d3503aca31539 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_conv.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'i_conv'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_i_conv extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
index 0ac560dfaa769c..d709974c4a3407 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_fld.il
@@ -9,10 +9,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'i_fld'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 .namespace Test
 {
   .class private auto ansi AA extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
index d1a2c207bfe1ed..5a8b8df4849287 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flood.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'avg'// as "avg"
+.assembly 'i_flood'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
 .namespace AvgTest {
   .class private auto ansi Test extends [mscorlib]System.Object {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
index 9a2d0b356c4b0c..548c08714f62bd 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_flow.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'i_flow'// as "qsort"
 {
 }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 // MVID: {3433C0F8-3BEA-4168-AB0C-C275EF054928}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
index a3fc294254ad40..d5dcdcf26ed5e0 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_prop.il
@@ -9,10 +9,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'i_prop'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 .namespace Test
 {
   .class private auto ansi BB extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
index c3189031bb03ca..149c053c506220 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort1.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'i_qsort1'// as "qsort"
 {
 }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
 .namespace QSortTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
index 770bc72c164405..eff30d5e8d9479 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_qsort2.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'i_qsort2'// as "qsort"
 {
 }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
 .namespace QSortTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
index 1d14a7ee138df6..e769815a52897b 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_ref.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'avg'// as "avg"
+.assembly 'i_ref'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
 .namespace AvgTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
index 5a74e9f73dfa98..fdbc30b14fc3cd 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_seq.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'i_seq'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_i_seq extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
index e7a67870955f73..1ee71853a116b2 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_vfld.il
@@ -9,10 +9,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'i_vfld'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 .namespace Test
 {
   .class private value sealed auto ansi AA extends [mscorlib]System.ValueType
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
index 0b0b82398b3171..6e21d80f7d107b 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/qperm.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'qperm'// as "qsort"
 {
 }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
 .namespace QSortTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof-i386.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof-i386.il
index 5c3209409c78cd..438f8dac06e557 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof-i386.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof-i386.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'avg'// as "avg"
+.assembly 'sizeof-i386'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
 .namespace AvgTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof-ia64.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof-ia64.il
index 2d4392c2b098c0..497c0b2227d52c 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof-ia64.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/sizeof-ia64.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'avg'// as "avg"
+.assembly 'sizeof-ia64'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
 .namespace AvgTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge-i386.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge-i386.il
index 02c38e5d459150..ae24ee3f583487 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge-i386.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge-i386.il
@@ -9,7 +9,7 @@
 
 .assembly extern mscorlib
 { }
-.assembly 'test'
+.assembly 'u_array_merge-i386'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_u_array_merge_i386 extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge-ia64.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge-ia64.il
index a29f8bea872aa2..23ac1ecf5ab813 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge-ia64.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge-ia64.il
@@ -9,7 +9,7 @@
 
 .assembly extern mscorlib
 { }
-.assembly 'test'
+.assembly 'u_array_merge-ia64'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_u_array_merge_ia64 extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
index ddd03aa82410e2..1b066e701a1717 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_box.il
@@ -16,11 +16,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly 'avg'// as "avg"
+.assembly 'u_box'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 .namespace BoxTest
 {
   .class private auto ansi Test extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
index b3a82dba147bfc..3983ee2b667007 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'u_conv'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_u_conv extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
index 6c47c64602080d..9c6590144ac72f 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_fld.il
@@ -9,10 +9,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'u_fld'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 .namespace Test
 {
   .class private auto ansi AA extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
index 9864c6f4c12ece..fd2d11583233dc 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flood.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'avg'// as "avg"
+.assembly 'u_flood'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
 .namespace AvgTest {
   .class private auto ansi Test extends [mscorlib]System.Object {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
index 3232a26e18ac12..711a5d67e3ac67 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_flow.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'u_flow'// as "qsort"
 {
 }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 // MVID: {3433C0F8-3BEA-4168-AB0C-C275EF054928}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
index f835e59a04fb2f..a78edf140abdfa 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_prop.il
@@ -9,10 +9,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'u_prop'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 .namespace Test
 {
   .class private auto ansi BB extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
index caf3ca4d4d02d4..b4d73c0eb2a29e 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort1.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'u_qsort1'// as "qsort"
 {
 }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
 .namespace QSortTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
index e88514d22873d5..d528b2e7d7b7ed 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_qsort2.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'u_qsort2'// as "qsort"
 {
 }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 // MVID: {D2333E3D-2CA6-4703-8D46-E41A46BDF801}
 .namespace QSortTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
index 6b42d6e0fcb041..bae5688d7392f4 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_ref.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'avg'// as "avg"
+.assembly 'u_ref'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
 .namespace AvgTest
 {
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
index 804b9e58de1401..cd0a599c240c5a 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_seq.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'u_seq'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_u_seq extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
index 4a98ec61cfe835..8b27631e2a7846 100644
--- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
+++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_vfld.il
@@ -9,10 +9,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'qsort'// as "qsort"
+.assembly 'u_vfld'// as "qsort"
 { }
 .assembly extern xunit.core {}
-.module 'qsort.exe'
 .namespace Test
 {
   .class private value sealed auto ansi AA extends [mscorlib]System.ValueType
diff --git a/src/tests/JIT/Methodical/FPtrunc/convX.il b/src/tests/JIT/Methodical/FPtrunc/convX.il
index eab24953d3c129..f812897efe1ab6 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convX.il
+++ b/src/tests/JIT/Methodical/FPtrunc/convX.il
@@ -9,7 +9,6 @@
 .assembly extern mscorlib {}
 .assembly convX {}
 .assembly extern xunit.core {}
-.module convX.exe
 .class private auto ansi beforefieldinit convX
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Methodical/FPtrunc/convr4d.il b/src/tests/JIT/Methodical/FPtrunc/convr4d.il
index d735bb4dc929f5..7b23f90c2d37ad 100644
--- a/src/tests/JIT/Methodical/FPtrunc/convr4d.il
+++ b/src/tests/JIT/Methodical/FPtrunc/convr4d.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly convr4a {}
+.assembly 'convr4d' {}
 .assembly extern xunit.core {}
 .class public sealed VT extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1b.il b/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
index ce71f5223cfb65..582a38e6bf3d58 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1b.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly '20param2a'{}
+.assembly '25param1b'{}
 .assembly extern xunit.core {}
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param1c.il b/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
index 641e42e08eaa57..4d74509e212972 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param1c.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly '20param3a'{}
+.assembly '25param1c'{}
 .assembly extern xunit.core {}
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2b.il b/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
index 3a2c753ae09d37..d4ba5369ae72e1 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2b.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern mscorlib {}
-.assembly '20param2b'{}
+.assembly '25param2b'{}
 .assembly extern xunit.core {}
 .class private sequential ansi sealed beforefieldinit VT
        extends [mscorlib]System.ValueType
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param2c.il b/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
index 30ba388ee31297..75876304505342 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param2c.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern mscorlib {}
-.assembly '20param1b' {}
+.assembly '25param2c' {}
 .assembly extern xunit.core {}
 .class private sequential ansi sealed beforefieldinit VT
        extends [mscorlib]System.ValueType
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3b.il b/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
index 7cca3514d4691b..ba740319a50f7f 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3b.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly '20param3c' {}
+.assembly '25param3b' {}
 .assembly extern xunit.core {}
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25param3c.il b/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
index a2cd67fbbda603..b2c508ea0f02cd 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25param3c.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly '20param3c' {}
+.assembly '25param3c' {}
 .assembly extern xunit.core {}
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
index 07ac1b11bd9f5b..f560a5ca2a3fda 100644
--- a/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
+++ b/src/tests/JIT/Methodical/Invoke/25params/25paramMixed.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly '20param3c' {}
+.assembly '25paramMixed' {}
 .assembly extern xunit.core {}
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
index 53ca5a97fbcd24..b4c63e688194cf 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'catchfault.exe'
 // MVID: {FCE369B5-E876-4E32-B744-1740582FF3B2}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
index 2a14bff01faf40..61e52ef7b9bd85 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_jmp.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'catchfault_tail'// as "catchfault_tail"
+.assembly 'catchfault_jmp'// as "catchfault_tail"
 {
 }
 .assembly extern xunit.core {}
-.module 'catchfault_tail.exe'
 // MVID: {7D0BA0DB-DCB6-4997-83C9-9F31894A25EF}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
index 8cc3af497fdf99..a27ca4a49745bd 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfault_tail.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'catchfault_tail.exe'
 // MVID: {7D0BA0DB-DCB6-4997-83C9-9F31894A25EF}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
index b15528cd677b59..d1c25733fe16d3 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_ind.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'catchfinally'// as "catchfinally"
+.assembly 'catchfinally_ind'// as "catchfinally"
 {
 }
 .assembly extern xunit.core {}
-.module 'catchfinally.exe'
 // MVID: {15FE650F-7944-4B46-86D7-2ECCFDC924C2}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
index 9ccf3243fc144a..9d58b5797f1035 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmp.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'catchfinally_tail'// as "catchfinally_tail"
+.assembly 'catchfinally_jmp'// as "catchfinally_tail"
 {
 }
 .assembly extern xunit.core {}
-.module 'catchfinally_tail.exe'
 // MVID: {CCB52291-4072-427C-8C14-2780C164EB2B}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
index 49c616c8a1b0d3..421bbf43492ed6 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_jmpind.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'catchfinally_tail'// as "catchfinally_tail"
+.assembly 'catchfinally_jmpind'// as "catchfinally_tail"
 {
 }
 .assembly extern xunit.core {}
-.module 'catchfinally_tail.exe'
 // MVID: {CCB52291-4072-427C-8C14-2780C164EB2B}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
index e3adcf8fe6ad7c..bcde1f2467b329 100644
--- a/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
+++ b/src/tests/JIT/Methodical/Invoke/SEH/catchfinally_tail.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'catchfinally_tail.exe'
 // MVID: {CCB52291-4072-427C-8C14-2780C164EB2B}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test1.il b/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
index 2500e6eb68d860..91d85b1450ca5a 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test1.il
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test1.exe'
 // MVID: {0D28B100-FF93-4AA9-8EDA-33F3D5D2A136}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test2.il b/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
index df9c3b2c3b82f3..7248f4d30dec5c 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test2.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test1'// as "test1"
+.assembly 'test2'// as "test1"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test1.exe'
 // MVID: {A1B2C1C6-25C2-4DB7-AE55-41CA3A00F290}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/Invoke/callvirt/test3.il b/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
index c8093ef294b6f3..882d0901f45371 100644
--- a/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
+++ b/src/tests/JIT/Methodical/Invoke/callvirt/test3.il
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test3.exe'
 // MVID: {D9CB467A-BD94-4D87-BB6B-ABB1D4B12E50}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
index 28e7d1d2231c79..174bbbb7ff796d 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_cctor.il
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'val_cctor.exe'
 // MVID: {1C70E5EE-C023-4741-BFC0-A85E3927FB65}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
index 4804985c9753f1..baa17c131b61ab 100644
--- a/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
+++ b/src/tests/JIT/Methodical/Invoke/ctor/val_ctor_newobj.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ctor'// as "ctor"
+.assembly 'val_ctor_newobj'// as "ctor"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'ctor.exe'
 // MVID: {B57C6031-B1F4-4BAC-A5DE-7943EA8B199E}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep1.il b/src/tests/JIT/Methodical/Invoke/deep/deep1.il
index ef4d3ecc426fbf..9898c2e4566e6a 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep1.il
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep1.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'deep'// as "deep"
+.assembly 'deep1'// as "deep"
 {
 }
 .assembly extern xunit.core {}
-.module 'deep.exe'
 // MVID: {AA806490-3696-4693-BEEE-68E449C58639}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/deep/deep2.il b/src/tests/JIT/Methodical/Invoke/deep/deep2.il
index c8e3a65338175d..8d8b538b2fd215 100644
--- a/src/tests/JIT/Methodical/Invoke/deep/deep2.il
+++ b/src/tests/JIT/Methodical/Invoke/deep/deep2.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'deep'// as "deep"
+.assembly 'deep2'// as "deep"
 {
 }
 .assembly extern xunit.core {}
-.module 'deep.exe'
 // MVID: {AA806490-3696-4693-BEEE-68E449C58639}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
index 96ee4867635635..c06aaa5fa958b1 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/ftn_t.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug'
+.assembly 'ftn_t'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'bug.exe'
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
index 759335806ad4d1..c536d9d4992c1d 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug'
+.assembly 'instftn'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'bug.exe'
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
index c684d7eb007f65..d1a1633f52fc33 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/instftn_t.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug'
+.assembly 'instftn_t'
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'bug.exe'
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
index 0ecddeee4114e9..e454019f0b5720 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_calli.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'recurse'// as "recurse"
+.assembly 'recurse_calli'// as "recurse"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'recurse.exe'
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
index f9164dbb8421c8..8536ae41ea49b1 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmp.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'recurse'// as "recurse"
+.assembly 'recurse_jmp'// as "recurse"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'recurse.exe'
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
index fe789903ce3cbc..5fc34d03e8ee03 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_jmpi.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'recurse'// as "recurse"
+.assembly 'recurse_jmpi'// as "recurse"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'recurse.exe'
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
index cb00712b3571ab..69fddb6e96020f 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_call.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'recurse'// as "recurse"
+.assembly 'recurse_tail_call'// as "recurse"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'recurse.exe'
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
index 8dd4c5cb7de39f..cb734644bbc2ab 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/recurse_tail_calli.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'recurse'// as "recurse"
+.assembly 'recurse_tail_calli'// as "recurse"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'recurse.exe'
 // MVID: {885F4995-E80A-480B-BB9B-30139BED90E1}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
index d756cc665ab518..64f8864940a2f0 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn.il
@@ -7,11 +7,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug'
+.assembly 'valftn'
 {
 }
 .assembly extern xunit.core {}
-.module 'bug.exe'
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
index 7414bfac01a3e9..5fd3d52ace971a 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/valftn_t.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug'
+.assembly 'valftn_t'
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'bug.exe'
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
index 018a62e7b6199f..a2f7b929993f4d 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug'
+.assembly 'virtftn'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'bug.exe'
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
index d77634e909749c..8b311f778b8683 100644
--- a/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
+++ b/src/tests/JIT/Methodical/Invoke/fptr/virtftn_t.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug'
+.assembly 'virtftn_t'
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'bug.exe'
 // MVID: {90803FD0-8E18-44C9-A242-98463ADD450D}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr4.il b/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
index 2a10a0ac4855bf..a52dd7fa71c2dd 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr4.il
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'fr4.exe'
 // MVID: {B1A03CB5-0762-4E9F-BA39-E5C10C9A69AE}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/fr8.il b/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
index 8dc075caf660b4..a95905a8650760 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/fr8.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'fr4'// as "fr4"
+.assembly 'fr8'// as "fr4"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'fr4.exe'
 // MVID: {B1A03CB5-0762-4E9F-BA39-E5C10C9A69AE}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
index 3ced4ea671e388..7da5c0e087d025 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i1.il
@@ -17,14 +17,13 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'i4i1'
 {
 
   
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace TestCase
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il b/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
index 2ce13c45b89e89..21f71a576ac00a 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4i2.il
@@ -17,14 +17,13 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'i4i2'
 {
 
   
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace TestCase
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
index 65cec42a9d991b..722be108a108c4 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u1.il
@@ -17,14 +17,13 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'i4u1'
 {
 
   
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace TestCase
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
index 2b971f04c488f4..7916f7a2e29bae 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u2.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'i4u2'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il b/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
index 5b3704c291bd4a..6b962a741493cd 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i4u4.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'i4u4'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {B4ADAE94-5F38-493D-A41E-0ED51F697371}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il b/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
index 37688fc9e38d15..d6ea5f3229f603 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/i8u8.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'i8u8'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {FBE787B7-6007-478A-AA78-9465C2020C0C}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii1.il b/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
index 29aacf4c500387..dd09ba03079bb3 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii1.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'ii1'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii2.il b/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
index 5fa3c40232d33c..12396c47b5e8b6 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii2.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'ii2'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/ii4.il b/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
index e8097341616204..f84d50872068e8 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/ii4.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'ii4'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {B4ADAE94-5F38-493D-A41E-0ED51F697371}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu1.il b/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
index 11151237391b49..6480890d8bc0d3 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu1.il
@@ -17,14 +17,13 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'iu1'
 {
 
   
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace TestCase
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu2.il b/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
index b6a389343ef922..b0c0fb3ac1a868 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu2.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'iu2'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/iu4.il b/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
index 610c9c9c8f99f3..d35e75c625171d 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/iu4.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'iu4'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {B4ADAE94-5F38-493D-A41E-0ED51F697371}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Methodical/Invoke/implicit/objref.il b/src/tests/JIT/Methodical/Invoke/implicit/objref.il
index 2a5d5b0a762dd5..4010d817478761 100644
--- a/src/tests/JIT/Methodical/Invoke/implicit/objref.il
+++ b/src/tests/JIT/Methodical/Invoke/implicit/objref.il
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'objref.exe'
 // MVID: {4F6CDA4F-13A9-40C8-ADF8-98FBBEF21260}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il b/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
index df881f9ed3292b..d7261e3efb2ade 100644
--- a/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
+++ b/src/tests/JIT/Methodical/NaN/intrinsic_nonf.il
@@ -16,7 +16,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module NaN.exe
 
 
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/NaN/r4NaNconv.il b/src/tests/JIT/Methodical/NaN/r4NaNconv.il
index 21c6368b9b488a..e621e741daac0b 100644
--- a/src/tests/JIT/Methodical/NaN/r4NaNconv.il
+++ b/src/tests/JIT/Methodical/NaN/r4NaNconv.il
@@ -10,9 +10,8 @@
 .assembly extern mscorlib
 {
 }
-.assembly conv {}
+.assembly 'r4NaNconv' {}
 .assembly extern xunit.core {}
-.module conv.exe
 .class private auto ansi beforefieldinit ConvTest
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Methodical/NaN/r8NaNconv.il b/src/tests/JIT/Methodical/NaN/r8NaNconv.il
index bf9430d987d2c0..7363482fd09fc4 100644
--- a/src/tests/JIT/Methodical/NaN/r8NaNconv.il
+++ b/src/tests/JIT/Methodical/NaN/r8NaNconv.il
@@ -10,9 +10,8 @@
 .assembly extern mscorlib
 {
 }
-.assembly conv {}
+.assembly 'r8NaNconv' {}
 .assembly extern xunit.core {}
-.module conv.exe
 .class private auto ansi beforefieldinit ConvTest
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/aa.il b/src/tests/JIT/Methodical/VT/callconv/aa.il
index 3ec1cee11f2164..209c4f6a364551 100644
--- a/src/tests/JIT/Methodical/VT/callconv/aa.il
+++ b/src/tests/JIT/Methodical/VT/callconv/aa.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'call' // as "call"
+.assembly 'aa' // as "call"
 {
 
 
@@ -16,7 +16,6 @@
   
 }
 .assembly extern xunit.core {}
-.module call.exe
 // MVID: {CF1D567F-C985-45B8-8028-219BDC43D791}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/calli.il b/src/tests/JIT/Methodical/VT/callconv/calli.il
index f78899d8c988de..c2c5ac6adec18f 100644
--- a/src/tests/JIT/Methodical/VT/callconv/calli.il
+++ b/src/tests/JIT/Methodical/VT/callconv/calli.il
@@ -12,11 +12,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'call' // as "call"
+.assembly 'calli' // as "call"
 {
                         }
 .assembly extern xunit.core {}
-.module call.exe
 // MVID: {CF1D567F-C985-45B8-8028-219BDC43D791}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/dd.il b/src/tests/JIT/Methodical/VT/callconv/dd.il
index d490d61986152f..056b1c462fde46 100644
--- a/src/tests/JIT/Methodical/VT/callconv/dd.il
+++ b/src/tests/JIT/Methodical/VT/callconv/dd.il
@@ -12,11 +12,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'call' // as "call"
+.assembly 'dd' // as "call"
 {
 }
 .assembly extern xunit.core {}
-.module call.exe
 // MVID: {CF1D567F-C985-45B8-8028-219BDC43D791}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/ee.il b/src/tests/JIT/Methodical/VT/callconv/ee.il
index 6e301f8c955416..69e9772ff9994b 100644
--- a/src/tests/JIT/Methodical/VT/callconv/ee.il
+++ b/src/tests/JIT/Methodical/VT/callconv/ee.il
@@ -12,11 +12,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'call' // as "call"
+.assembly 'ee' // as "call"
 {
 }
 .assembly extern xunit.core {}
-.module call.exe
 // MVID: {CF1D567F-C985-45B8-8028-219BDC43D791}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper1.il b/src/tests/JIT/Methodical/VT/callconv/jumper1.il
index d3957e4ed879cc..ab0600df928725 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper1.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper1.il
@@ -12,11 +12,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly jumper // as "jumper"
+.assembly 'jumper1' // as "jumper"
 {
 }
 .assembly extern xunit.core {}
-.module jumper.exe
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
 .namespace MS
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper2.il b/src/tests/JIT/Methodical/VT/callconv/jumper2.il
index 4f456278cf3bbb..597f10226ed472 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper2.il
@@ -12,11 +12,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly jumper // as "jumper"
+.assembly 'jumper2' // as "jumper"
 {
 }
 .assembly extern xunit.core {}
-.module jumper.exe
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
 .namespace MS
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper3.il b/src/tests/JIT/Methodical/VT/callconv/jumper3.il
index e443da783f300c..eb30e713134831 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper3.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper3.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly jumper // as "jumper"
+.assembly 'jumper3' // as "jumper"
 {
 
 
@@ -21,7 +21,6 @@
   
 }
 .assembly extern xunit.core {}
-.module jumper.exe
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
 .namespace MS
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper4.il b/src/tests/JIT/Methodical/VT/callconv/jumper4.il
index db4719d1d28d4a..0366b3db89a786 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper4.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper4.il
@@ -12,13 +12,12 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly jumper // as "jumper"
+.assembly 'jumper4' // as "jumper"
 {
  //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
   //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
                         }
 .assembly extern xunit.core {}
-.module jumper.exe
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
 .namespace MS
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumper5.il b/src/tests/JIT/Methodical/VT/callconv/jumper5.il
index 3923314d3143c7..48f041d95f13d9 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumper5.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumper5.il
@@ -12,13 +12,12 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly jumper // as "jumper"
+.assembly 'jumper5' // as "jumper"
 {
  //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
   //[assembly:System.Security.Permissions.SecurityPermissionAttribute( [mscorlib]System.Security.Permissions.SecurityAction.RequestMinimum, Flags=System.Security.Permissions.SecurityPermissionFlag.SkipVerification )]
                         }
 .assembly extern xunit.core {}
-.module jumper.exe
 // MVID: {2E4A2D77-5614-4325-A9DC-CBB90842669E}
 .namespace MS
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps1.il b/src/tests/JIT/Methodical/VT/callconv/jumps1.il
index dac997a6ddcf2f..2630a9fb573a52 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps1.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps1.il
@@ -15,11 +15,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly jumps // as "jumps"
+.assembly 'jumps1' // as "jumps"
 {
                         }
 .assembly extern xunit.core {}
-.module jumps.exe
 .namespace MS
 {
   .class value private auto ansi sealed VT
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps2.il b/src/tests/JIT/Methodical/VT/callconv/jumps2.il
index 73d7cc40cc2691..98c14cef0a8255 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps2.il
@@ -16,11 +16,10 @@
 {
 }
 
-.assembly jumps // as "jumps"
+.assembly 'jumps2' // as "jumps"
 {
                         }
 .assembly extern xunit.core {}
-.module jumps.exe
 .namespace MS
 {
   .class value private auto ansi sealed VT
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps3.il b/src/tests/JIT/Methodical/VT/callconv/jumps3.il
index e9eea06fd4e829..5748950993d610 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps3.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps3.il
@@ -15,11 +15,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly jumps // as "jumps"
+.assembly 'jumps3' // as "jumps"
 {
                         }
 .assembly extern xunit.core {}
-.module jumps.exe
 .namespace MS
 {
   .class value private auto ansi sealed VT
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps4.il b/src/tests/JIT/Methodical/VT/callconv/jumps4.il
index e32e12f23283b5..4e08b53a8048b9 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps4.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps4.il
@@ -10,11 +10,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly jumps // as "jumps"
+.assembly 'jumps4' // as "jumps"
 {
                         }
 .assembly extern xunit.core {}
-.module jumps.exe
 .namespace MS
 {
   .class value private auto ansi sealed VT
diff --git a/src/tests/JIT/Methodical/VT/callconv/jumps5.il b/src/tests/JIT/Methodical/VT/callconv/jumps5.il
index 6138454e24b114..0eb96858546d71 100644
--- a/src/tests/JIT/Methodical/VT/callconv/jumps5.il
+++ b/src/tests/JIT/Methodical/VT/callconv/jumps5.il
@@ -15,12 +15,11 @@
 .assembly extern mscorlib
 {
 }
-.assembly jumps // as "jumps"
+.assembly 'jumps5' // as "jumps"
 {
                         
 }
 .assembly extern xunit.core {}
-.module jumps.exe
 .namespace MS
 {
   .class value private auto ansi sealed VT
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret.il b/src/tests/JIT/Methodical/VT/callconv/vtret.il
index 20236f655d3241..a9ced08223de92 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret.il
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret.il
@@ -16,7 +16,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module vtret.exe
 // MVID: {DAD31C3D-EF49-47EA-945E-72055ACE0D58}
 .namespace MS
 {
diff --git a/src/tests/JIT/Methodical/VT/callconv/vtret2.il b/src/tests/JIT/Methodical/VT/callconv/vtret2.il
index bf13e8fb7561db..288bf7a219b207 100644
--- a/src/tests/JIT/Methodical/VT/callconv/vtret2.il
+++ b/src/tests/JIT/Methodical/VT/callconv/vtret2.il
@@ -12,11 +12,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly vtret // as "vtret"
+.assembly 'vtret2' // as "vtret"
 {
 }
 .assembly extern xunit.core {}
-.module vtret.exe
 // MVID: {DAD31C3D-EF49-47EA-945E-72055ACE0D58}
 .namespace MS
 {
diff --git a/src/tests/JIT/Methodical/VT/etc/han3.il b/src/tests/JIT/Methodical/VT/etc/han3.il
index 495f0193da9625..f5ac5c7f0e2a00 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3.il
@@ -13,7 +13,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module han3.exe
 .namespace JitTest
 {
   .class value private auto ansi sealed Ring
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ctor.il b/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
index a2260a3965f38c..0765a24dbf79f7 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ctor.il
@@ -13,7 +13,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module han3_ctor.exe
 .namespace JitTest
 {
   .class value private auto ansi sealed Ring
diff --git a/src/tests/JIT/Methodical/VT/etc/han3_ref.il b/src/tests/JIT/Methodical/VT/etc/han3_ref.il
index 44ee15e87938ec..725dd5b0610a88 100644
--- a/src/tests/JIT/Methodical/VT/etc/han3_ref.il
+++ b/src/tests/JIT/Methodical/VT/etc/han3_ref.il
@@ -13,7 +13,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module han3_ref.exe
 .namespace JitTest
 {
   .class value private auto ansi sealed Ring
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi.il b/src/tests/JIT/Methodical/VT/etc/hanoi.il
index 3dfca631e9b0ba..38eff152926fdb 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi.il
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi.il
@@ -13,7 +13,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module hanoi.exe
 .namespace JitTest
 {
   .class value private auto ansi sealed CI
diff --git a/src/tests/JIT/Methodical/VT/etc/hanoi2.il b/src/tests/JIT/Methodical/VT/etc/hanoi2.il
index a721786ac79569..ed0e38d700c02d 100644
--- a/src/tests/JIT/Methodical/VT/etc/hanoi2.il
+++ b/src/tests/JIT/Methodical/VT/etc/hanoi2.il
@@ -9,11 +9,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly hanoi // as "hanoi"
+.assembly 'hanoi2' // as "hanoi"
 {
 }
 .assembly extern xunit.core {}
-.module hanoi.exe
 .namespace JitTest
 {
   .class value private auto ansi sealed CI
diff --git a/src/tests/JIT/Methodical/VT/etc/knight.il b/src/tests/JIT/Methodical/VT/etc/knight.il
index bc3688ce93ea66..17331c7cee7475 100644
--- a/src/tests/JIT/Methodical/VT/etc/knight.il
+++ b/src/tests/JIT/Methodical/VT/etc/knight.il
@@ -16,7 +16,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module knight.exe
 
 .file alignment 512
 
diff --git a/src/tests/JIT/Methodical/VT/etc/nested.il b/src/tests/JIT/Methodical/VT/etc/nested.il
index fd969c844de563..de7b4934f10f4c 100644
--- a/src/tests/JIT/Methodical/VT/etc/nested.il
+++ b/src/tests/JIT/Methodical/VT/etc/nested.il
@@ -12,7 +12,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module nested.exe
 .namespace JitTest
 {
   .class value private auto ansi sealed Struct1
diff --git a/src/tests/JIT/Methodical/VT/identity/accum.il b/src/tests/JIT/Methodical/VT/identity/accum.il
index 98a9eca7a46010..3a97c663216364 100644
--- a/src/tests/JIT/Methodical/VT/identity/accum.il
+++ b/src/tests/JIT/Methodical/VT/identity/accum.il
@@ -16,7 +16,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module accum.exe
 // MVID: {2D7E75FB-9B3C-4E6C-BB98-C8ADCFF67713}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/VT/identity/livecall.il b/src/tests/JIT/Methodical/VT/identity/livecall.il
index 559ceaacfc4fd9..e6589dc48ab9be 100644
--- a/src/tests/JIT/Methodical/VT/identity/livecall.il
+++ b/src/tests/JIT/Methodical/VT/identity/livecall.il
@@ -16,7 +16,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module livecall.exe
 // MVID: {6300FB9B-B24E-45DA-9A61-2556746FEEEF}
 .namespace MS
 {
diff --git a/src/tests/JIT/Methodical/VT/identity/volatile.il b/src/tests/JIT/Methodical/VT/identity/volatile.il
index 8099d912e8ee2e..433b9819ecb2c5 100644
--- a/src/tests/JIT/Methodical/VT/identity/volatile.il
+++ b/src/tests/JIT/Methodical/VT/identity/volatile.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly bug // // as "bug"
+.assembly 'volatile' // // as "bug"
 {
 }
 .assembly extern xunit.core {}
-.module bug.exe
 // MVID: {A29CDE84-6701-43B3-B56A-DE8480CE7421}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/VT/port/huge_gcref.il b/src/tests/JIT/Methodical/VT/port/huge_gcref.il
index 77e6a6b1af3752..ad197e2d734ff5 100644
--- a/src/tests/JIT/Methodical/VT/port/huge_gcref.il
+++ b/src/tests/JIT/Methodical/VT/port/huge_gcref.il
@@ -17,7 +17,7 @@
            
   
 }
-.assembly 'test' // as "test"
+.assembly 'huge_gcref' // as "test"
 {
 
 
@@ -25,7 +25,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 .namespace JitTest
 {
   .class value private auto ansi sealed TestStruct extends [mscorlib]System.ValueType
diff --git a/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il b/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
index 1532e2ab80bf99..365ca19c0a87a9 100644
--- a/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
+++ b/src/tests/JIT/Methodical/casts/array/castclass_ldlen.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldlen'
+.assembly 'castclass_ldlen'
 {
   
   
diff --git a/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il b/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
index bb0dc6ed65c3e1..0f543dc1b23bc3 100644
--- a/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
+++ b/src/tests/JIT/Methodical/casts/array/isinst_ldlen.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldlen'
+.assembly 'isinst_ldlen'
 {
   
   
diff --git a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
index dd9b407605d34b..d6c3df89892758 100644
--- a/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
+++ b/src/tests/JIT/Methodical/cctor/simple/Desktop/prefldinit3.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly precise3 {}
+.assembly 'prefldinit3' {}
 .assembly extern xunit.core {}
 .class private auto ansi beforefieldinit measure
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
index 24b894cc50223e..e2ac6fc7e51402 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit1.il
@@ -12,7 +12,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly precise1
+.assembly 'prefldinit1'
 {
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -21,7 +21,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module precise1.exe
 // MVID: {D664E737-135B-4517-AFBA-875EBEA1C810}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
index fded84e23b593f..8b01f3e7f45afe 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit2.il
@@ -12,7 +12,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly precise2
+.assembly 'prefldinit2'
 {
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -21,7 +21,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module precise2.exe
 // MVID: {C486E388-5E60-42FA-B093-89857CB047D8}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il b/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
index 71aee3cfa78126..73775bfd92d082 100644
--- a/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
+++ b/src/tests/JIT/Methodical/cctor/simple/prefldinit4.il
@@ -12,7 +12,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly precise4
+.assembly 'prefldinit4'
 {
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -21,7 +21,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module precise4.exe
 // MVID: {623817A9-BEA6-4892-A378-D2135E123200}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Methodical/eh/basics/emptyfinally.il b/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
index 96ce199d9693ac..2571109f7f6572 100644
--- a/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/emptyfinally.il
@@ -10,9 +10,8 @@
 }
 .assembly extern mscorlib {}
 .assembly extern common {}
-.assembly tryfinally {}
+.assembly 'emptyfinally' {}
 .assembly extern xunit.core {}
-.module tryfinally.exe
 
 .namespace hello
 {
diff --git a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
index da72c32c4729a6..a4d63564e9c3db 100644
--- a/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
+++ b/src/tests/JIT/Methodical/eh/basics/throwisfirstinstruction.il
@@ -10,9 +10,8 @@
 }
 .assembly extern mscorlib {}
 .assembly extern common {}
-.assembly test {}
+.assembly 'throwisfirstinstruction' {}
 .assembly extern xunit.core {}
-.module throw.exe
 
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
index 20505adeade55b..ed8ac02b555a21 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2endfinally.il
@@ -10,9 +10,8 @@
 }
 .assembly extern mscorlib {}
 .assembly extern common {}
-.assembly tryfinally {}
+.assembly 'tryfinallywith2endfinally' {}
 .assembly extern xunit.core {}
-.module tryfinally.exe
 
 .namespace hello
 {
diff --git a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
index 66309b0b0f3915..06846e0fd929fb 100644
--- a/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
+++ b/src/tests/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally.il
@@ -10,9 +10,8 @@
 }
 .assembly extern mscorlib {}
 .assembly extern common {}
-.assembly tryfinally {}
+.assembly 'tryfinallywith2reachableendfinally' {}
 .assembly extern xunit.core {}
-.module tryfinally.exe
 
 .namespace hello
 {
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch.il
index 9438936956da53..944aef16c0889c 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftercatch.il
@@ -11,12 +11,11 @@
   .ver 0:0:0:0
 }
 .assembly extern common{}
-.assembly test
+.assembly 'badcodeaftercatch'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module badcodeaftercatch.exe
 
 
 .class public auto ansi beforefieldinit Test_badcodeaftercatch
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault.il
index ff7fe0381757f9..b672281092348b 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfault.il
@@ -11,12 +11,11 @@
   .ver 0:0:0:0
 }
 .assembly extern common{}
-.assembly test
+.assembly 'badcodeafterfault'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module baddcodeafterfault.exe
 
 
 .class public auto ansi beforefieldinit Test_badcodeafterfault
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter.il
index 2cfbff642ba939..1bad495c4595c1 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfilter.il
@@ -11,12 +11,11 @@
   .ver 0:0:0:0
 }
 .assembly extern common{}
-.assembly test
+.assembly 'badcodeafterfilter'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module badcodeafterfilter.exe
 
 
 .class public auto ansi beforefieldinit Test_badcodeafterfilter
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally.il
index d716ea8807b876..96dcf6d25b6718 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeafterfinally.il
@@ -11,12 +11,11 @@
   .ver 0:0:0:0
 }
 .assembly extern common{}
-.assembly test
+.assembly 'badcodeafterfinally'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module badcodeafterfinally.exe
 
 
 .class public auto ansi beforefieldinit Test_badcodeafterfinally
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry.il
index 7e14d8518414c1..90c519ec6ebcbf 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeaftertry.il
@@ -11,12 +11,11 @@
   .ver 0:0:0:0
 }
 .assembly extern common{}
-.assembly test
+.assembly 'badcodeaftertry'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module badcodeaftertry.exe
 
 
 .class public auto ansi beforefieldinit Test_badcodeaftertry
diff --git a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il
index ba3c6c4d4c0b51..3c923c39d92b62 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il
@@ -11,12 +11,11 @@
   .ver 0:0:0:0
 }
 .assembly extern common{}
-.assembly test
+.assembly 'badcodeinsidefinally'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module badcodeinsidefinally.exe
 
 
 .class public auto ansi beforefieldinit Test_badcodeinsidefinally
diff --git a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
index 0d6c445f7f823d..175ccb41359d74 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/branchoverendfinally.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern common {}
-.assembly badtest {}
+.assembly 'branchoverendfinally' {}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit foo
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
index 73ba61b6569f71..6eb3dc21d301df 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadEHregionacrossBB.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common {}
-.assembly test
+.assembly 'deadEHregionacrossBB'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module test.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
index a2e1147f621171..cff7b6ad4c1ad3 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadcodeincatch.il
@@ -10,7 +10,7 @@
   .ver 4:0:0:0
 }
 .assembly extern common {}
-.assembly trycatch
+.assembly 'deadcodeincatch'
 {
   // --- The following custom attribute is added automatically, do not uncomment -------
   //  .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -19,7 +19,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module trycatch.exe
 // MVID: {3B8B6D1B-A317-4591-BD66-1D1000E3767F}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
index 3e68fbc0a9b3dd..0a57462e346c3e 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerror.il
@@ -5,7 +5,7 @@
 .assembly extern mscorlib
 { }
 .assembly extern common {}
-.assembly 'test'
+.assembly 'deadoponerror'
 { }
 .assembly extern xunit.core {}
 .class private auto ansi Test_deadoponerror extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
index 1a2340564f1961..59e629384c520c 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet.il
@@ -12,13 +12,12 @@
 {
 }
 .assembly extern common{}
-.assembly oponerror
+.assembly 'deadoponerrorinfunclet'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module oponerror.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
index 95f33182e6ce03..7caf328300b437 100644
--- a/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
+++ b/src/tests/JIT/Methodical/eh/deadcode/endfinallyinloop.il
@@ -15,13 +15,12 @@
 }
 .assembly extern common{}
 
-.assembly badtest
+.assembly 'endfinallyinloop'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module badtest.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
index 288f6cb1919b04..b9d6fd17ef0e78 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
+++ b/src/tests/JIT/Methodical/eh/finallyexec/catchrettoinnertry.il
@@ -18,7 +18,6 @@
    .ver 0:0:0:0
  }
 .assembly extern xunit.core {}
- .module catchrettoinnertry.exe
  .imagebase 0x00400000
  .subsystem 0x00000003
  .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall.il b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall.il
index e29d90c8972ae8..f6e7de6141de29 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall.il
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nestedfinallycall.il
@@ -10,7 +10,7 @@
 .assembly extern mscorlib {}
 .assembly extern System {}
 .assembly extern common{}
-.assembly EHTest {}
+.assembly 'nestedfinallycall' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
index 8386381bf161b3..473a42f63394ba 100644
--- a/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
+++ b/src/tests/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling.il
@@ -10,7 +10,7 @@
 }
  .assembly extern mscorlib {}
  .assembly extern common{}
- .assembly test {}
+ .assembly 'nonlocalexittonestedsibling' {}
 .assembly extern xunit.core {}
  
  
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
index d611404f327942..b5c906d2e7748e 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
+++ b/src/tests/JIT/Methodical/eh/interactions/throw1dimarray.il
@@ -19,12 +19,11 @@
 }
 .assembly extern common{}
 
-.assembly Except
+.assembly 'throw1dimarray'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module Except.EXE
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
index e51b312abce925..3484f4cde28d92 100644
--- a/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
+++ b/src/tests/JIT/Methodical/eh/interactions/throw2dimarray.il
@@ -18,12 +18,11 @@
 {
   .ver 0:0:0:0
 }
-.assembly Except
+.assembly 'throw2dimarray'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module Except.EXE
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
index 4123fdeeeaa02a..af525a8301d380 100644
--- a/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
+++ b/src/tests/JIT/Methodical/eh/leaves/2branchesoutoftry.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common{}
-.assembly testit{
+.assembly '2branchesoutoftry'{
 
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module testit.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
index 558cc9ef9a8deb..38addcab9bf2c1 100644
--- a/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/backwardleaveincatch.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common{}
-.assembly branchbackwardswithfinally
+.assembly 'backwardleaveincatch'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module branchbackwardswithfinally.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
index e4fd8da7868032..d81ffc64957490 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithcatch.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common{}
-.assembly branchbackwardswithfinally
+.assembly 'branchbackwardswithcatch'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module branchbackwardswithfinally.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
index fdf07c184cbb17..d77d0c195170fc 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchbackwardswithfinally.il
@@ -19,7 +19,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module branchbackwardswithfinally.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
index 95cee7bd15997f..cc584d81d46f1b 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common{}
-.assembly testit
+.assembly 'branchoutofnestedtryfinally'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module testit.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
index 3a606ed1e15c35..8aa943becb92e0 100644
--- a/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/branchoutoftryfinally.il
@@ -14,13 +14,12 @@
 {
 }
 .assembly extern common{}
-.assembly testit
+.assembly 'branchoutoftryfinally'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module testit.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
index f11e7850042344..fb62104c565fb9 100644
--- a/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
+++ b/src/tests/JIT/Methodical/eh/leaves/forwardleaveincatch.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common{}
-.assembly branchbackwardswithfinally
+.assembly 'forwardleaveincatch'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module branchbackwardswithfinally.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
index cbe71265a8b588..ea059a878a18a2 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeforefinally.il
@@ -12,13 +12,12 @@
 {
 }
 .assembly extern common{}
-.assembly b30630
+.assembly 'labelbeforefinally'
 {
   .hash algorithm 0x00008004
   .ver 1:0:3018:0
 }
 .assembly extern xunit.core {}
-.module b30630.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
index 2a2ba885cfea28..d65d52edf3ad7c 100644
--- a/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
+++ b/src/tests/JIT/Methodical/eh/leaves/labelbeginningfinally.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common{}
-.assembly b30630
+.assembly 'labelbeginningfinally'
 {
   .hash algorithm 0x00008004
   .ver 1:0:3018:0
 }
 .assembly extern xunit.core {}
-.module b30630.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
index ff08d9da349dcc..1a18f4047fd24e 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveinsameregion.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common{}
-.assembly trycatch
+.assembly 'leaveinsameregion'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module trycatch.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
index 0d6428b4113671..bb95d59b3831a2 100644
--- a/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
+++ b/src/tests/JIT/Methodical/eh/leaves/leaveintotrybody.il
@@ -13,13 +13,12 @@
 {
 }
 .assembly extern common{}
-.assembly trycatch
+.assembly 'leaveintotrybody'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module trycatch.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
index 2977d60a1f458a..40ce213f38723f 100644
--- a/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
+++ b/src/tests/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry.il
@@ -14,13 +14,12 @@
 {
 }
 .assembly extern common{}
-.assembly trycatch
+.assembly 'tryfinallyintrycatchwithleaveintotry'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module trycatch.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
index 78fc7e329b61a8..ada2a761ee2766 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/catchfiltercatch.il
@@ -16,13 +16,12 @@
 {
 }
 .assembly extern common{}
-.assembly testmultihandler
+.assembly 'catchfiltercatch'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module testmultihandler.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
index a603d87120c8e3..e362a58111b63b 100644
--- a/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
+++ b/src/tests/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch.il
@@ -16,13 +16,12 @@
 {
 }
 .assembly extern common{}
-.assembly testmultihandler
+.assembly 'filterfiltercatchcatch'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module testmultihandler.exe
 .imagebase 0x00400000
 .subsystem 0x00000003
 .file alignment 512
diff --git a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
index bd2d4fbdf2fb6f..f05d900d6f0a52 100644
--- a/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
+++ b/src/tests/JIT/Methodical/eh/nested/general/throwinnestedcatch.il
@@ -10,10 +10,9 @@
 }
 .assembly extern mscorlib {}
 .assembly extern common {}
-.assembly test {}
+.assembly 'throwinnestedcatch' {}
 .assembly extern xunit.core {}
 
-.module throwinnestedcatch.exe
 
 .class private auto ansi beforefieldinit test extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
index 6bfe1320dcfcbf..a16c1c351db260 100644
--- a/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
+++ b/src/tests/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch.il
@@ -8,10 +8,9 @@
 }
 .assembly extern mscorlib {}
 .assembly extern common {}
-.assembly rethrowinfinallyaftercatch {}
+.assembly 'rethrowinfinallyinsidecatch' {}
 .assembly extern xunit.core {}
 
-.module rethrowinfinallyaftercatch.exe
 
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_c.il b/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
index f1eef50a594a5c..cf9d0dd3945678 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_c.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_c.exe'
 // MVID: {E2604B1E-0A0A-41BB-B225-61A4B5873CA3}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
index 4c8de543290b71..41615e50cfa001 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f4.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_f4.exe'
 // MVID: {32D92914-4A90-441D-BAD9-DD653D751832}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il b/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
index f3dfdc8b2eae17..84a1472834a132 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_f8.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_f8.exe'
 // MVID: {37A8EE05-2AD1-417E-ABC1-6C1463EFE15F}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
index ed3023109a969d..052503c60e2d6f 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i1.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_i1.exe'
 // MVID: {6CD6F89D-FAE4-46E5-B4D6-684A3371C90D}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
index 8035ff6fb02421..1a68c831f94639 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i2.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_i2.exe'
 // MVID: {DB5DE5DC-5255-410E-B565-E88E6CF43E3E}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il b/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
index c4c674f05a13ab..00351ec1cd9ee3 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_i4.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_i4.exe'
 // MVID: {0D4BD404-2598-466F-9449-2F343E513C7B}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_o.il b/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
index f1370ad78b6234..1d1b7fdf9a00fa 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_o.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_o.exe'
 // MVID: {98C433B3-3689-48CF-A0CC-1320952F1424}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refarg_s.il b/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
index 8edcc440add276..bab5a916420ea1 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refarg_s.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_s.exe'
 // MVID: {003C53D6-66A7-45B4-8632-F678BD70244A}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_c.il b/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
index 6ce3909c5fe7b9..8d28ec36a405a9 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_c.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_c.exe'
 // MVID: {79AF88AB-FAAC-4FD1-BE7F-0957B4D34D71}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
index 41d21ad26faa43..6c4a72d3ede1d8 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i1.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_i1.exe'
 // MVID: {3752C643-F767-47EB-BDBF-8588A1A0B6B3}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
index 36c0cf7a74216f..c84a65779703a9 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i2.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_i2.exe'
 // MVID: {310C7C47-EDC8-46C9-A5AD-A4054CE0204A}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il b/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
index 7d513f15b0627c..171f7351fcd990 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_i4.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_i4.exe'
 // MVID: {D12582D0-C0F0-40C6-B4E1-807EE328456C}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
index 920d8b2beccc62..0f6e11f983f638 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_o.exe'
 // MVID: {3CF0A869-1266-4091-97CF-DEFA0C36E038}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
index c22983b45f17c9..78245cc22be47c 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_o2.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'refloc_o'// as "refloc_o"
+.assembly 'refloc_o2'// as "refloc_o"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_o.exe'
 // MVID: {3CF0A869-1266-4091-97CF-DEFA0C36E038}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
index f4b8c0aa978d21..eefc899e700085 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r4.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'refloc_f4'// as "refloc_f4"
+.assembly 'refloc_r4'// as "refloc_f4"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_f4.exe'
 // MVID: {759403EF-2C74-4EEF-AB3C-166B1C468873}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il b/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
index 0fc2b444ebbf1c..4df0014bf85496 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_r8.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'refloc_f8'// as "refloc_f8"
+.assembly 'refloc_r8'// as "refloc_f8"
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_f8.exe'
 // MVID: {6A5E4D09-08FF-4E91-A37B-252AB7E08397}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il b/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
index 0e27da5953768e..7941b096a35ac7 100644
--- a/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
+++ b/src/tests/JIT/Methodical/explicit/basic/refloc_u2.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refloc_u2.exe'
 // MVID: {ADBCF0C8-A2B9-4481-BF63-32F2CB11E46E}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
index 2c90d986717644..5908b00d6cfa4a 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_gc.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly funcptr_gc
+.assembly 'expl_funcptr_gc'
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {CF23CD68-3FF2-4D1F-B49B-866DA656D91D}
 
 
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
index 9fca41f99db49c..5edf2371e3fdd6 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/expl_funcptr_val.il
@@ -10,7 +10,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly funcptr_val
+.assembly 'expl_funcptr_val'
 {
 
 
@@ -19,7 +19,6 @@
   
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {CF23CD68-3FF2-4D1F-B49B-866DA656D91D}
 
 
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
index 957f1644a1e0dd..d01bd51ed6953f 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_gc.il
@@ -11,12 +11,11 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly funcptr_gc
+.assembly 'seq_funcptr_gc'
 {
 
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {CF23CD68-3FF2-4D1F-B49B-866DA656D91D}
 
 
diff --git a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
index dced59c0acf2a2..0382e28d3c7cbf 100644
--- a/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
+++ b/src/tests/JIT/Methodical/explicit/funcptr/seq_funcptr_val.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly funcptr_val
+.assembly 'seq_funcptr_val'
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {CF23CD68-3FF2-4D1F-B49B-866DA656D91D}
 
 
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
index 6d63b873adfa6e..b68fa53619af96 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_f8.il
@@ -12,7 +12,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'refarg_box_f8.exe'
 .namespace Test
 {
   .class private auto ansi App extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
index f7db1b8ab1c7f6..2a6b5511302703 100644
--- a/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
+++ b/src/tests/JIT/Methodical/explicit/misc/refarg_box_val.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'refarg_box_val.exe'
 // MVID: {27E0B251-2BC1-4652-9A1C-3EFA7F79CFC4}
 .namespace Test
 {
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
index 7bb446b7435bd5..0f2fd44482e73d 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_double.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'rotarg_double.exe'
 // MVID: {645882BF-F31B-417A-A923-D4914C5C82B7}
 .namespace Rotate
 {
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
index 2f6f9faab3c8c4..b2854e691fec68 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_float.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'rotarg_float.exe'
 // MVID: {7ECA5CD0-D623-475E-8C8F-8781756FD492}
 .namespace Rotate
 {
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
index 2237c78c4f4bb8..24bc2b486a2534 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_objref.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'rotarg_objref.exe'
 // MVID: {163DF86C-2BE3-4ACE-B98C-6AF0382DBFD1}
 .namespace Rotate
 {
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
index 0c2c1abc2ccf14..0c89cf9bbda089 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotarg_valref.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'rotarg_valref.exe'
 // MVID: {674E1F39-687D-4762-9954-BB9254236385}
 .namespace Rotate
 {
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
index 86544e40ab834d..0c2d6fc7c6eaa3 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_i4.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'rotate_i4.exe'
 // MVID: {A112EBC7-3218-46C8-939E-D43B5ED4DE98}
 .namespace Rotate
 {
diff --git a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
index 206fe4d30ff834..2be02c40a2b6c9 100644
--- a/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
+++ b/src/tests/JIT/Methodical/explicit/rotate/rotate_u2.il
@@ -18,7 +18,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'rotate_u2.exe'
 // MVID: {D13C2D0A-FC17-423E-926F-6A239416DD1C}
 .namespace Rotate
 {
diff --git a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
index 536a326baddad4..df5dc52f71d07a 100644
--- a/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
+++ b/src/tests/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly dev10_745765
+.assembly 'twoEndFinallys'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -20,7 +20,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module dev10_745765.exe
 // MVID: {932CB6F6-63A8-4E1D-B39F-197DFCB35D3E}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.il
index 2388b1e1c95b15..2d225ee80d9c4d 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.il
@@ -12,13 +12,12 @@
 {
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
 }
-.assembly repro
+.assembly 'GCMaskForGSCookie'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module repro.exe
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.il
index e7b00aad8da09f..361604f4d9340a 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.il
@@ -18,7 +18,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module loopIV_init.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.il
index c20b22ea5565d4..4315a07720f9a4 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/dependentLifetimes.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 4:0:0:0
 }
-.assembly small_repro
+.assembly 'dependentLifetimes'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
 }
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.il
index 1b06d0ae65352c..4f6e5bd950f6e5 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.il
@@ -9,7 +9,7 @@
 }
 .assembly extern mscorlib { auto }
 .assembly extern System { auto }
-.assembly EHTest {}
+.assembly 'ehDescriptorPtrUpdate' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.il
index f0a2646f645029..689837b7dc5087 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib { auto }
 .assembly extern System { auto }
-.assembly EHTest {}
+.assembly 'fgloop' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.il
index bcf4e7d26bcddc..291da667e16585 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.il
@@ -9,7 +9,7 @@
 }
 .assembly extern mscorlib { auto }
 .assembly extern System { auto }
-.assembly EHTest {}
+.assembly 'fgloop2' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.il
index c4dd8c332da9dc..944e96d0e18cca 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
-.assembly ILGEN_0xb8816d7d {}
+.assembly 'cpblkInt32' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.il
index 051f036c819595..27948d7eea3411 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.il
@@ -3,7 +3,7 @@
 
 
 
-.assembly ILGEN_0x97f1b6bf {}
+.assembly 'flowgraph' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.il
index 0bf5eec07704f9..8b778b97aee012 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.il
@@ -9,7 +9,7 @@
 }
 .assembly extern mscorlib { auto }
 .assembly extern System { auto }
-.assembly EHTest {}
+.assembly 'regionLive' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.il
index ab42a324199c6f..6a7ed96de0dcde 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly ILGEN_0x52ea038a {}
+.assembly 'indexMinusOne' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.il
index fb6d49571c4619..a8e3a9f56b7b6b 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly ILGEN_0xd01d9fe9 {}
+.assembly 'volatileLocal1' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.il b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.il
index 2625179487cc1e..cdb10766e130b7 100644
--- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.il
+++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly ILGEN_0x537f7b0 {}
+.assembly 'volatileLocal2' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
diff --git a/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il b/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il
index 022bbab52d5faa..65bea4b23998b7 100644
--- a/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il
+++ b/src/tests/JIT/Methodical/inlining/dev10_bug719093/variancesmall.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 4:0:0:0
 }
-.assembly Variance1
+.assembly 'variancesmall'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   
@@ -23,7 +23,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module Variance1.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Methodical/int64/arrays/hugedim.il b/src/tests/JIT/Methodical/int64/arrays/hugedim.il
index fe001976b72020..1985c99751ba4b 100644
--- a/src/tests/JIT/Methodical/int64/arrays/hugedim.il
+++ b/src/tests/JIT/Methodical/int64/arrays/hugedim.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'hugedim'
 {
 
   //  .custom instance void ['mscorlib']System.Diagnostics.DebuggableAttribute::.ctor(bool,
@@ -21,7 +21,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_long.il b/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
index 56c70ff46e3a9a..6f647f9fcea2f0 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_long.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'lcs_long.exe'
 // MVID: {856A09FD-A814-4ED7-B594-E4AFD3850D67}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
index 909201615c916f..9aa18840f5d3a3 100644
--- a/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
+++ b/src/tests/JIT/Methodical/int64/arrays/lcs_ulong.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'lcs_ulong.exe'
 // MVID: {4FECC02C-D871-4196-A531-897C5458F477}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/misc/binop.il b/src/tests/JIT/Methodical/int64/misc/binop.il
index 17a4ceeb644603..f9a77d82eba761 100644
--- a/src/tests/JIT/Methodical/int64/misc/binop.il
+++ b/src/tests/JIT/Methodical/int64/misc/binop.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'binop.exe'
 // MVID: {E24B38CB-1AB3-45BA-AA54-5C10DD72CDBA}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/misc/box.il b/src/tests/JIT/Methodical/int64/misc/box.il
index 5058cef9a26412..ca47345075263b 100644
--- a/src/tests/JIT/Methodical/int64/misc/box.il
+++ b/src/tests/JIT/Methodical/int64/misc/box.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'box.exe'
 // MVID: {8CBD3D83-F5B6-41AC-9D7A-099A59884AC4}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/misc/longmul.il b/src/tests/JIT/Methodical/int64/misc/longmul.il
index ec46cd426cec66..3b1ea525434a03 100644
--- a/src/tests/JIT/Methodical/int64/misc/longmul.il
+++ b/src/tests/JIT/Methodical/int64/misc/longmul.il
@@ -3,7 +3,7 @@
 
 .assembly extern System.Console { auto }
 .assembly extern System.Runtime { auto }
-.assembly LongMulOn32BitTest { }
+.assembly 'longmul' { }
 .assembly extern xunit.core {}
 
 .class auto LongMulOn32BitTest extends [System.Runtime]System.Object
diff --git a/src/tests/JIT/Methodical/int64/signed/s_addsub.il b/src/tests/JIT/Methodical/int64/signed/s_addsub.il
index b351cd69ee24b2..ea28c346adf992 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_addsub.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_addsub.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'addsub'// as "addsub"
+.assembly 's_addsub'// as "addsub"
 {
 }
 .assembly extern xunit.core {}
-.module 'addsub.exe'
 // MVID: {1BE54EA1-760A-4C23-A736-FE6F3A427E3E}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
index 232f46ec00f6c9..631a8a7823a912 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_div.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldc_div'// as "ldc_div"
+.assembly 's_ldc_div'// as "ldc_div"
 {
 }
 .assembly extern xunit.core {}
-.module 'ldc_div.exe'
 // MVID: {907922FB-D56B-4407-A016-0118205F2F38}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
index c89277872f7a97..c933afe29b5dbf 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mul.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldc_mul'// as "ldc_mul"
+.assembly 's_ldc_mul'// as "ldc_mul"
 {
 }
 .assembly extern xunit.core {}
-.module 'ldc_mul.exe'
 // MVID: {DD9661FF-93A5-4664-8EAA-E345054EF8F6}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
index 0db4d30ebc70a5..40cdf2c41c3336 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldc_mulovf.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldc_mulovf'// as "ldc_mulovf"
+.assembly 's_ldc_mulovf'// as "ldc_mulovf"
 {
 }
 .assembly extern xunit.core {}
-.module 'ldc_mulovf.exe'
 // MVID: {2BC63DAA-17AC-498E-A6E0-2E0A01266D5E}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
index 2288f54a5332b5..b5dd2c21106b2d 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mul.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldfld_mul'// as "ldfld_mul"
+.assembly 's_ldfld_mul'// as "ldfld_mul"
 {
 }
 .assembly extern xunit.core {}
-.module 'ldfld_mul.exe'
 // MVID: {1194CBFB-CC76-4762-A87D-5001A75D57A4}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
index 6351f96f7eae4e..a2df76d0e53d7b 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldfld_mulovf.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldfld_mulovf'// as "ldfld_mulovf"
+.assembly 's_ldfld_mulovf'// as "ldfld_mulovf"
 {
 }
 .assembly extern xunit.core {}
-.module 'ldfld_mulovf.exe'
 // MVID: {8D78994E-61A5-4A50-98EF-B8CD04CD82A0}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
index e60d2f1113d184..188f03800c001f 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mul.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldsfld_mul'// as "ldsfld_mul"
+.assembly 's_ldsfld_mul'// as "ldsfld_mul"
 {
 }
 .assembly extern xunit.core {}
-.module 'ldsfld_mul.exe'
 // MVID: {72B54BA1-0DAB-469F-8753-50AD9A199FE2}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
index b246ae090668b2..d0751ae415aaf4 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_ldsfld_mulovf.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldsfld_mulovf'// as "ldsfld_mulovf"
+.assembly 's_ldsfld_mulovf'// as "ldsfld_mulovf"
 {
 }
 .assembly extern xunit.core {}
-.module 'ldsfld_mulovf.exe'
 // MVID: {54816B74-C516-4067-93B9-A895F5F3D4AA}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/signed/s_muldiv.il b/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
index dec6a7e664fec2..5cb5382b59918f 100644
--- a/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
+++ b/src/tests/JIT/Methodical/int64/signed/s_muldiv.il
@@ -13,11 +13,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'muldiv'// as "muldiv"
+.assembly 's_muldiv'// as "muldiv"
 {
 }
 .assembly extern xunit.core {}
-.module 'muldiv.exe'
 // MVID: {BF2F71BF-B5EC-4C96-8B9A-70A2AFBE37F8}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/superlong/superlong.il b/src/tests/JIT/Methodical/int64/superlong/superlong.il
index 91f141beee9eee..4ad606533bcdcf 100644
--- a/src/tests/JIT/Methodical/int64/superlong/superlong.il
+++ b/src/tests/JIT/Methodical/int64/superlong/superlong.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'superlong.exe'
 // MVID: {571950B7-63D3-4968-948F-25114244E0B8}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/addsub.il b/src/tests/JIT/Methodical/int64/unsigned/addsub.il
index 8885f8e6611d13..0a7e4f62fa5e58 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/addsub.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/addsub.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'addsub.exe'
 // MVID: {964B45BB-9F5B-4A2B-9ECD-E062E2FE8E23}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
index 8c4829781c892a..477b34b1810b3a 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mul.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'ldc_mul.exe'
 // MVID: {A15E1196-BF43-4EB9-B2C7-D32EC8A9CA8F}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
index 223643f8a21ecb..6898efe501df12 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldc_mulovf.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'ldc_mulovf.exe'
 // MVID: {C6227192-F885-4DCA-9BE0-1B2B2204AB9E}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
index 9925c70b870165..deec6f9d8bf26d 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mul.il
@@ -17,7 +17,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'ldfld_mul.exe'
 // MVID: {11B90F3C-E0C0-43E5-9E78-65FA3DCAAEF2}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
index 99706dd0780b69..60b67e5ddc957c 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldfld_mulovf.il
@@ -16,7 +16,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'ldfld_mulovf.exe'
 // MVID: {5E7A07A8-98C6-40F0-BD60-5BEF6B39E28B}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
index e8edabd5e17597..218829997d180f 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mul.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'ldsfld_mul.exe'
 // MVID: {B9439553-5220-4D6F-B7AA-E7754C5633EC}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
index 6acc3fcffcd726..b6fdcfb921f58d 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/ldsfld_mulovf.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'ldsfld_mulovf.exe'
 // MVID: {F167E31C-7032-4D75-B802-EE8B8384CBD2}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/int64/unsigned/muldiv.il b/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
index e7654e10f7ec8c..d0f3dc20f93780 100644
--- a/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
+++ b/src/tests/JIT/Methodical/int64/unsigned/muldiv.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module 'muldiv.exe'
 // MVID: {621361D3-6C15-4D03-BB44-4DCF8A6B7FA1}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.il b/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.il
index d658e7533c504c..6b62235fcb9af5 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.il
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_dynamic.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly eh01{}
+.assembly 'verify01_dynamic'{}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit LocallocTest
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_large.il b/src/tests/JIT/Methodical/localloc/verify/verify01_large.il
index 6275ca03cb427a..8909f92cf9ddab 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_large.il
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_large.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly eh01{}
+.assembly 'verify01_large'{}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit LocallocTest
diff --git a/src/tests/JIT/Methodical/localloc/verify/verify01_small.il b/src/tests/JIT/Methodical/localloc/verify/verify01_small.il
index 580880fd254b7b..ae9a42bd93d29f 100644
--- a/src/tests/JIT/Methodical/localloc/verify/verify01_small.il
+++ b/src/tests/JIT/Methodical/localloc/verify/verify01_small.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly eh01{}
+.assembly 'verify01_small'{}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit LocallocTest
diff --git a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.il b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.il
index 64c118a3714a37..5d8abca482c014 100644
--- a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.il
+++ b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_large.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly zeroinit01{}
+.assembly 'zeroinit01_large'{}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit T
diff --git a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.il b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.il
index 10104ae91ac208..00251b775d13b9 100644
--- a/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.il
+++ b/src/tests/JIT/Methodical/localloc/zeroinit/zeroinit01_small.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly zeroinit01{}
+.assembly 'zeroinit01_small'{}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit T
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/classic.il b/src/tests/JIT/Methodical/nonvirtualcall/classic.il
index 2e105e2a94bbf5..23b4645f60128f 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/classic.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/classic.il
@@ -23,7 +23,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module program.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/delegate.il b/src/tests/JIT/Methodical/nonvirtualcall/delegate.il
index bea1770121ac12..bd5a96ac212782 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/delegate.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/delegate.il
@@ -23,7 +23,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module delegate.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics.il b/src/tests/JIT/Methodical/nonvirtualcall/generics.il
index 6f987630c4959d..02cacb8a03857c 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics.il
@@ -23,7 +23,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module nonvirtualcalls_generics.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/generics2.il b/src/tests/JIT/Methodical/nonvirtualcall/generics2.il
index b0618b35b3f50d..6937587cd8d98c 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/generics2.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/generics2.il
@@ -24,7 +24,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module nonvirtualcalls_generics2.exe
 // MVID: {5D0110E9-A5F8-484A-97F5-D5C79C5A9A77}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il
index 547e26390c40c3..dbd642e8a7e6c4 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/tailcall.il
@@ -13,7 +13,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module nonvirtualcalls_tailcall.exe
 // MVID: {EC3860F1-6469-489C-86D2-A81D88AE196E}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il
index f3e243490fea65..fe74b777ecc021 100644
--- a/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il
+++ b/src/tests/JIT/Methodical/nonvirtualcall/valuetype.il
@@ -24,7 +24,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module valuetype.exe
 // MVID: {AF04A73C-C896-4A00-97F2-959EE06A9394}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Methodical/refany/array1.il b/src/tests/JIT/Methodical/refany/array1.il
index d4d7820e294f8f..f425d01a74fa62 100644
--- a/src/tests/JIT/Methodical/refany/array1.il
+++ b/src/tests/JIT/Methodical/refany/array1.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module array1.exe
 // MVID: {F8BFB824-C7D0-485F-A06E-07B6D1F1151B}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/refany/array2.il b/src/tests/JIT/Methodical/refany/array2.il
index 531cfeda61c7d5..21fd254bf1593d 100644
--- a/src/tests/JIT/Methodical/refany/array2.il
+++ b/src/tests/JIT/Methodical/refany/array2.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module array2.exe
 // MVID: {1781A471-82F3-4159-8D0F-B3B5A9FF1BB6}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/refany/array3.il b/src/tests/JIT/Methodical/refany/array3.il
index 331d440f402136..722c1df9367836 100644
--- a/src/tests/JIT/Methodical/refany/array3.il
+++ b/src/tests/JIT/Methodical/refany/array3.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly array2// as "array2"
+.assembly 'array3'// as "array2"
 {
 }
 .assembly extern xunit.core {}
-.module array2.exe
 // MVID: {1781A471-82F3-4159-8D0F-B3B5A9FF1BB6}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/refany/format.il b/src/tests/JIT/Methodical/refany/format.il
index 257d7c8e44fe75..2d2f71aa28c353 100644
--- a/src/tests/JIT/Methodical/refany/format.il
+++ b/src/tests/JIT/Methodical/refany/format.il
@@ -14,7 +14,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module format.exe
 .namespace JitTest
 {
   .class public auto ansi sealed PlatformID
diff --git a/src/tests/JIT/Methodical/refany/indcall.il b/src/tests/JIT/Methodical/refany/indcall.il
index c7b7f17215388c..68d3d967b56a8d 100644
--- a/src/tests/JIT/Methodical/refany/indcall.il
+++ b/src/tests/JIT/Methodical/refany/indcall.il
@@ -8,13 +8,12 @@
 .assembly extern mscorlib
 {
 }
-.assembly 'bug'
+.assembly 'indcall'
 {
 
   
 }
 .assembly extern xunit.core {}
-.module 'bug.exe'
 .namespace JitTest
 {
   .class private auto ansi Test extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/refany/lcs.il b/src/tests/JIT/Methodical/refany/lcs.il
index 4107c24c67aafd..c536dff1986c47 100644
--- a/src/tests/JIT/Methodical/refany/lcs.il
+++ b/src/tests/JIT/Methodical/refany/lcs.il
@@ -18,7 +18,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module lcs.exe
 .namespace JitTest
 {
   .class private auto ansi LCS
diff --git a/src/tests/JIT/Methodical/refany/longsig.il b/src/tests/JIT/Methodical/refany/longsig.il
index 2a3bee82139c41..38dfb34906379f 100644
--- a/src/tests/JIT/Methodical/refany/longsig.il
+++ b/src/tests/JIT/Methodical/refany/longsig.il
@@ -10,11 +10,10 @@
 .assembly extern mscorlib
 {
 }
-.assembly format// as "format"
+.assembly 'longsig'// as "format"
 {
 }
 .assembly extern xunit.core {}
-.module format.exe
 .namespace JitTest
 {
   .class public auto ansi sealed PlatformID
diff --git a/src/tests/JIT/Methodical/refany/native.il b/src/tests/JIT/Methodical/refany/native.il
index 50a9f7ef7c1c70..47e2557d3844c5 100644
--- a/src/tests/JIT/Methodical/refany/native.il
+++ b/src/tests/JIT/Methodical/refany/native.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module native.exe
 // MVID: {C18F1061-8239-420B-AC69-D4CB0BB38F2B}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/refany/seq.il b/src/tests/JIT/Methodical/refany/seq.il
index 5925ecdde73b2b..2bf4a2fbb853e6 100644
--- a/src/tests/JIT/Methodical/refany/seq.il
+++ b/src/tests/JIT/Methodical/refany/seq.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'native'// as "native"
+.assembly 'seq'// as "native"
 {
 }
 .assembly extern xunit.core {}
-.module native.exe
 // MVID: {C18F1061-8239-420B-AC69-D4CB0BB38F2B}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/refany/shortsig.il b/src/tests/JIT/Methodical/refany/shortsig.il
index 01b6d714b126d0..5bf25c76301e65 100644
--- a/src/tests/JIT/Methodical/refany/shortsig.il
+++ b/src/tests/JIT/Methodical/refany/shortsig.il
@@ -10,7 +10,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly format// as "format"
+.assembly 'shortsig'// as "format"
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/refany/stress2.il b/src/tests/JIT/Methodical/refany/stress2.il
index d954dee0076081..b25ee851708545 100644
--- a/src/tests/JIT/Methodical/refany/stress2.il
+++ b/src/tests/JIT/Methodical/refany/stress2.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module stress2.exe
 // MVID: {5A1483AA-BABB-44FA-9E05-6A081C8BFE56}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/refany/u_native.il b/src/tests/JIT/Methodical/refany/u_native.il
index 303c0c4564ee43..fd732040deb506 100644
--- a/src/tests/JIT/Methodical/refany/u_native.il
+++ b/src/tests/JIT/Methodical/refany/u_native.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'native'// as "native"
+.assembly 'u_native'// as "native"
 {
 }
 .assembly extern xunit.core {}
-.module native.exe
 // MVID: {C18F1061-8239-420B-AC69-D4CB0BB38F2B}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/switch/switch1.il b/src/tests/JIT/Methodical/switch/switch1.il
index c255dbb91ec912..457545a27d577e 100644
--- a/src/tests/JIT/Methodical/switch/switch1.il
+++ b/src/tests/JIT/Methodical/switch/switch1.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch1.exe'
 
 .class public auto ansi Test_switch1
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch10.il b/src/tests/JIT/Methodical/switch/switch10.il
index ffbaf70eea935a..d311704468b375 100644
--- a/src/tests/JIT/Methodical/switch/switch10.il
+++ b/src/tests/JIT/Methodical/switch/switch10.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch10.exe'
 
 .class public auto ansi Test_switch10
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch11.il b/src/tests/JIT/Methodical/switch/switch11.il
index b689131a600bb1..65b37b0b9d7783 100644
--- a/src/tests/JIT/Methodical/switch/switch11.il
+++ b/src/tests/JIT/Methodical/switch/switch11.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch11.exe'
 
 .class public auto ansi Test_switch11
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch2.il b/src/tests/JIT/Methodical/switch/switch2.il
index e4f80e44d5fd8e..382874a80dd4c4 100644
--- a/src/tests/JIT/Methodical/switch/switch2.il
+++ b/src/tests/JIT/Methodical/switch/switch2.il
@@ -12,7 +12,6 @@
 
 }
 .assembly extern xunit.core {}
-.module 'switch2.exe'
 
 .class public auto ansi Test_switch2
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch3.il b/src/tests/JIT/Methodical/switch/switch3.il
index db5c3a0cf2a1e9..9f253eb5291659 100644
--- a/src/tests/JIT/Methodical/switch/switch3.il
+++ b/src/tests/JIT/Methodical/switch/switch3.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch3.exe'
 
 .class public auto ansi Test_switch3
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch4.il b/src/tests/JIT/Methodical/switch/switch4.il
index e365a0c4c9bc6f..d8b6ee9b9997fd 100644
--- a/src/tests/JIT/Methodical/switch/switch4.il
+++ b/src/tests/JIT/Methodical/switch/switch4.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch4.exe'
 
 .class public auto ansi Test_switch4
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch5.il b/src/tests/JIT/Methodical/switch/switch5.il
index f4f60cafdc1e63..0bd7a6d4981946 100644
--- a/src/tests/JIT/Methodical/switch/switch5.il
+++ b/src/tests/JIT/Methodical/switch/switch5.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch5.exe'
 
 .class public auto ansi TestStack
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch6.il b/src/tests/JIT/Methodical/switch/switch6.il
index 6482f1e08b17f8..91febaea8ec713 100644
--- a/src/tests/JIT/Methodical/switch/switch6.il
+++ b/src/tests/JIT/Methodical/switch/switch6.il
@@ -14,7 +14,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch6.exe'
 
 .class public auto ansi Test_switch6
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch7.il b/src/tests/JIT/Methodical/switch/switch7.il
index 848df2ae9bd237..245ff69132b222 100644
--- a/src/tests/JIT/Methodical/switch/switch7.il
+++ b/src/tests/JIT/Methodical/switch/switch7.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch7.exe'
 
 .class public auto ansi Test_switch7
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch8.il b/src/tests/JIT/Methodical/switch/switch8.il
index 47107b388e0813..e0c38194c09218 100644
--- a/src/tests/JIT/Methodical/switch/switch8.il
+++ b/src/tests/JIT/Methodical/switch/switch8.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch8.exe'
 
 .class public auto ansi Test_switch8
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/switch/switch9.il b/src/tests/JIT/Methodical/switch/switch9.il
index d7fdcc75aa9d27..7cafa1dd0c033a 100644
--- a/src/tests/JIT/Methodical/switch/switch9.il
+++ b/src/tests/JIT/Methodical/switch/switch9.il
@@ -13,7 +13,6 @@
 }
 .assembly extern xunit.core {}
 
-.module 'switch9.exe'
 
 .class public auto ansi Test_switch9
        extends ['mscorlib']System.Object
diff --git a/src/tests/JIT/Methodical/tailcall/gcval_nested.il b/src/tests/JIT/Methodical/tailcall/gcval_nested.il
index 11c75ca49d36f7..bd15d3ba98cee1 100644
--- a/src/tests/JIT/Methodical/tailcall/gcval_nested.il
+++ b/src/tests/JIT/Methodical/tailcall/gcval_nested.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly gcval { }
+.assembly 'gcval_nested' { }
 .assembly extern xunit.core {}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/tailcall/test_implicit.il b/src/tests/JIT/Methodical/tailcall/test_implicit.il
index aa48fc77869fa1..874c079270be45 100644
--- a/src/tests/JIT/Methodical/tailcall/test_implicit.il
+++ b/src/tests/JIT/Methodical/tailcall/test_implicit.il
@@ -6,7 +6,7 @@
 .assembly extern System.Runtime.Extensions { auto }
 .assembly extern mscorlib { auto }
 
-.assembly tailcall
+.assembly 'test_implicit'
 {
 
 
@@ -15,7 +15,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module tailcall.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il
index 0c8b2c52cb9ed9..36e24c1ef88153 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il
+++ b/src/tests/JIT/Methodical/tailcall_v4/delegateTail.il
@@ -13,7 +13,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 4:0:0:0
 }
-.assembly repro
+.assembly 'delegateTail'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   
@@ -22,7 +22,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module repro.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Methodical/tailcall_v4/hijacking.il b/src/tests/JIT/Methodical/tailcall_v4/hijacking.il
index 0a8c24dad235c7..ad5b18aa264b74 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/hijacking.il
+++ b/src/tests/JIT/Methodical/tailcall_v4/hijacking.il
@@ -34,7 +34,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module hijacking.exe
 // MVID: {7A6D7819-76F7-4311-967C-7CC804775914}
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x0000000000400000
diff --git a/src/tests/JIT/Methodical/tailcall_v4/smallFrame.il b/src/tests/JIT/Methodical/tailcall_v4/smallFrame.il
index cc7966e01f508e..a0ad0eec6ae2e3 100644
--- a/src/tests/JIT/Methodical/tailcall_v4/smallFrame.il
+++ b/src/tests/JIT/Methodical/tailcall_v4/smallFrame.il
@@ -17,7 +17,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly retbuf_bug
+.assembly 'smallFrame'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -30,7 +30,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module retbuf_bug.exe
 // MVID: {FD923469-B98F-4B21-ABCA-4105B0A8ED94}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Methodical/xxobj/operand/ldelema.il b/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
index b95ae101843b67..aba96e52a6d012 100644
--- a/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
+++ b/src/tests/JIT/Methodical/xxobj/operand/ldelema.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly mdarray { }
+.assembly 'ldelema' { }
 .assembly extern xunit.core {}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof.il b/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof.il
index 74cb91312299fe..c2f15d70fe7899 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof.il
@@ -8,7 +8,7 @@
 }
 
 .assembly extern mscorlib { }
-.assembly 'sizeof'
+.assembly '64sizeof'
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof32.il b/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof32.il
index 9706760e509727..7a711adcde27c5 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof32.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof32.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib { }
-.assembly sizeof32 { }
+.assembly '64sizeof32' { }
 .assembly extern xunit.core {}
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .namespace JitTest
diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof64.il b/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof64.il
index 08c96f35719ff7..c1fb131103e87c 100644
--- a/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof64.il
+++ b/src/tests/JIT/Methodical/xxobj/sizeof/64sizeof64.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib { }
-.assembly sizeof64 { }
+.assembly '64sizeof64' { }
 .assembly extern xunit.core {}
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .namespace JitTest
diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.il b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.il
index 365c842588f6a7..ab6d2dc2428e91 100644
--- a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.il
+++ b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.il
@@ -9,10 +9,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'c'// as "c"
+.assembly 'b44018'// as "c"
 { }
 .assembly extern xunit.core {}
-.module 'c.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.il b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.il
index 6a5de9810c6b77..6738718598b1cc 100644
--- a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.il
+++ b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'b'// as "b"
+.assembly 'b45046'// as "b"
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'b.exe'
 // MVID: {0573B9C2-3980-4A83-9B01-889CCC1D6FBC}
 .namespace Test
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.il b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.il
index 2bdb79abfd1863..d4c56dfce72b5e 100644
--- a/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.il
+++ b/src/tests/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x917e8626 {}
+.assembly 'b35455' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x917e8626 {
 	.method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.il
index 8302e0d6b82717..5170bc68bdb657 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly bug
+.assembly 'b16039'
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.il
index 734d9b74e1e8f6..94515f0d2c7ccb 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.il
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-.module 'gcindir.exe'
 
 .assembly extern System.Console
 {
@@ -8,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib {}
-.assembly 'gcindir'
+.assembly 'b26324a'
 {
   
   
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.il
index a9747a2f5b3b32..a8dd1e66e38309 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.il
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-.module 'gcindir.exe'
 
 .assembly extern System.Console
 {
@@ -8,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib {}
-.assembly 'gcindir'
+.assembly 'b26324b'
 {
   
   
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.il
index 6ab86566c2f262..65332e8abbc253 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'box' { }
+.assembly 'b29583' { }
 .assembly extern xunit.core {}
 
 .namespace BoxTest
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.il
index f19c6645891e89..c710b3a0bbac1c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x5a59b03c {}
+.assembly 'b30125' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x5a59b03c {
 .method static int32 Method_0x1001() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.il
index 0ffb0475dc58fe..21881ef7ae01df 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xe741640 {}
+.assembly 'b30862' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xe741640 {
 .field static	int64 field_0x1
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.il
index 29c8a35f99f415..ac848ec9e80589 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'typedref' { }
+.assembly 'b30864' { }
 .assembly extern xunit.core {}
 .namespace BoxTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.il
index 35ab19fbdc03ff..c237cb74ea3469 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xedada940 {}
+.assembly 'b30892' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xedada940 {
 .method static int32 Method_0x7f75() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.il
index a60f50847c6aa0..133c18ff8e301b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xed342785 {}
+.assembly 'b31102' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xed342785 {
 .method static int32 Method_0x287e() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.il
index 66c8b7d5f369c7..14c2570b8bc5a3 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xf0dc526d {}
+.assembly 'b31273' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xf0dc526d {
 .method static int32 Method_0x1672(int64 Arg_0x5) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.il
index 4158d2fe7801b6..2bee49e04ccece 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3e7ab88c {}
+.assembly 'b31321' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3e7ab88c {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.il
index cda2ce1d169c24..aefde6400230d6 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x9dd65b7c {}
+.assembly 'b31343' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x9dd65b7c {
 .method static int32 Method_0x479() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.il
index 2e61d8a55045c6..add808243de055 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x213510c0 {}
+.assembly 'b31448' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x213510c0 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.il
index 0675ba35c4bf4b..b8bf414fda31e3 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x126afdc7 {}
+.assembly 'b32093' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x126afdc7 {
 .field static	int32 field_0x2
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.il
index 44adb1cafe5181..fa96137f2e32dd 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug' { }
+.assembly 'b32374' { }
 .assembly extern xunit.core {}
 .namespace Test
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.il
index dea3a9bfece3bf..70bb7795bb28d3 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x474a9f71 {}
+.assembly 'b34423' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x474a9f71 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.il
index 6ccf83306ff50b..df84376550c94d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'bug'// as "bug"
+.assembly 'b29351'// as "bug"
 {
   
   
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.il
index b45396b6e505d4..0f60b0e8f7dbee 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1aecfae6 {}
+.assembly 'b33759' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1aecfae6 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.il
index 8ff04b9f2a652a..a12477f8b960d6 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xcdff6a8e {}
+.assembly 'b33792' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xcdff6a8e {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.il
index 30154b7fad436e..6799a5f356f636 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x25b2a016 {}
+.assembly 'b33888' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x25b2a016 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.il
index 0d858ffe75d26f..4198c1eaa36e4f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xe32b9f8 {}
+.assembly 'b33922' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xe32b9f8 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.il
index 2f232ee697c777..0ecea691bf9b97 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x34e68074 {}
+.assembly 'b33928' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x34e68074 {
 .method static int32 Method_0x1f01(float32 Arg_0x0) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.il
index 3d39b646419ce3..da095a35814de3 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'typedref'// as "typedref"
+.assembly 'b35784'// as "typedref"
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.il
index 03d5b7d212aa3e..691c95057de435 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x68f5b414 {}
+.assembly 'b36030' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x68f5b414 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.il
index f4a601f248f7e0..b0aed8c397d27d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xcb543741 {}
+.assembly 'b39381' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xcb543741 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.il
index 2046329ff5a762..5543c378056819 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xcbda6722 {}
+.assembly 'b39397' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xcbda6722 {
 .method static float32 Method_0x796a(int64 Arg_0x0) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.il
index 62205d0a5feac4..b817159da6acb6 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa39a4fa9 {}
+.assembly 'b39417' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa39a4fa9 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.il
index 67cee77ba8dc02..053b71253ba117 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x98f62282 {}
+.assembly 'b39455' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x98f62282 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.il
index 663c951c50d54a..5f40ec06b74118 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x5c383c7 {}
+.assembly 'b39946' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x5c383c7 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.il
index 407086ecd57d8b..2d3b8afdba411e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x587ddc1e {}
+.assembly 'b40174' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x587ddc1e {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.il
index d72b825f05cc8e..8f55604fbf0967 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x44f8f663 {}
+.assembly 'b40199' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x44f8f663 {
 .method static int32 Method_0x2e75f3b4(int8 Arg_0x0, unsigned int64 Arg_0x1, int16 Arg_0x2) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.il
index e99aeee815cfec..4a3cc583767520 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x689f8929 {}
+.assembly 'b40269' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x689f8929 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.il
index 394f70a8ec1509..afca6d35914c9c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x37ae0554 {}
+.assembly 'b40380' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x37ae0554 {
 .method static int32 Method_0xb77ea7c1(int16 Arg_0x0, int16 Arg_0x1) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.il
index ae76d9e369bec3..77aae2370b2dd2 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1a182c40 {}
+.assembly 'b40411' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1a182c40 {
 .method static int32 Method_0x36cdd4e(float64 Arg_0x9) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.il
index 61b37929bebdbe..7c8d5e902b5e44 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x322fc2ad {}
+.assembly 'b40721' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x322fc2ad {
 .field static	unsigned int8 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.il
index d5adb06a23b20c..7a7ecc4672ed19 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'b40725'
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {37F05BF1-E8CC-42FA-A268-D866F07CFFF8}
 .namespace TestCase
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.il
index aeb802b72571e4..93e2902f183e4a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x9e8a1a89 {}
+.assembly 'b41002' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x9e8a1a89 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.il
index 8d205a3657e0e1..cf0a0c8352903d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3a878f9 {}
+.assembly 'b41126' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3a878f9 {
 .method static int32 Method_0x96dc6834(unsigned int64 Arg_0x1, int64 Arg_0x3, float32 Arg_0x4) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.il
index f7fcccedf076dd..3c3e4dc85d07b5 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7971e09f {}
+.assembly 'b41129' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7971e09f {
 .field static	unsigned int16[] field_0x1
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.il
index 39620eb0d7e6ad..efcc19dce336de 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x243bc9d5 {}
+.assembly 'b41149' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x243bc9d5 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.il
index 00eff1f1a44d51..323164a4759b44 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x81ba964 {}
+.assembly 'b41164' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x81ba964 {
 .field static	unsigned int8[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.il
index ab6219cc82097e..aad65a1135bf24 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x233972d {}
+.assembly 'b41278' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x233972d {
 .field static	unsigned int8 field_0x2
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.il
index c8867f29ec37d3..5529779110473c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1a8938c {}
+.assembly 'b41627' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1a8938c {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.il
index 4f1c00828380b3..7addaba80c9908 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'test'
+.assembly 'b42387'
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {23E3D49B-6CFD-4DA0-8C9D-A611CE0BA103}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.il
index e9c9f033022d71..6ff1bd72ed4625 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x64be9170 {}
+.assembly 'b43033' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x64be9170 {
 .method static int32 Method_0xe55ca458(int64 Arg_0x0) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.il
index 0f0e23d66c09a4..728321ae35da44 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xd8633b24 {}
+.assembly 'b43040' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xd8633b24 {
 .field static	unsigned int8[] field_0x5
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.il
index 76eb7a489a2884..960b993539443b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.il
@@ -10,7 +10,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x16802ac7 {}
+.assembly 'b43069' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x16802ac7 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.il
index cb2e2c8e544d46..3f62e1e3553f22 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1be1aaf4 {}
+.assembly 'b43115' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1be1aaf4 {
 .field static	unsigned int64 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.il
index db9a63fbcbb779..1dc3d42ef627ec 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1495dac4 {}
+.assembly 'b43121' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1495dac4 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.il
index 1ab6fc1b66289d..98ae9ea2a22edf 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x19b572e2 {}
+.assembly 'b43160' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x19b572e2 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.il
index 1078bedd1c5467..4a4eeb333caa92 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x144897ef {}
+.assembly 'b43378' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x144897ef {
 .field static	unsigned int8 field_0x4
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.il
index 1f37776ac5535f..b9d645f4520037 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1f290143 {}
+.assembly 'b43714' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1f290143 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.il
index d2815ef690ac26..f31cc9a82c17e7 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.il
@@ -10,7 +10,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1dd8d826 {}
+.assembly 'b43963' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1dd8d826 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.il
index e87c590a17eaf7..870e082b38c236 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1ad812c2 {}
+.assembly 'b43994' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1ad812c2 {
 .method static int32 Method_0xf621eda6(unsigned int16 Arg_0x0, int64 Arg_0x1) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.il
index 3bf99503757ac3..b209b300b07228 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.il
@@ -9,10 +9,9 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'c'// as "c"
+.assembly 'b44020'// as "c"
 { }
 .assembly extern xunit.core {}
-.module 'c.exe'
 .namespace JitTest
 {
   .class private auto ansi Test
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.il
index d723a7545f7a4c..86e0a91ed2fb01 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1915effd {}
+.assembly 'b44204' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1915effd {
 .method static int32 Method_0x85e39eed() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.il
index 8a48b9ac55a54e..e37edccab6e54e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1d9cf497 {}
+.assembly 'b44224' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1d9cf497 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.il
index 95985d8f11491d..aaf94f0aa2075a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1957992d {}
+.assembly 'b44657' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1957992d {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.il
index 5073146b0dfe5e..a30f59c94bbc5b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa4f49b04 {}
+.assembly 'b44723' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa4f49b04 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.il
index 3f0fd8f36f873d..502ef49232fc8e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xbf04a0ad {}
+.assembly 'b44724' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xbf04a0ad {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.il
index 5d18dc63157658..b984a79411cbe4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'b'// as "b"
+.assembly 'b44861'// as "b"
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'b.exe'
 // MVID: {0573B9C2-3980-4A83-9B01-889CCC1D6FBC}
 .namespace Test
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.il
index 8b5047ec961c6c..7706d7f3329a4d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x152f1077 {}
+.assembly 'b44879' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x152f1077 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.il
index b491b28115e919..9daad3be5bccd9 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'b'// as "b"
+.assembly 'b44946'// as "b"
 {
 
 
@@ -20,7 +20,6 @@
   
 }
 .assembly extern xunit.core {}
-.module 'b.exe'
 // MVID: {0573B9C2-3980-4A83-9B01-889CCC1D6FBC}
 .namespace Test
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.il
index 019decc49c1e3a..485e884459f2ef 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xeb5027d {}
+.assembly 'b44983' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xeb5027d {
 .field static	int64 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.il
index 328d21552068f0..b0eb9dbc9df2b5 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xd135fd7 {}
+.assembly 'b44984' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xd135fd7 {
 .method static int32 Method_0x96745647(int8 Arg_0x0, unsigned int8 Arg_0x1, unsigned int32 Arg_0x2, int16 Arg_0x3, unsigned int8 Arg_0x4, unsigned int32 Arg_0x5, int8 Arg_0x6, int64 Arg_0x7, float64 Arg_0x8) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.il
index 1dbb18e2fb32ac..2844116e845e08 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2e384c7a {}
+.assembly 'b44985' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2e384c7a {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.il
index 5dd4ccf1f9834c..9780a182f1d0a8 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1c02a9a5 {}
+.assembly 'b45439' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1c02a9a5 {
 .field static	unsigned int64[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.il
index 8f9f357a41320a..4679bc8f0cd522 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2985f7b9 {}
+.assembly 'b45541' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2985f7b9 {
 .field static	unsigned int32[] field_0x1
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.il
index 2c0195553ee1fe..d47843a299e1ec 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x11c02e62 {}
+.assembly 'b45956' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x11c02e62 {
 .method static int32 Method_0x7f2e741b(unsigned int8 Arg_0x0, unsigned int8 Arg_0x1, float32 Arg_0x2, float32 Arg_0x3, unsigned int32 Arg_0x4) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.il
index 30cc280e9d2c83..0eaac4e964df34 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x496bb0b {}
+.assembly 'b45984' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x496bb0b {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.il
index f807210122499e..b2f6fc9fc615f8 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x23dc78ef {}
+.assembly 'b45985' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x23dc78ef {
 .method static int32 Method_0x24e1ee4b(float32 Arg_0x0) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.il
index 7005c0f13afbb4..b9416c87433e59 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.il
@@ -14,11 +14,10 @@
 .assembly extern Microsoft.VisualBasic
 {
 }
-.assembly 'test'
+.assembly 'b46292'
 {
 }
 .assembly extern xunit.core {}
-.module 'test.exe'
 // MVID: {74C704CE-5E25-4072-A5C7-A9DD14614D82}
 .class private auto ansi Mod1
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.il
index 4083d97b008492..af9533ac9ee9c2 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x5db0aa0 {}
+.assembly 'b46569' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x5db0aa0 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.il
index 2dadfc9cbb19ff..15c0d43808b4eb 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x153960c7 {}
+.assembly 'b46576' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x153960c7 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.il
index 238834d1cd91f8..e2f199c17e4156 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x305f0007 {}
+.assembly 'b46583' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x305f0007 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.il
index 3d3264c5af2226..63463616c04685 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x6322da7 {}
+.assembly 'b46897' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x6322da7 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.il
index b97c5233fe930e..a2580054aa81b1 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb7fdb3b {}
+.assembly 'b47022' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb7fdb3b {
 .field static	unsigned int8 field_0x2
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080-ia64.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080-ia64.il
index 2c6520031e2102..1645a6152f01ac 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080-ia64.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080-ia64.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2be45b24 {}
+.assembly 'b47080-ia64' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2be45b24 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.il
index c76329705bfec3..6f83d8e7aaa970 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x57cc69ce {}
+.assembly 'b47093' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x57cc69ce {
 .field static	unsigned int8 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.il
index 1966dfe40b81f2..64f3016a532fed 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'avg'// as "avg"
+.assembly 'b47610'// as "avg"
 {
 }
 .assembly extern xunit.core {}
-.module 'avg.exe'
 // MVID: {BCA6096F-DF11-4FA3-BF16-EEDA01729535}
 .namespace AvgTest {
   .class private auto ansi Test extends ['mscorlib']System.Object {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.il
index dd31a77580bc0e..7b06b0ac507abe 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1245f15f {}
+.assembly 'b47885' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1245f15f {
 .method static int32 Method_0x5753b424(int16 Arg_0x0, int8 Arg_0x1, unsigned int16 Arg_0x2, int32 Arg_0x3, int16 Arg_0x4, float32 Arg_0x5, unsigned int16 Arg_0x6) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.il
index 67d8f6c80f37dd..eb229d00dc0100 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x50013a8e {}
+.assembly 'b47906' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x50013a8e {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.il
index 5423536c70c147..60168a8bac650a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x60721d0a {}
+.assembly 'b48350' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x60721d0a {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.il
index 5f1debba21fd9c..879367ad5e1a7a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x670a8598 {}
+.assembly 'b48614' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x670a8598 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.il
index 11703c996868aa..1f6fa9b954104d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x6a2f58fb {}
+.assembly 'b49101' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x6a2f58fb {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.il
index 309f8733945634..a559c04b8f914d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x693bdfcb {}
+.assembly 'b49984' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x693bdfcb {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.il
index 2256c251092a95..c03f11dd15de06 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xac0ba7f2 {}
+.assembly 'b30868' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xac0ba7f2 {
 .method static int32 Method_0x7949() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.il
index 4e73d23eee685e..9d23f2a8d42a78 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xdba5be7f {}
+.assembly 'b31283' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xdba5be7f {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.il
index 54d9d05abb0eb4..c6f7a5865da97f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x59e058c0 {}
+.assembly 'b31289' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x59e058c0 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.il
index 9c0440d3396aa2..1ffa5ce332ac55 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x59e058c0 {}
+.assembly 'b31292' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x59e058c0 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.il
index 87d3e25738e025..8020b9a8b883b8 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x498e48f6 {}
+.assembly 'b31423' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x498e48f6 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.il
index 438d26812d2109..583a77f900ee2d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xc2f3d0c8 {}
+.assembly 'b31452' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xc2f3d0c8 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.il
index a3c03ebb6ca719..4443d03823434d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb9cf1080 {}
+.assembly 'b31493' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb9cf1080 {
 .field static	int8 field_0x2
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.il
index 991a7dd80ab7d2..11c58577d8e6f6 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xc2d6ebd8 {}
+.assembly 'b31547' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xc2d6ebd8 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.il
index 3ba0b1d3e606ce..5048c10fb032b7 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xc5f46dbe {}
+.assembly 'b31780' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xc5f46dbe {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.il
index 18c030377952d1..e20ef797dc1f32 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x9d6df124 {}
+.assembly 'b31784' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x9d6df124 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.il
index 6b88dce792c3c3..24bd21b3567094 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x64f58bd0 {}
+.assembly 'b32614' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x64f58bd0 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.il
index 40b626421bb0b9..e4ab0cd7393016 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xbb363761 {}
+.assembly 'b33125' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xbb363761 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.il
index 9a922fcfadee0f..e55341632f4c10 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x5350b1c3 {}
+.assembly 'b33131' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x5350b1c3 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.il
index 2ba5a5b155095b..d1555d88d0e4cc 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xf1d71bcb {}
+.assembly 'b33135' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xf1d71bcb {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.il
index 5d866972333585..9a30d779832f2a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8c7852d1 {}
+.assembly 'b33335' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8c7852d1 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.il
index 6598058904b1d9..038289e8bbf945 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8b849bfe {}
+.assembly 'b33361' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8b849bfe {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.il
index feeb4ab2d6ec74..c33fc98686f93a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2e4e98c {}
+.assembly 'b33362' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2e4e98c {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.il
index f4d1d1e509145c..ac2fa51a9e08b4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xf81ec410 {}
+.assembly 'b33388' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xf81ec410 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.il
index a93e0ef6686323..c0e4da55b5c42e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x689aad70 {}
+.assembly 'b33585' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x689aad70 {
 .field static	int16 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.il
index 43a1496258630e..34990639431acb 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3b5fce00 {}
+.assembly 'b33586' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3b5fce00 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.il
index 94f29d2da98863..5b2701d7bc4996 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xe8c74ae0 {}
+.assembly 'b34951' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xe8c74ae0 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.il
index 7fa6a73d85c95f..fb28419795bd72 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2a6b42a0 {}
+.assembly 'b34952' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2a6b42a0 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.il
index 72fdc58df30626..1d7b898df0ff26 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xbd98be78 {}
+.assembly 'b34953' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xbd98be78 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.il
index 6cdd68da92b1d7..f0fb04f379bc05 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xcd02950a {}
+.assembly 'b35315' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xcd02950a {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.il
index f91656bfe2e7de..e7b1f99d3873f0 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xdc3a83a8 {}
+.assembly 'b35344' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xdc3a83a8 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.il
index 832229e7f88ab0..d476798cefd842 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7c08a1ce {}
+.assembly 'b35348' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7c08a1ce {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.il
index 6d019c362be22c..d214487e05476f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa276db72 {}
+.assembly 'b35351' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa276db72 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.il
index 69fa05bf39df70..96b609bc833afa 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x58f32e86 {}
+.assembly 'b35354' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x58f32e86 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.il
index 8bca68b4c22ad4..c0dbf8069de470 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x449c7d9 {}
+.assembly 'b35366' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x449c7d9 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.il
index 5a46287979fbca..9b9d3de4f5cbdf 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xc53351bb {}
+.assembly 'b35486' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xc53351bb {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.il
index 9e3a10871ac835..45853b29611a49 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x77e9b0c3 {}
+.assembly 'b35635' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x77e9b0c3 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.il
index 0769c372957c66..ba15003e55e18c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x77e65197 {}
+.assembly 'b35779' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x77e65197 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.il
index 5fc23b44c7f2df..20e57e82820705 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7ff68940 {}
+.assembly 'b36301' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7ff68940 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.il
index c5935e741a0a04..118a3a5efad53c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7ff55ade {}
+.assembly 'b36302' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7ff55ade {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.il
index 9780425612850c..2250cb102e2b03 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7ff151ef {}
+.assembly 'b36304' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7ff151ef {
 .method static float32 Method_0x53ea(float64 Arg_0x0, unsigned int64 Arg_0x5) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.il
index ffadb96162a8a9..87672b0dae2b0a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7fec790f {}
+.assembly 'b36975' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7fec790f {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.il
index e765a2bac91af5..ccde3c403738c4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x68eb9462 {}
+.assembly 'b37214' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x68eb9462 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.il
index 59e3d78ac70e54..9de55e48f1d43b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x68eb95f0 {}
+.assembly 'b37215' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x68eb95f0 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.il
index 53a87225820e0b..e586ed682a0d40 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7fee1ca2 {}
+.assembly 'b37238' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7fee1ca2 {
 .method static float32 Method_0x54eb(int64 Arg_0x0, int16 Arg_0x1, unsigned int32 Arg_0x2, unsigned int16 Arg_0x3, int8 Arg_0x4, int16 Arg_0x5, int8 Arg_0x6) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.il
index 5f2ab32be0438e..09dc622bd5db02 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xe08350d0 {}
+.assembly 'b37256' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xe08350d0 {
 .method static float32 Method_0x4d9a(float32 Arg_0x0, int64 Arg_0x1) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.il
index 8ed32c4cb36eb5..d7a12f2a42b43e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x68ef9cc3 {}
+.assembly 'b37578' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x68ef9cc3 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.il
index febb86a7200b0e..f89a3227a5e875 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xe012a579 {}
+.assembly 'b37830' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xe012a579 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.il
index 751cc671d60a5b..fafe86d0094430 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x56afce22 {}
+.assembly 'b40006' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x56afce22 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.il
index 555a8c7a7e76be..6fcc7f677b9712 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib {}
-.assembly 'ldobjfloat'
+.assembly 'b43693'
 {
   
 }
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.il
index f8293955f7771f..b6fbcd38d0c917 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib {}
-.assembly 'stobjfloat'
+.assembly 'b43694'
 {
   
 }
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.il
index 9eff169b12468e..f78f8e98a44594 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2e3bca41 {}
+.assembly 'b47471' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2e3bca41 {
 .method static int32 Method_0x76a09634() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.il
index 6abd8bdb1c3bfa..76df1d85597e05 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xce8ea34 {}
+.assembly 'b47886' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xce8ea34 {
 .field static	unsigned int32 field_0x3
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.il
index 7ec1e6b167b25d..8a2610417241fa 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x5fc83106 {}
+.assembly 'b49104' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x5fc83106 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.il
index 12e16819500d28..4defa3201250d8 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8384f4c4 {}
+.assembly 'b49335' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8384f4c4 {
 .field static	unsigned int64 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435-ia64.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435-ia64.il
index 433e24f9a9101c..72e719f1beb984 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435-ia64.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435-ia64.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa691ee4d {}
+.assembly 'b49435-ia64' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa691ee4d {
 .field static	int32[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.il
index 2add1ebc769e9e..74f7cb5a9ee0e7 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x22bcffe4 {}
+.assembly 'b50026' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x22bcffe4 {
 .field static	unsigned int16[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.il
index a6eababc21c32a..631b0781762a1a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x13e5362e {}
+.assembly 'b50027' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x13e5362e {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.il
index 43bb74513ab26a..5a9e17876db176 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa83217d {}
+.assembly 'b50033' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa83217d {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.il
index dbea34dd225a17..63b2a4554945f4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xbc077bd {}
+.assembly 'b51420' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xbc077bd {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.il
index 108af5d6e3eb5d..8421d25c99ad7f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x24fde2d6 {}
+.assembly 'b51515' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x24fde2d6 {
 .method static int32 Main()
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.il
index 6cc32652c18fa4..536c58a2811798 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'native' { }
+.assembly 'b51575' { }
 .assembly extern xunit.core {}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.il
index d68eb5e5f8b279..7cb0fdf2958b60 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x4f1d560c {}
+.assembly 'b53650' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x4f1d560c {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.il
index 70449bc0b37251..0e14cf577f50d4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly Recurse1 {}
+.assembly 'b53662' {}
 .assembly extern xunit.core {}
 .namespace Recurse1
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.il
index 65c6e30f94322a..356d4da06d7a8e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xab09d49 {}
+.assembly 'b53878' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xab09d49 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.il
index d75ccc786ef5da..c37483a0898e9b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3c109d11 {}
+.assembly 'b53884' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3c109d11 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.il
index aa09f40ccc8447..dd8dcc3e3d4112 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x12f85afc {}
+.assembly 'b53958' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x12f85afc {
 .method static int32 Method_0x7e13e3a1(native int Arg_0x3) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.il
index 7d008fc9e2e708..fa6107240dd597 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1c24c9c8 {}
+.assembly 'b53977' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1c24c9c8 {
 .field static	int64 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.il
index 7fd897f3105354..4c583a3fedae92 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x12984aee {}
+.assembly 'b53980' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x12984aee {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.il
index b35e1acf66054c..7ce2a487beccaa 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1759e5bf {}
+.assembly 'b53994' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1759e5bf {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.il
index 9f1d58170e7c48..de37a86f1a6454 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1c45e3d8 {}
+.assembly 'b53995' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1c45e3d8 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.il
index feddfc917afae5..5b65c2a4fe5f0d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1ef13d7d {}
+.assembly 'b54006' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1ef13d7d {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.il
index f64f29c87acf98..9ce6a5762cff70 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x127c25 {}
+.assembly 'b54565' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x127c25 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.il
index 4c71fd512b7247..59cd58026fad6a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1ad7535f {}
+.assembly 'b54566' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1ad7535f {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.il
index 44bf475a8df1a3..f7354d3857f970 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x142726a2 {}
+.assembly 'b54611' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x142726a2 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.il
index 53384910dee73a..dcd21aee0ad398 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly bug 
+.assembly 'b54971' 
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.il
index 7cf351e7334d1b..955e4fac709d5a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3194e02a {}
+.assembly 'b55923' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3194e02a {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.il
index d21ae30b236565..e25e0acd0d8d73 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3e559786 {}
+.assembly 'b56066' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3e559786 {
 .method static int32 Method_0x17d83b09(float32 Arg_0x4, int16 Arg_0x5) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.il
index 1c3625610328fe..f249d5e46b28f4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x14dd78f4 {}
+.assembly 'b56068' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x14dd78f4 {
 .field static	unsigned int8 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.il
index 59f88e4ce9010d..c9d3f3f56776ee 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xd62c9aaa {}
+.assembly 'b56349' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xd62c9aaa {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.il
index 41947d51f14ec9..49b0b7369b1d86 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2019eaf2 {}
+.assembly 'b57492' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2019eaf2 {
 .field static	unsigned int64 field_0x4
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.il
index 183c1688e8c7c4..ab66c78c291c95 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1125a118 {}
+.assembly 'b57493' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1125a118 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.il
index 5b3ead686c304c..0c445bf321f5dc 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xad3990e {}
+.assembly 'b57516' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xad3990e {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.il
index e4ce83e963a8d6..13d2094dd0c953 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa4d819be {}
+.assembly 'b57518' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa4d819be {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.il
index 8b8c95a642467b..a1752c966b3c58 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test_3b { }
+.assembly 'b57952' { }
 .assembly extern xunit.core {}
 .namespace Test2A
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.il
index 1586c747511cd4..52572c58c53e40 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x493230e7 {}
+.assembly 'b58358' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x493230e7 {
 .method static int32 Method_0x2d7c921() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.il
index 08d93415bdd0db..9fbb0e19fc680b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa2afe952 {}
+.assembly 'b58360' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa2afe952 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.il
index d20930b3ead7d1..f9e5cef130bff8 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x24fde2d6 {}
+.assembly 'b58689' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x24fde2d6 {
 .field static unsigned int8 field_0x2
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.il
index 8944acf98e73c6..9eb7e0cbe8819f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x78389777 {}
+.assembly 'b58690' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x78389777 {
 .field static native int[] field_0x4
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.il
index 9d08020a05a6c4..2fa1c8ecb1f63f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3155fdf {}
+.assembly 'b58866' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3155fdf {
 .method static int32 Method_0xcfd10851(int64 Arg_0x2, int8 Arg_0x3, unsigned int64 Arg_0x5, int8 Arg_0x6) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.il
index 753305d11a5a40..a1ce8fde76fd20 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x46d17ff0 {}
+.assembly 'b59319' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x46d17ff0 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.il
index 5e09b941cf8f2a..4b7fdf9364d46f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x77856409 {}
+.assembly 'b59320' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x77856409 {
 .field static	unsigned int64 field_0x3
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.il
index d755b61a5f45b7..51923532373075 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7a129ee8 {}
+.assembly 'b59337' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7a129ee8 {
 .method static int32 Method_0x63d7449b() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.il
index a5dcbc712b0030..65f8dd463885fb 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x346ef95 {}
+.assembly 'b59477' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x346ef95 {
 .field static	float32[] field_0x1
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.il
index 38b030575d014f..1f3e40238085d5 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa09c7ca6 {}
+.assembly 'b59478' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa09c7ca6 {
 .method static int32 Method_0x1ff34cdc(int64 Arg_0x1) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.il
index c03dba17a95094..0e0b84bdfbea2d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x486ae288 {}
+.assembly 'b59508' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x486ae288 {
 .method static int32 Method_0x317f3e0e(int32 Arg_0x2) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.il
index d57a4f3d22285b..88ac962c5efeac 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib {}
-.assembly bug {}
+.assembly 'b59546' {}
 .assembly extern xunit.core {}
 .class public bug
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.il
index 7c84731fa020da..f884d87d695491 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x942c2798 {}
+.assembly 'b59554' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x942c2798 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.il
index c503eb66825e68..ecd21d91695069 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3052ecd2 {}
+.assembly 'b59647' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3052ecd2 {
 .field static	unsigned int8 field_0x4
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.il
index 63bdd3699e9d8a..04a5d1f8bd35fb 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib {}
-.assembly convr4a {}
+.assembly 'b59678' {}
 .assembly extern xunit.core {}
 .class public bug1 extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.il
index 216d77efbd9c15..cf70bcb189951c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x372a9ae6 {}
+.assembly 'b59782' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x372a9ae6 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.il
index f92e5f3e5817d0..c1d7e41780376c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1db2cfa3 {}
+.assembly 'b59822' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1db2cfa3 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.il
index c064be1f767f59..a8c12f52a53e8b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xf2c69f5c {}
+.assembly 'b59947' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xf2c69f5c {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.il
index dd2c1f02734231..5713b2944cecff 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.il
@@ -9,12 +9,11 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa20b8571
+.assembly 'b59948'
 {
   
 }
 .assembly extern xunit.core {}
-.module '1'
 // MVID: {9A90DFD6-02B6-45EC-9CEF-25C2CAF3BF19}
 
 .file alignment 512
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.il
index 671aaf5dd7e816..0273a5e2d78aad 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xdd840404 {}
+.assembly 'b59949' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xdd840404 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.il
index 7fb998626e7b4f..59741d576e8a59 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xd4820a77 {}
+.assembly 'b59952' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xd4820a77 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.il
index faadf9bb2dec2f..9e739324019edb 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x4601be46 {}
+.assembly 'b59953' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x4601be46 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.il
index 7a1831c990f6ba..82733d9e5511de 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x68501543 {}
+.assembly 'b60127' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x68501543 {
 .method static int32 Method_0xfcb53e4a(float32 Arg_0x4) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.il
index 2bebfec3778968..d87d161c3d0613 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8fd0798a {}
+.assembly 'b60142' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8fd0798a {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.il
index 044f0ee56bd541..3f4468f913a3da 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x6bcd7c1d {}
+.assembly 'b60194' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x6bcd7c1d {
 .method static int32 Method_0xda4a4950(unsigned int16 Arg_0x1) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.il
index 11158ddb361ee2..6c6750ed35fa71 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2806523a {}
+.assembly 'b61025' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2806523a {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.il
index 51c8523f873554..3f29ea2a9dfd54 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xe71156b4 {}
+.assembly 'b61185' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xe71156b4 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.il
index 39a030948cdbd7..225d09bc652d17 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x947e98be {}
+.assembly 'b61215' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x947e98be {
 .field static	native int field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.il
index 9381a45c92225c..436b17aa7c930a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa00c093a {}
+.assembly 'b62145' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa00c093a {
 .method static int32 Method_0x8839aba4(int16 Arg_0x0,native int Arg_0x7, native int Arg_0x8) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.il
index 5e788339df98b9..403409bfcc4978 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa967417e {}
+.assembly 'b63552' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa967417e {
 .method static int32 Method_0xdb3affb(unsigned int16 Arg_0x0, int64 Arg_0x1, native int Arg_0x2) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.il
index ab20cfca4c4bc6..176de618afc92b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb372dbdf {}
+.assembly 'b63725' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb372dbdf {
 .field static	int64 field_0xc
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.il
index b90505356a403d..47a5d8baeba57a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xd73e17d6 {}
+.assembly 'b63726' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xd73e17d6 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.il
index 09c27c91b660a8..4ca791850314d0 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x200e1753 {}
+.assembly 'b63730' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x200e1753 {
 .method static int32 Method_0xae74a560(unsigned int64 Arg_0x0, int32 Arg_0x1, unsigned int8 Arg_0x2) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.il
index 4f1f4a21664892..95d945cf2ef0b0 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3180c570 {}
+.assembly 'b63732' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3180c570 {
 .method static int32 Method_0xa3b20838(unsigned int8 Arg_0x0, unsigned int16 Arg_0x2, float32 Arg_0x3) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.il
index 89904822558d90..09b9b8ef225864 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern mscorlib {}
-.assembly ILGEN_0x9461697d {}
+.assembly 'b63743' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x9461697d {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.il
index 09b2ce40fd8459..8e2e8d4a5f4827 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x12b94a25 {}
+.assembly 'b63823' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x12b94a25 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.il
index 104b8d2ed9b798..06e29549e1d2e1 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'ldvirtftncalli'
+.assembly 'b64026'
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.il
index 5f80ccdefc8105..c2fe4cbfba8164 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test1 {}
+.assembly 'b64560' {}
 .assembly extern xunit.core {}
 .class public test1
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.il
index e1f878213ab036..841324c99f7025 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x6d8b44b0 {}
+.assembly 'b65087' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x6d8b44b0 {
 .method static int32 Method_0xcc3db83d(native int Arg_0x0, int8 Arg_0x1, native int Arg_0x2, unsigned int8 Arg_0x3) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.il
index 9af96e25d88583..dac6a997ed3c34 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8ecc201e {}
+.assembly 'b65176' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8ecc201e {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.il
index f1c81d713b2df5..f48798790f4098 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.il
@@ -9,11 +9,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly sample
+.assembly 'b65407'
 {
 }
 .assembly extern xunit.core {}
-.module sample.exe
 // MVID: {EAE7CF60-60E9-49D2-84F9-F450B7E26DE4}
 
 .file alignment 512
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.il
index b8feb6f35ae1bd..3507d6cff8f033 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.il
@@ -6,11 +6,10 @@
 .assembly extern mscorlib { auto }
 .assembly extern Microsoft.VisualBasic { auto }
 
-.assembly 'b1904'
+.assembly 'b65423'
 {
 }
 .assembly extern xunit.core {}
-.module 'b1904.exe'
 .class private auto ansi b1904 extends ['mscorlib']System.Object
 {
   .field private static int32 Count
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.il
index 799f983a33d2d3..310f3893bc07b6 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x9b859686 {}
+.assembly 'b66226' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x9b859686 {
 .method static int32 Method_0xbe0b5ad5() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.il
index 55bab2486bec13..0ce75c4b5ee531 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test_21_try {}
+.assembly 'b66425' {}
 .assembly extern xunit.core {}
 
 .class TestClass{
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.il
index d965b97c9074d9..af15003dc772d8 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.il
@@ -9,11 +9,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly qsort
+.assembly 'b66583'
 {
 }
 .assembly extern xunit.core {}
-.module qsort.exe
 // MVID: {BEFEC472-D5C8-4747-807D-713417E95FBD}
 
 .file alignment 512
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.il
index 2d7b4f1e790ea9..6a2096a59f089a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ctor_merge2 { }
+.assembly 'b66620' { }
 .assembly extern xunit.core {}
 .class public auto ansi beforefieldinit TestClass
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.il
index ad1031e2b5d007..966523c3959ada 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb15094d8 {}
+.assembly 'b66679' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb15094d8 {
 .method static int32 Method_0xddc6a26d() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.il
index 486a65acb67d6d..ecd6b88c9a5569 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xe4b49040 {}
+.assembly 'b67351' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xe4b49040 {
 .method static int32 Method_0x11ee88a1(native int Arg_0xb) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.il
index 32251439d4c6ac..ad9457a2b310bb 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xc881452f {}
+.assembly 'b67744' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xc881452f {
 .field static	native int field_0x5
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.il
index 5ba68d8f0086f2..635437f29ce29c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8fe33afa {}
+.assembly 'b67819' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8fe33afa {
 .field static unsigned int16[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.il
index 9f7527afefc2cf..b1be3f9a8c5afc 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x48eb9718 {}
+.assembly 'b67987' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x48eb9718 {
 .field static	unsigned int8 field_0x1
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.il
index e3f2bbafd4c6dd..4e2973a1911c0c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2706a1c4 {}
+.assembly 'b68028' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2706a1c4 {
 .method static void Method_0x7d1b2a40(int32 Arg_0x3) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.il
index 82a5cb7270cdea..b7853923b83b25 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2693d3a2 {}
+.assembly 'b68045' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2693d3a2 {
 .method static int32 Method_1(int32 Arg_0x0) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.il
index c3621ae135004a..ec5c660e945ec1 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib {}
-.assembly bug1 {}
+.assembly 'b68757' {}
 .assembly extern xunit.core {}
 .class private bug1
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.il
index 66734ff2956da7..977e49422184f2 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'filter' { }
+.assembly 'b68872' { }
 .assembly extern xunit.core {}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.il
index 575d95839d1ba8..5459b3b87c1ebb 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2193e4b5 {}
+.assembly 'b69225' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2193e4b5 {
 .field static	unsigned int64 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.il
index c1ae2144a8dde1..f1a73be088f63d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x7af9ed84 {}
+.assembly 'b69227' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x7af9ed84 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.il
index 2ca78c0537229d..04d59d0ed89059 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x6af2431f {}
+.assembly 'b69512' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x6af2431f {
 .method static unsigned int16  Method_0x4ce0d6c6() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.il
index 26f61ad2a417e6..f97f9160dc0ee7 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa8b0959c {}
+.assembly 'b69528' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa8b0959c {
 .field static	float32 field_0x2
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.il
index 4cb9325f64ea0b..fa130113f43571 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xbffa35b3 {}
+.assembly 'b69848' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xbffa35b3 {
 .field static	unsigned int8[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.il
index 194da004bd4041..098d52fb51343d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x4cf11307 {}
+.assembly 'b70267' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x4cf11307 {
 .field static	unsigned int64 field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.il
index 2c9051cd7dd691..3f012f005ff63f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8d1cfa06 {}
+.assembly 'b70289' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8d1cfa06 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.il
index eec40a57b15480..9c818bdbc57044 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x68de21f5 {}
+.assembly 'b70335' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x68de21f5 {
 .method static int32 Method_0xe207be7a() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.il
index 4937ad2c39a9e5..2a15e40d75c61e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x499af240 {}
+.assembly 'b70808' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x499af240 {
 .field static	float64 field_0x5
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.il
index c82f8dd7353c9b..b2618d0162c08b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x977f9ed2 {}
+.assembly 'b70964' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x977f9ed2 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.il
index 893cc0b0faf89e..2bf27d3797c322 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.il
@@ -9,11 +9,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly bug
+.assembly 'b70967'
 {
 }
 .assembly extern xunit.core {}
-.module bug.exe
 // MVID: {E3F734BC-107A-4058-AF49-D8BBB8B75D93}
 
 .file alignment 512
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.il
index 2714fa81e316c0..604100574669dd 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa483b94d {}
+.assembly 'b70992' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa483b94d {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.il
index a3d8078f5b61e8..ce4af77c073e65 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x44a8fb5b {}
+.assembly 'b70994' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x44a8fb5b {
 .method static unsigned int64  Method_0x18dabcc4( int32 Arg_0x3) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.il
index 9ffa444d6746cf..57c5da1583f597 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x5c49cb7e {}
+.assembly 'b71003' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x5c49cb7e {
 .method static float32  Method_0x19bd6d70(native int Arg_0x0) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.il
index c7ed17de125072..c3372a6c7f68ee 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x13230206 {}
+.assembly 'b71179' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x13230206 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.il
index eee1fd78bcac30..c245449a49f44b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xee5a2e00 {}
+.assembly 'b71722' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xee5a2e00 {
 .method static unsigned int64  Method_0x28374f71(native int Arg_0x0) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.il
index d5d78893eb31ce..bf15bd93baf6c0 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xaca96c86 {}
+.assembly 'b71999' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xaca96c86 {
 .method static float64  Method_0x88567f92(native int Arg_0x0, float32 Arg_0x1) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.il
index 74278d40f874d8..e28e6ee1a96c45 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb37e58f3 {}
+.assembly 'b72518' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb37e58f3 {
 .method static int8  Method_0xf9cacde1() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.il
index 26a21556a24135..af0b9c71eb98cc 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2dda4eb5 {}
+.assembly 'b72522' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x2dda4eb5 {
 .method static unsigned int16  Method_0xa084659a() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.il
index 7529727f36a5f8..f5f452d23db9b0 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test_3b { }
+.assembly 'b72699' { }
 .assembly extern xunit.core {}
 .namespace JitTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.il
index 29406d9fb2ce1e..46c21343788e49 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xd1507ca {}
+.assembly 'b73079' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xd1507ca {
 .field static	native int field_0x2
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.il
index 236ca89ca9ce36..4adc774ce9b239 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1f0f388d {}
+.assembly 'b73283' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1f0f388d {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.il
index ef1e50d13cd4e6..ab911a19cacd1e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x845850e7 {}
+.assembly 'b74937' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x845850e7 {
 .method static float64  Method_0x498875e6(int64 Arg_0x0, float32 Arg_0x4) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.il
index fcbfa00fdc3b9d..faa2aca58f7c33 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb12e836e {}
+.assembly 'b75945' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb12e836e {
 .field static	int8 field_0x1
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.il
index c49cd9b9c146d2..667f6e89141008 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern mscorlib { }
-.assembly 'ldfld' { }
+.assembly 'b75988' { }
 .assembly extern xunit.core {}
 .class public auto ansi beforefieldinit Test_b75988
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.il
index ae65059525640f..fd253399da1b62 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x14772b62 {}
+.assembly 'b77806' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x14772b62 {
 .method static float32  Method_0xc234ea4d(native int Arg_0x0) {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.il
index eaf9f18f3095b3..967104ede9fc20 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8485715d {}
+.assembly 'b80824' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8485715d {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.il
index 5becfd7a73ab29..dc1da3c84e0a8a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb45a7d8a {}
+.assembly 'b82160' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb45a7d8a {
 .field static	native int field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.il
index dd411d55c75b4d..828fd72c577b47 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8259d717 {}
+.assembly 'b82247' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8259d717 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.il
index 3baf5427c0228b..fde6a65fd5e4a1 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xf9a34ac1 {}
+.assembly 'b82249' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xf9a34ac1 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.il
index 7bbaedd109c90a..dd4945e1e3b8a7 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x3ab555a7 {}
+.assembly 'b82715' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x3ab555a7 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.il
index 9e6113b86e4f02..9a161170a12911 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x9e05cbcc {}
+.assembly 'b84909' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x9e05cbcc {
 .field static	native int field_0x5
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.il
index 69bb360cabdb59..002c8e6246a2c0 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xcfefefe5 {}
+.assembly 'b84916' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xcfefefe5 {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.il
index 0351398c59588c..6f0ffab98d1bb2 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly EHTest {}
+.assembly 'b84971' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.il
index 29b032dcb87551..cd925bb872bbb5 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test {}
+.assembly 'b85477' {}
 .assembly extern xunit.core {}
 .class public test
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.il
index 2a33985c479bc5..6a0c365b42493c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x9e05cbcc {}
+.assembly 'b86139' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x9e05cbcc {
 .field static	native int field_0x5
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.il
index 5e61faa0fa5ff2..1687b4947a208c 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.il
@@ -7,11 +7,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test
+.assembly 'b89409'
 {
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {A814820F-7F5B-4AEC-98B2-8CA067CCDA19}
 
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.il
index 30b6e42f6abf88..11fc3751b44044 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.il
@@ -7,11 +7,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test
+.assembly 'b89546'
 {
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {611FA85E-B08F-4BA6-A5ED-1EFCE48EC6D9}
 
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.il
index b1f68104596cf4..590da7ff06f4b7 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x85bc9d9b {}
+.assembly 'b91021' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x85bc9d9b {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.il
index 9e3cf48e4dc3e0..481ef944fe4adf 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x386672e7 {}
+.assembly 'b91203' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x386672e7 {
 .field static	native int field_0x5
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.il
index 01304b8170900e..17a5a2c760701f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x9c0b37ec {}
+.assembly 'b91223' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x9c0b37ec {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.il
index 753c03796f9c8b..3b627ed3ff80a0 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xbbdad33b {}
+.assembly 'b91359' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xbbdad33b {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.il
index b0782d17eabf89..adc6634d50f1c4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'b92066' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.il
index be93ad1834f80f..7ad68ed989b08a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'b92073' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.il
index 2a61879541c20c..ad5dd0c2ba4a86 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'b92289' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.il
index b8eec3a0cbb600..8c8b8b5d453f87 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x50a9a77 {}
+.assembly 'b92736' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x50a9a77 {
 .field static	unsigned int16 field_0x5
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.il
index 37a3c2aafa7647..4f95b66a479d96 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'b93635' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.il
index a31a5de281267e..56671aeb9f3615 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly EHTest {}
+.assembly 'b94306' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.il
index dea9b0f31dbe4e..006dd16ca91eae 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'b98958' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M15-SP2/b124443/b124443_il.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M15-SP2/b124443/b124443_il.il
index 83e3f9769d3f88..192f08c8b3d212 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M15-SP2/b124443/b124443_il.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M15-SP2/b124443/b124443_il.il
@@ -12,7 +12,6 @@
 {}
 .assembly extern xunit.core {}
 
-.module b124443_il.exe
 
 .class private auto ansi sealed TestDelegate
        extends [mscorlib]System.MulticastDelegate
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.il
index 5cb77e6b424507..030b781c0a8728 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly test
+.assembly 'params-mixed'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.il
index b9e67543951ceb..cddbc9cf2711a2 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly template
+.assembly 'params-none'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.il
index 694890d808688b..708fcf26a3c468 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly template
+.assembly 'params-object'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.il
index 4ad29fe6bcdee3..c1bb821cf936f3 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.il
@@ -13,7 +13,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly template
+.assembly 'params-value'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.il
index f08bfc3fa05e4a..89a61c59f780e3 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly template
+.assembly 'params-varargs'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.il
index 0d69ef184b2065..f5bab2f832e5b4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly template
+.assembly 'static-mixed'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.il
index 10414baecbdfa4..a75d43f44c24b6 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.il
@@ -6,7 +6,7 @@
 .assembly extern System.Runtime.Extensions { auto }
 .assembly extern mscorlib { auto }
 
-.assembly template
+.assembly 'static-none'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.il
index 5056a1709a0b75..8119bef16e794f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.il
@@ -17,14 +17,13 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly template
+.assembly 'static-object'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module template.exe
 // MVID: {01E12E66-85BE-40B5-9C1D-CEDDD038DB2C}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.il
index 61b5e000e0d01f..d1640021c56d5f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.il
@@ -11,7 +11,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 2:0:3600:0
 }
-.assembly template
+.assembly 'static-ref'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.il
index f1f3387c5222ae..6a76e0d2be72b4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x492430 {}
+.assembly 'b139895' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x4924301 {
 .method static int32 Method_0x7ec05129() {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.il
index a58194653a988b..3f8c88774f89b9 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1c9344b9 {}
+.assembly 'b140118' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1c9344b9 {
 .field static	int16[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il
index 71e168e5288a13..ee77ad64821524 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il
@@ -7,7 +7,7 @@
 .assembly extern System.Threading.Thread { auto }
 .assembly extern legacy library mscorlib { auto }
 
-.assembly ExternalException {}
+.assembly 'b143840' {}
 .assembly extern xunit.core {}
 .class private auto ansi beforefieldinit ExternalClass
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/constrained2.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/constrained2.il
index 03b9bce8ec4e31..7e06dc1a18936a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/constrained2.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/constrained2.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly constrained
+.assembly 'constrained2'
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/1.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/1.il
index 471953254d285d..c9418d11fb95f4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/1.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/1.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly ILGEN_0x5c19e96e {}
+.assembly '1' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class ILGEN_0x5c19e96e {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/bug2.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/bug2.il
index 820a19cdfad141..110029217c7b66 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/bug2.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/bug2.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 
-.assembly ILGEN_0xef3a9aea {}
+.assembly 'bug2' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class ILGEN_0xef3a9aea {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/bug3.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/bug3.il
index e94a0f4d0a82a3..c866cf0faef0da 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/bug3.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/bug3.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly ILGEN_0xb6f84258 {}
+.assembly 'bug3' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class ILGEN_0xb6f84258 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/bug4.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/bug4.il
index 7406d83f9ba98b..60e38ba558a42f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/bug4.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/bug4.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 
-.assembly ILGEN_0xca498c54 {}
+.assembly 'bug4' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class ILGEN_0xca498c54 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.il
index a432f1aa4e47a6..792c7a81093a52 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x195e59cd {}
+.assembly 'b00722' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x195e59cd {
 .field static	int16[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.il
index 68276e1e6e038e..0175457036b22e 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x2d277f5e{}
+.assembly 'b04319'{}
 .assembly extern xunit.core {}
 .class ILGEN_0x2d277f5e {
 .field static	unsigned int32[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.il
index 43c90316f95448..91859dc59c27f8 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xfe8f9a4a {}
+.assembly 'b07383' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xfe8f9a4a {
 .field static	unsigned int8 field_0x8
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/SyncGCHole.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/SyncGCHole.il
index 0e4490c7342393..8c91e58440a8a8 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/SyncGCHole.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/SyncGCHole.il
@@ -7,7 +7,7 @@
 .assembly extern System.Threading.Thread { auto }
 .assembly extern legacy library mscorlib { auto }
 
-.assembly ExternalException {}
+.assembly 'SyncGCHole' {}
 .assembly extern xunit.core {}
 .class private auto ansi beforefieldinit ExternalClass
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.il
index 5ab8013829985e..609b298554db55 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.il
@@ -4,7 +4,6 @@
 .assembly extern mscorlib{}
 .assembly b13452{}
 .assembly extern xunit.core {}
-.module b13452.exe
 
 .class public auto ansi beforefieldinit test extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.il
index f34ded7f9d8032..3ff584b579ba83 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x1b57e965 {}
+.assembly 'b14617' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1b57e965 {
 .field static	int8[] field_0x0
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/ebdTryEnd.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/ebdTryEnd.il
index 9a73a4fc637f61..b52247744ca29b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/ebdTryEnd.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/ebdTryEnd.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'ebdTryEnd' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/nullref.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/nullref.il
index 937f8507b6c0eb..7155193663343f 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/nullref.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/nullref.il
@@ -11,11 +11,10 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly d
+.assembly 'nullref'
 {
 }
 .assembly extern xunit.core {}
-.module d.exe
 
 .class public explicit ansi beforefieldinit BigClass
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/eh.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/eh.il
index b8cf94ac633c6a..ac3bafe02e63c2 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/eh.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/eh.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'eh' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/x86-test-1084346006.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/x86-test-1084346006.il
index e0d1d66a29a272..e2cc3a700999ab 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/x86-test-1084346006.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/x86-test-1084346006.il
@@ -9,7 +9,7 @@
   .ver 4:0:0:0
 }
 
-.assembly ILGEN_0x1a02e09e {}
+.assembly 'x86-test-1084346006' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x1a02e09e {
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/1087985874.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/1087985874.il
index de48ab4f9b25ed..35e0afe220a6fd 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/1087985874.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/1087985874.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 
-.assembly Test1 {}
+.assembly '1087985874' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class FullProof {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/1093488365.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/1093488365.il
index 08e5cff28aa685..55069041b5cb3d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/1093488365.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/1093488365.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly Test1 {}
+.assembly '1093488365' {}
 .assembly extern xunit.core {}
 
 .assembly extern System.Console
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/helper.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/helper.il
index 17f19f4da7dca8..033d64d38e69d6 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/helper.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/helper.il
@@ -9,7 +9,6 @@
 }
 .assembly helper {}
 .assembly extern xunit.core {}
-.module helper.exe
 
 
 .class private auto ansi beforefieldinit Helper
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.il
index 09a43ba6888caf..fab492b45e0e1d 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly asm1{}
+.assembly 'b409617'{}
 .assembly extern xunit.core {}
 
 .data LONG_DATA = int64(0x0000000100000002)
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.il
index f474d6567dc9de..78139e08646056 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ctor_null1 { }
+.assembly 'b415164' { }
 .assembly extern xunit.core {}
  
 .class private auto ansi sealed MyDelegate
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.il
index ac98093b98d134..bc06c7c6266637 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.il
@@ -2,13 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
-.module extern user32.dll
 .module extern kernel32
 .assembly extern System.Console { auto }
 .assembly extern System.Threading.Thread { auto }
 .assembly extern mscorlib { auto }
 
-.assembly cs1
+.assembly 'b426654'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.il
index f8a9b0380176cf..595ec4c46fd58a 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.il
@@ -22,7 +22,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module b441487.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.il
index 64e4cdc3cda88e..0570c24b6e78d5 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.il
@@ -16,7 +16,6 @@
     .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 01 01 00 00 00 00 ) 
 }
 .assembly extern xunit.core {}
-.module b471305.exe
 
 .class sealed Program
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.il
index f5667ab24e8d7f..c87839be40d825 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'b487364' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.il
index 6473bdf2f3f1f8..2b3b4bdad5a772 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'b487372' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.il
index d2993e5759f4b7..460743d1428df9 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 
-.assembly Test1 {}
+.assembly 'b489329' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class FullProof {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.il
index 46a3aeab0981a0..d798e302113900 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.il
@@ -8,7 +8,7 @@
 }
 .assembly extern mscorlib {}
 .assembly extern System {}
-.assembly EHTest {}
+.assembly 'b530694' {}
 .assembly extern xunit.core {}
 .class public EHTest
 {
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.il
index 9b19f17c1f93a5..14dfb232ce2008 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.il
@@ -10,7 +10,6 @@
 }
 .assembly test {}
 .assembly extern xunit.core {}
-.module test.exe
 
 .class private auto ansi beforefieldinit Program
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.il b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.il
index 83bad4964b2b8c..06c4b9564d24db 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.il
@@ -8,9 +8,8 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly switchdefaultonly1 {}
+.assembly 'test2' {}
 .assembly extern xunit.core {}
-.module switchdefaultonly3_il_d.exe
 
 .class private auto ansi beforefieldinit switchdefaultonly1
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.il b/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.il
index 5d33c52b436440..acc7b393f40cc4 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 2:0:0:0
 }
-.assembly Contains
+.assembly 'b440158'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   
@@ -18,7 +18,6 @@
   .ver 2:0:30414:3
 }
 .assembly extern xunit.core {}
-.module Contains.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.il b/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.il
index 68e878442e58e0..f9df97884999da 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.il
@@ -13,12 +13,11 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly repro
+.assembly 'b464149'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module repro.exe
 
 // =============== CLASS MEMBERS DECLARATION ===================
 
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.il
index 0bf104bed6d53c..08089f7d5efbf7 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.il
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module LdfldaHack.exe
 // MVID: {61DBCACC-D02C-4722-BA4E-7206DE5BD656}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.il
index cbebfaa29cf2ab..02553c36efacd1 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.il
@@ -17,7 +17,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly b170362_new
+.assembly 'b170362'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module b170362_new.exe
 // MVID: {5699A10B-EE3A-4BFF-B847-74894515E3AE}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/spill.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/spill.il
index d8547f94cf919c..71b65b1d181b13 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/spill.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/spill.il
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module spill.exe
 // MVID: {7C50D91F-9C85-49FE-8B5A-900DF6F8E2CD}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.il
index 86e3808e5d55db..edfee948bbaf3b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.il
@@ -13,7 +13,7 @@
   .ver 2:0:0:0
 }
 
-.assembly nan
+.assembly 'b175679'
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.il
index a4c886c99a2e60..71c68a210d48c1 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.il
@@ -15,7 +15,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly FastPropertyAccessor
+.assembly 'b176032'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -24,7 +24,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module FastPropertyAccessor.exe
 // MVID: {67428BBB-6A8A-45FA-BAF9-F8CACEC55247}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.il
index f40b4bd8833809..a54366472e36bf 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.il
@@ -9,7 +9,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly a
+.assembly 'b173313'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -18,7 +18,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module a.exe
 // MVID: {36FD279A-AF08-423E-A45C-4915EAB873CD}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.il
index 872ee21d0979f7..dd0f5a61d9b334 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.il
@@ -17,7 +17,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly 'pinned'
+.assembly 'b193264'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module pinned.exe
 // MVID: {D6DF3AAB-BC31-4E88-8EC0-2E585288A52B}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.il
index 6068a383ce383b..f25037365d0b10 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.il
@@ -16,7 +16,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly ddb609988
+.assembly 'b609988'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -25,7 +25,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module ddb609988.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.il b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.il
index c6f7ec4d68b98a..dfd1a8a9c3ff7b 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.il
@@ -15,7 +15,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 2:0:0:0
 }
-.assembly ddb609988
+.assembly 'b609988'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   
@@ -24,7 +24,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module ddb609988.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.il b/src/tests/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.il
index 7f57ee0c0e857e..e0998f795759a9 100644
--- a/src/tests/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.il
+++ b/src/tests/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.il
@@ -22,7 +22,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module Test_HndIndex_10_Reordered.exe
 // MVID: {68AEE7ED-2AC8-4330-9EC7-4EBFD6BD74E0}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131.il b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131.il
index d1fb497458cba0..84e1b5d8e76c8f 100644
--- a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131.il
+++ b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131.il
@@ -17,7 +17,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly t
+.assembly 'b473131'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module t.exe
 // MVID: {0BE09AE7-5603-4318-A13B-9A8950F8ED14}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.il b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.il
index 609747203aa837..44db6156b0bb0e 100644
--- a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.il
+++ b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.il
@@ -275,7 +275,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module b473131_byte.exe
 // MVID: {93C4C3CC-5A75-464C-A0F3-61562010094F}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.il b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.il
index 1eeb6391a168bb..10e5d2fd23f477 100644
--- a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.il
+++ b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.il
@@ -265,7 +265,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly /*20000001*/ b473131_byte
+.assembly /*20000001*/ 'b473131_fld'
 {
   .custom /*0C000001:0A000001*/ instance void [mscorlib/*23000001*/]System.Runtime.CompilerServices.CompilationRelaxationsAttribute/*01000003*/::.ctor(int32) /* 0A000001 */ = ( 01 00 08 00 00 00 00 00 ) 
   .custom /*0C000002:0A000002*/ instance void [mscorlib/*23000001*/]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute/*01000004*/::.ctor() /* 0A000002 */ = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -274,7 +274,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module b473131_byte.exe
 // MVID: {93C4C3CC-5A75-464C-A0F3-61562010094F}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.il b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.il
index 119f1e5ef4cb50..2a7a9b0d7d3a9b 100644
--- a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.il
+++ b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.il
@@ -265,7 +265,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly /*20000001*/ b473131_byte
+.assembly /*20000001*/ 'b473131_intptr'
 {
   .custom /*0C000001:0A000001*/ instance void [mscorlib/*23000001*/]System.Runtime.CompilerServices.CompilationRelaxationsAttribute/*01000003*/::.ctor(int32) /* 0A000001 */ = ( 01 00 08 00 00 00 00 00 ) 
   .custom /*0C000002:0A000002*/ instance void [mscorlib/*23000001*/]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute/*01000004*/::.ctor() /* 0A000002 */ = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -274,7 +274,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module b473131_byte.exe
 // MVID: {93C4C3CC-5A75-464C-A0F3-61562010094F}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.il b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.il
index 632e063df8264b..891c1b9bb749b1 100644
--- a/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.il
+++ b/src/tests/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.il
@@ -273,7 +273,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module b473131_struct.exe
 // MVID: {A0B36922-A9AF-463E-9F32-9FBF144F14C7}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.il b/src/tests/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.il
index 4c3ddbf3fe3f72..af95726bbf7ce9 100644
--- a/src/tests/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.il
+++ b/src/tests/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 
-.assembly CrashTest
+.assembly 'DevDiv2_11321'
 {
   .hash algorithm 0x00008004
   .ver 1:0:0:0
diff --git a/src/tests/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.il b/src/tests/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.il
index fc347fb770c259..0b26ff934738f2 100644
--- a/src/tests/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.il
+++ b/src/tests/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.il
@@ -30,7 +30,6 @@
   .ver 4:0:30513:0
 }
 .assembly extern xunit.core {}
-.module VectorForwarder.exe
 // MVID: {040B5898-B7A8-44DE-A50F-3465CCB7870F}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.il b/src/tests/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.il
index 89c5ebca299c72..33ec62e48e7303 100644
--- a/src/tests/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.il
+++ b/src/tests/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.il
@@ -14,14 +14,13 @@
     .ver 4:0:0:0
 }
 
-.assembly UnalignedDouble1
+.assembly 'UseUnalignedDouble'
 {
     .hash algorithm 0x00008004
     .ver 4:0:30319:16507
 }
 .assembly extern xunit.core {}
 
-.module UnalignedDouble1.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.il b/src/tests/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.il
index deada66f2e6315..760fa88141069e 100644
--- a/src/tests/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.il
+++ b/src/tests/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.il
@@ -26,7 +26,6 @@
   .ver 4:0:30513:0
 }
 .assembly extern xunit.core {}
-.module ReflectOnField.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/Dev11/dev10_865840/dev10_865840.il b/src/tests/JIT/Regression/Dev11/dev10_865840/dev10_865840.il
index d5e46b3c7b632b..9bd7cbe049cb34 100644
--- a/src/tests/JIT/Regression/Dev11/dev10_865840/dev10_865840.il
+++ b/src/tests/JIT/Regression/Dev11/dev10_865840/dev10_865840.il
@@ -10,14 +10,13 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
   .ver 2:0:0:0
 }
-.assembly repro
+.assembly 'dev10_865840'
 {
   .custom instance void [mscorlib]System.Security.SecurityCriticalAttribute::.ctor() = ( 01 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module dev10_865840.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_205323/starg0.il b/src/tests/JIT/Regression/JitBlue/DevDiv_205323/starg0.il
index 6163832fb25700..4e90ff1444e50f 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_205323/starg0.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_205323/starg0.il
@@ -7,7 +7,6 @@
 .assembly extern mscorlib {}
 .assembly starg0 {}
 .assembly extern xunit.core {}
-.module starg0.exe
 
 .class public F
 {
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_206786/handleMath.il b/src/tests/JIT/Regression/JitBlue/DevDiv_206786/handleMath.il
index 293573ddac3920..16295705537faa 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_206786/handleMath.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_206786/handleMath.il
@@ -7,7 +7,6 @@
 .assembly extern mscorlib {}
 .assembly handleMath {}
 .assembly extern xunit.core {}
-.module handleMath.exe
 
 .class public F
 {
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.il b/src/tests/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.il
index f60c4ee7e42771..54e30f60f824d1 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'initblk'{}
+.assembly 'DevDiv_255263'{}
 .assembly extern xunit.core {}
 
 .class public sealed Foo
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.il b/src/tests/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.il
index 5c9d3f0145233c..10eb8324671324 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.il
@@ -12,7 +12,7 @@
 
 .assembly extern mscorlib {}
 
-.assembly r {}
+.assembly 'DevDiv_278369' {}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit C extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523_32.il b/src/tests/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523_32.il
index 15f21508fab722..c0d9789c0cfdb7 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523_32.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523_32.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly a {}
+.assembly 'DevDiv_278523_32' {}
 .assembly extern xunit.core {}
-.module a.exe
 
 // This test originally triggered an assert when computing the value number for a block assignment. In particular, the
 // VN framework expected any block assignments to a tracked lclVar to have a destination address of the form
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523_64.il b/src/tests/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523_64.il
index 45d97a640962fd..998a7c57d3e12a 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523_64.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523_64.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly a {}
+.assembly 'DevDiv_278523_64' {}
 .assembly extern xunit.core {}
-.module a.exe
 
 // This test originally triggered an assert when computing the value number for a block assignment. In particular, the
 // VN framework expected any block assignments to a tracked lclVar to have a destination address of the form
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.il b/src/tests/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.il
index dc9eda4dc3d706..35694364f7d771 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.il
@@ -4,7 +4,6 @@
 .assembly extern mscorlib {}
 .assembly DevDiv_279396 {}
 .assembly extern xunit.core {}
-.module DevDiv_279396.exe
 
 // This test originally triggered an assertion in the emitter that ensured that no lclVar or lclFld access exceeded the
 // bounds of its containing method's frame. The problematic access was created during morphing by folding
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.il b/src/tests/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.il
index ec674fe77ed4b9..f2cea7f94b13f7 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.il
@@ -9,7 +9,7 @@
 // when remorphing, however, and the assertion was appropiately weakened.
 
 .assembly extern mscorlib {}
-.assembly DevDiv_1359733 {}
+.assembly 'DevDiv_359733' {}
 .assembly extern xunit.core {}
 
 .class private C extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.il b/src/tests/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.il
index 9dd923a452f9b8..e6a27994446154 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.il
@@ -13,7 +13,7 @@
 // The fix was to bump lclVar ref counts after remorphing but before attempting to remove the expression.
 
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_359734'{}
 .assembly extern xunit.core {}
 .class ILGEN_CLASS
 {
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_367099/DevDiv_367099.il b/src/tests/JIT/Regression/JitBlue/DevDiv_367099/DevDiv_367099.il
index 06e58888b0d079..aacd5def8408ed 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_367099/DevDiv_367099.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_367099/DevDiv_367099.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly devdiv_367099 {}
+.assembly 'DevDiv_367099' {}
 .assembly extern xunit.core {}
 
 .class public auto ansi beforefieldinit P
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_397793/DevDiv_397793.il b/src/tests/JIT/Regression/JitBlue/DevDiv_397793/DevDiv_397793.il
index 325d776513e8e4..8df37ec5653a17 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_397793/DevDiv_397793.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_397793/DevDiv_397793.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_397793'{}
 .assembly extern xunit.core {}
 
 // This test originally failed compilation during CSE due to value numbers that were discarded during remorphing.
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.il b/src/tests/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.il
index 098c7f8b300ced..5ca39b848091ab 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_406156'{}
 .assembly extern xunit.core {}
 
 .class ILGEN_CLASS
@@ -145,7 +145,7 @@
 // Reading from 'lir_cpp__1524____Assertion_failed__next____def_____found_def_after_use_.mc' dumping raw IL for MC Indexes to console
 // ProcessName - 'ILGEN'
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_406156'{}
 .assembly extern xunit.core
 {
     .publickeytoken = (
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.il b/src/tests/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.il
index fbf7df47382588..5125d09a856f86 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_406158'{}
 .assembly extern xunit.core {}
 .class ILGEN_CLASS
 {
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_462269/DevDiv_462269.il b/src/tests/JIT/Regression/JitBlue/DevDiv_462269/DevDiv_462269.il
index e6550faf2a517e..67c44b906b0e21 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_462269/DevDiv_462269.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_462269/DevDiv_462269.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_462269'{}
 .assembly extern xunit.core {}
 .class ILGEN_CLASS
 {
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_462274/DevDiv_462274.il b/src/tests/JIT/Regression/JitBlue/DevDiv_462274/DevDiv_462274.il
index c7b6702ef159e1..f7dcaab107e5ac 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_462274/DevDiv_462274.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_462274/DevDiv_462274.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_462274'{}
 .assembly extern xunit.core {}
 .class ILGEN_CLASS
 {
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_471670/DevDiv_471670.il b/src/tests/JIT/Regression/JitBlue/DevDiv_471670/DevDiv_471670.il
index 62d82cac58a9bc..b0c987e83e8d6e 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_471670/DevDiv_471670.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_471670/DevDiv_471670.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_471670'{}
 .assembly extern xunit.core {}
 .class ILGEN_CLASS
 {
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_487699/DevDiv_487699.il b/src/tests/JIT/Regression/JitBlue/DevDiv_487699/DevDiv_487699.il
index 909acd85586503..ce3d17f60fef51 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_487699/DevDiv_487699.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_487699/DevDiv_487699.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly a {}
+.assembly 'DevDiv_487699' {}
 .assembly extern xunit.core {}
-.module a.exe
 
 // This test originally triggered an error, that we do not reload shift index, if it was spilled to rcx.
 
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_487701/DevDiv_487701.il b/src/tests/JIT/Regression/JitBlue/DevDiv_487701/DevDiv_487701.il
index d434791ac747eb..9a27ef67db7723 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_487701/DevDiv_487701.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_487701/DevDiv_487701.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly ILGEN_MODULE {}
+.assembly 'DevDiv_487701' {}
 .assembly extern xunit.core {}
 
 .class ILGEN_CLASS
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_487702/DevDiv_487702.il b/src/tests/JIT/Regression/JitBlue/DevDiv_487702/DevDiv_487702.il
index ff069bc3c4c89a..a47abe31e9e758 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_487702/DevDiv_487702.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_487702/DevDiv_487702.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly ILGEN_MODULE {}
+.assembly 'DevDiv_487702' {}
 .assembly extern xunit.core {}
 
 .class ILGEN_CLASS
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_487703/DevDiv_487703.il b/src/tests/JIT/Regression/JitBlue/DevDiv_487703/DevDiv_487703.il
index 2d00052870fc56..b6e421ff98668b 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_487703/DevDiv_487703.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_487703/DevDiv_487703.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly ILGEN_MODULE {}
+.assembly 'DevDiv_487703' {}
 .assembly extern xunit.core {}
 
 .class ILGEN_CLASS
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_491206/DevDiv_491206.il b/src/tests/JIT/Regression/JitBlue/DevDiv_491206/DevDiv_491206.il
index 74a9c7f50e9813..0ebbd7dfeda23a 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_491206/DevDiv_491206.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_491206/DevDiv_491206.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly a {}
+.assembly 'DevDiv_491206' {}
 .assembly extern xunit.core {}
-.module a.exe
 
 // This test originally triggered an assert Extra_flags_on_tree, because fgMorphCast did not reset an asignment flag, when
 // its children was optimized in the assertion propagation.
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_491211/DevDiv_491211.il b/src/tests/JIT/Regression/JitBlue/DevDiv_491211/DevDiv_491211.il
index 9ad78cb54284bf..14e7f321d5c676 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_491211/DevDiv_491211.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_491211/DevDiv_491211.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly ILGEN_MODULE {}
+.assembly 'DevDiv_491211' {}
 .assembly extern xunit.core {}
 
 .class ILGEN_CLASS
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_495792/DevDiv_495792.il b/src/tests/JIT/Regression/JitBlue/DevDiv_495792/DevDiv_495792.il
index 0038bc763324b0..c09b2da5c84995 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_495792/DevDiv_495792.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_495792/DevDiv_495792.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly a {}
+.assembly 'DevDiv_495792' {}
 .assembly extern xunit.core {}
-.module a.exe
 
 // This test originally triggered an assert Extra_flags_on_tree, because fgMorphCast did not reset an asignment flag, when
 // its children was optimized in the assertion propagation.
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_524312/DevDiv_524312.il b/src/tests/JIT/Regression/JitBlue/DevDiv_524312/DevDiv_524312.il
index 16ce5ad9450f42..6686ddbd5064ba 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_524312/DevDiv_524312.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_524312/DevDiv_524312.il
@@ -5,7 +5,7 @@
 
 
 .assembly extern mscorlib{}
-.assembly ILGEN_MODULE{}
+.assembly 'DevDiv_524312'{}
 .assembly extern xunit.core {}
 
 .class ILGEN_CLASS
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_545497/DevDiv_545497.il b/src/tests/JIT/Regression/JitBlue/DevDiv_545497/DevDiv_545497.il
index 40b8b7b63d9a5b..d7baf1ac11f55a 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_545497/DevDiv_545497.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_545497/DevDiv_545497.il
@@ -5,7 +5,7 @@
 // the IL_0090 shift operand.
 
 .assembly extern System.Runtime { auto }
-.assembly DevDiv_524309 {}
+.assembly 'DevDiv_545497' {}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit DevDiv_545497
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_578217/DevDiv_578217.il b/src/tests/JIT/Regression/JitBlue/DevDiv_578217/DevDiv_578217.il
index 3d942ee5c07df4..f9ab66378a9833 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_578217/DevDiv_578217.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_578217/DevDiv_578217.il
@@ -8,7 +8,7 @@
 
 // Metadata version: v4.0.30319
 .assembly extern System.Runtime { auto }
-.assembly DevDiv_524309 {}
+.assembly 'DevDiv_578217' {}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit DevDiv_578217.Program
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_754566/DevDiv_754566.il b/src/tests/JIT/Regression/JitBlue/DevDiv_754566/DevDiv_754566.il
index 58d778ab3e911c..b45a41ba89542b 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_754566/DevDiv_754566.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_754566/DevDiv_754566.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly test
+.assembly 'DevDiv_754566'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -17,7 +17,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {A80A87C4-1DDB-4F93-AB31-444266FDFA55}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.il b/src/tests/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.il
index 7210a644cf9312..17b1bd47eb2392 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_11804/GitHub_11804.il
@@ -17,7 +17,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module GitHub_11804.exe
 // MVID: {9CC2AC15-DDA3-4ADF-9566-89AB25A8CF63}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_15291/GitHub_15291.il b/src/tests/JIT/Regression/JitBlue/GitHub_15291/GitHub_15291.il
index 220e1b5e0b60a4..ff5c54f77d65c5 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_15291/GitHub_15291.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_15291/GitHub_15291.il
@@ -10,7 +10,7 @@
 .assembly extern System.Runtime { auto }
 .assembly extern mscorlib { auto }
 
-.assembly GitHub_15219 {}
+.assembly 'GitHub_15291' {}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit P
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_18295/GitHub_18295.il b/src/tests/JIT/Regression/JitBlue/GitHub_18295/GitHub_18295.il
index 3ca3541f162c34..306779e9985eae 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_18295/GitHub_18295.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_18295/GitHub_18295.il
@@ -3,7 +3,7 @@
 
 .assembly extern mscorlib { auto }
 .assembly extern System.Console {auto}
-.assembly UnusedValueBug { }
+.assembly 'GitHub_18295' { }
 .assembly extern xunit.core {}
 
 // This bug was found on desktop CLR using ILGEN.
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_20799/GitHub_20799.il b/src/tests/JIT/Regression/JitBlue/GitHub_20799/GitHub_20799.il
index aa7310d88b1ed8..93fc245a7499c7 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_20799/GitHub_20799.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_20799/GitHub_20799.il
@@ -5,7 +5,6 @@
 .assembly extern System.Console { }
 .assembly GitHub_20799 { }
 .assembly extern xunit.core {}
-.module GitHub_20799.exe
 
 // GitHub 20799: a bug is reproduced when
 // 1) a method requires GSSecurityCookie (e.g. when allocating unsafe buffer using localloc)
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_23147/GitHub_23147.il b/src/tests/JIT/Regression/JitBlue/GitHub_23147/GitHub_23147.il
index 0b37055eb656f0..f4144b65694340 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_23147/GitHub_23147.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_23147/GitHub_23147.il
@@ -7,7 +7,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module GitHub_23147.exe
 
 .class private sequential ansi sealed beforefieldinit Test_GitHub_23147.HFA_f2
        extends [System.Runtime]System.ValueType
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_23411/GitHub_23411.il b/src/tests/JIT/Regression/JitBlue/GitHub_23411/GitHub_23411.il
index 5ef139260ffcb7..ac995815a9668b 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_23411/GitHub_23411.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_23411/GitHub_23411.il
@@ -8,7 +8,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module GitHub_23411.exe
 
 .class public auto ansi beforefieldinit GitHub_23411
 	extends [System.Runtime]System.Object
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_23792/GitHub_23792.il b/src/tests/JIT/Regression/JitBlue/GitHub_23792/GitHub_23792.il
index 70755752f1025f..e84686ea273e37 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_23792/GitHub_23792.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_23792/GitHub_23792.il
@@ -15,7 +15,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern System.Console{}
-.assembly a {}
+.assembly 'GitHub_23792' {}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit Test_GitHub_23792
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_24278/GitHub_24278.il b/src/tests/JIT/Regression/JitBlue/GitHub_24278/GitHub_24278.il
index 8ea9e1f8f017ac..a2407aa27759ae 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_24278/GitHub_24278.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_24278/GitHub_24278.il
@@ -4,7 +4,6 @@
 .assembly extern System.Runtime { }
 .assembly GitHub_24278 { }
 .assembly extern xunit.core {}
-.module GitHub_24278.exe
 
 // GitHub 24278: a bug is reproduced when
 // 1) a register is used in the prolog for initializing GSSecurityCookie (i.e. the register contains a random non-zero value) and
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_35821/GitHub_35821.il b/src/tests/JIT/Regression/JitBlue/GitHub_35821/GitHub_35821.il
index 19a1f1a1397a2e..5b4f433af50017 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_35821/GitHub_35821.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_35821/GitHub_35821.il
@@ -11,9 +11,8 @@
   .publickeytoken = (CC 7B 13 FF CD 2D DD 51 )                         // .{...-.Q
   .ver 5:0:0:0
 }
-.assembly projs { }
+.assembly 'GitHub_35821' { }
 .assembly extern xunit.core {}
-.module projs.dll
 // MVID: {379016DB-73C2-41D4-9E5F-5B727BC70E2C}
 .custom instance void [System.Runtime]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x00400000
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.il b/src/tests/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.il
index 900049fbe86e55..578c4d17a77196 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly a {}
+.assembly 'GitHub_9651' {}
 .assembly extern xunit.core {}
-.module a.exe
 
 // Test case triggers reimportation of a leave,
 // leading to an unreachable callfinally pair.
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_40607/Runtime_40607.il b/src/tests/JIT/Regression/JitBlue/Runtime_40607/Runtime_40607.il
index a8c21251263b24..ee73455d149f1d 100644
--- a/src/tests/JIT/Regression/JitBlue/Runtime_40607/Runtime_40607.il
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_40607/Runtime_40607.il
@@ -11,7 +11,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module Runtime_40607.dll
 
 .class private auto ansi beforefieldinit Runtime_40607.Program extends [System.Runtime]System.Object
 {
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_43130/Runtime_43130.il b/src/tests/JIT/Regression/JitBlue/Runtime_43130/Runtime_43130.il
index c2195f1f28fe51..ca16e3a6376411 100644
--- a/src/tests/JIT/Regression/JitBlue/Runtime_43130/Runtime_43130.il
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_43130/Runtime_43130.il
@@ -15,7 +15,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module Runtime_43130.dll
 
 .class private auto ansi beforefieldinit Runtime_43130
        extends [System.Runtime]System.Object
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_45250/Runtime_45250.il b/src/tests/JIT/Regression/JitBlue/Runtime_45250/Runtime_45250.il
index 149dcc590f1369..62955a7ea4b4c8 100644
--- a/src/tests/JIT/Regression/JitBlue/Runtime_45250/Runtime_45250.il
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_45250/Runtime_45250.il
@@ -8,7 +8,6 @@
 {
 }
 .assembly extern xunit.core {}
-.module Runtime_45250.dll
 
 .class private auto ansi beforefieldinit Runtime_45250.Program
        extends [System.Runtime]System.Object
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_47308/Runtime_47308.il b/src/tests/JIT/Regression/JitBlue/Runtime_47308/Runtime_47308.il
index f94c820ac078a7..e1948a31c37155 100644
--- a/src/tests/JIT/Regression/JitBlue/Runtime_47308/Runtime_47308.il
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_47308/Runtime_47308.il
@@ -9,7 +9,7 @@
 
 .assembly extern System.Console {}
 
-.assembly Test1 {}
+.assembly 'Runtime_47308' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class FullProof {
diff --git a/src/tests/JIT/Regression/JitBlue/devdiv_815941/DevDiv_815941.il b/src/tests/JIT/Regression/JitBlue/devdiv_815941/DevDiv_815941.il
index 7e794ad146248c..81d8ad457afce1 100644
--- a/src/tests/JIT/Regression/JitBlue/devdiv_815941/DevDiv_815941.il
+++ b/src/tests/JIT/Regression/JitBlue/devdiv_815941/DevDiv_815941.il
@@ -9,7 +9,6 @@
 .assembly extern mscorlib { }
 .assembly DevDiv_815941 { }
 .assembly extern xunit.core {}
-.module DevDiv_815941.exe
 
 .class Repro
 {
diff --git a/src/tests/JIT/Regression/JitBlue/devdiv_815942/DevDiv_815942.il b/src/tests/JIT/Regression/JitBlue/devdiv_815942/DevDiv_815942.il
index f64eee564486f7..de247f88e378eb 100644
--- a/src/tests/JIT/Regression/JitBlue/devdiv_815942/DevDiv_815942.il
+++ b/src/tests/JIT/Regression/JitBlue/devdiv_815942/DevDiv_815942.il
@@ -9,7 +9,6 @@
 .assembly extern mscorlib { }
 .assembly DevDiv_815942 {}
 .assembly extern xunit.core {}
-.module DevDiv_815942.exe
 
 .class Repro
 {
diff --git a/src/tests/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.il b/src/tests/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.il
index 5c31c67b280571..e618fd529d5bc0 100644
--- a/src/tests/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.il
+++ b/src/tests/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.il
@@ -8,9 +8,8 @@
 }
 
 .assembly extern mscorlib {}
-.assembly test {}
+.assembly 'DevDiv_902271' {}
 .assembly extern xunit.core {}
-.module test.exe
 
 .class Repro
 {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.il
index 65faac282c13f5..3e143973f45781 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x4d97cd70 {}
+.assembly 'b102759' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x4d97cd70 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.il
index 578641630ac3e6..b77303127d6531 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xc96205c9 {}
+.assembly 'b102870' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xc96205c9 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b106158/branchoutoftry.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b106158/branchoutoftry.il
index 92bbd09a0bf065..b21b3b37f62221 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b106158/branchoutoftry.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b106158/branchoutoftry.il
@@ -15,13 +15,12 @@
 .assembly extern mscorlib
 {
 }
-.assembly testit
+.assembly 'branchoutoftry'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module testit.exe
 // MVID: {55BD0E59-8783-4990-A94D-348582FD2ED5}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.il
index 854a08b53ed61a..9ddca66631c18b 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x45f9b5e5 {}
+.assembly 'b108908' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x45f9b5e5 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b112348/length0.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b112348/length0.il
index 5e763faa5206bf..e2ac895ac9ee87 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b112348/length0.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b112348/length0.il
@@ -13,13 +13,12 @@
 
 .assembly extern mscorlib {}
 
-.assembly test
+.assembly 'length0'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module test.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b112982/exceptobj.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b112982/exceptobj.il
index 6f190d0945e250..5214b7f4831ec7 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b112982/exceptobj.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b112982/exceptobj.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly excepobj
+.assembly 'exceptobj'
 {
 }
 .assembly extern xunit.core {}
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.il
index 948ea0d84f3f59..e0cc28546cab1f 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly Test_b115103 {}
+.assembly 'b115103' {}
 .assembly extern xunit.core {}
 .class Test_b115103 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b141062/ericswitch.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b141062/ericswitch.il
index c527ea53e5d2ec..0e769e7e1d0371 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b141062/ericswitch.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b141062/ericswitch.il
@@ -25,7 +25,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module ericswitch.exe
 // MVID: {392F7FED-ADA8-4853-8A34-B9F492F92525}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.il
index c7a0c2e071ba31..d7830cfdec279b 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.il
@@ -9,7 +9,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xdbcacf66 {}
+.assembly 'b79852' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xdbcacf66 {
 
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.il
index 535565b401d9b7..b91f353238482c 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x8275b048 {}
+.assembly 'b79858' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x8275b048 {
 .method static void  Method_0x98c7d74e() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365-ia64.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365-ia64.il
index 22f67e2702a035..d89f596562b1ed 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365-ia64.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365-ia64.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x71d10697 {}
+.assembly 'b80365-ia64' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x71d10697 {
 .method static unsigned int64  Method_0x77f6a2f8() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.il
index 787769bd1fba8d..9b2409997d5e74 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xe2ce7565 {}
+.assembly 'b80373' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xe2ce7565 {
 .method static unsigned int8  Method_0xe8a4bb67(int64 Arg_0x0, unsigned int16 Arg_0x1, unsigned int64 Arg_0x2, unsigned int16 Arg_0x3, int32 Arg_0x4) {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80737/fbug5.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80737/fbug5.il
index a2c29c6408e1ad..5cfb2229bb282b 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80737/fbug5.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80737/fbug5.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xca1e3399 {}
+.assembly 'fbug5' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xca1e3399 {
 .method static unsigned int32  Method_0x8f2f764c() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80738/fbug6.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80738/fbug6.il
index 6c2758ce89468f..000f6c251f782f 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80738/fbug6.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b80738/fbug6.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xfa70290a {}
+.assembly 'fbug6' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xfa70290a {
 .method static unsigned int8  Method_0x8f046f0b(unsigned int16 Arg_0x0, int8 Arg_0x1, int8 Arg_0x2, native int Arg_0x3, unsigned int64 Arg_0x4) {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.il
index 8a69b9613225cd..de4f7f427c3247 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xddaef29d {}
+.assembly 'b85317' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xddaef29d {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b98431/ConsoleApplication2.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b98431/ConsoleApplication2.il
index d745a1bb8c2b0c..a26fff459e8970 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b98431/ConsoleApplication2.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b98431/ConsoleApplication2.il
@@ -31,7 +31,6 @@
   .ver 1:0:583:22480
 }
 .assembly extern xunit.core {}
-.module ConsoleApplication2.exe
 .imagebase 0x11000000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b99403/cbyte7a.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b99403/cbyte7a.il
index 16c63cb0c4adf9..62ff6a2a41b356 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b99403/cbyte7a.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b99403/cbyte7a.il
@@ -13,7 +13,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly CByte7a
+.assembly 'cbyte7a'
 {
 
 
@@ -31,7 +31,6 @@
   .ver 1:0:585:20133
 }
 .assembly extern xunit.core {}
-.module CByte7a.exe
 .imagebase 0x11000000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/cs_il.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/cs_il.il
index 3e40d16e358dba..77ab340d87cad4 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/cs_il.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/cs_il.il
@@ -7,7 +7,7 @@
 .assembly extern legacy library mscorlib
 {
 }
-.assembly legacy library cs_test_01
+.assembly legacy library 'cs_il'
 {
 
 
@@ -15,7 +15,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module cs_test_01.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/loop_06_24_02.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/loop_06_24_02.il
index 6a68bc663beb46..6b2644e0606b16 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/loop_06_24_02.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/loop_06_24_02.il
@@ -14,12 +14,11 @@
 {
   .ver 0:0:0:0
 }
-.assembly legacy library test
+.assembly legacy library 'loop_06_24_02'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module hello.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/bug1.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/bug1.il
index 51ac95e9eda215..bbc2e5be6d2d6c 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/bug1.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/bug1.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly ILGEN_0xc766623d {}
+.assembly 'bug1' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class ILGEN_0xc766623d {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/2.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/2.il
index cc08c7cc93e6a1..0ae64be4dfe043 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/2.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/2.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb8267005 {}
+.assembly '2' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb8267005 {
 
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/repro.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/repro.il
index 9281bcc5bdc316..51b5804085e81b 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/repro.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/repro.il
@@ -16,7 +16,7 @@
 {
   .ver 0:0:0:0
 }
-.assembly test
+.assembly 'repro'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module convovf_i8_u.exe
 // MVID: {8F1AC63C-507C-42CD-B9EC-7E585802DBD0}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/repro_good.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/repro_good.il
index e60550734c8832..628fee2534fd75 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/repro_good.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/repro_good.il
@@ -14,7 +14,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly main
+.assembly 'repro_good'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -25,7 +25,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module main.exe
 // MVID: {8652F29E-ADDD-4F29-9B4B-0D71E9CFC6D1}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/test3.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/test3.il
index ac92a3d38eeb65..28f406a8a854f0 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/test3.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/test3.il
@@ -21,7 +21,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module test3.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/bug2.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/bug2.il
index 708e1e015f355e..878530085064ba 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/bug2.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/bug2.il
@@ -9,7 +9,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly 'switch'
+.assembly 'bug2'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -20,7 +20,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module switch.exe
 // MVID: {663074E2-0B73-434A-85B1-7077AA61100B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/test_07.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/test_07.il
index 9ff1264337da9e..7b49b7f45604b2 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/test_07.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/test_07.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly delegate26{}
+.assembly 'test_07'{}
 .assembly extern xunit.core {}
-.module delegate26.exe
 
 .class public auto ansi beforefieldinit Client extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/test_10.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/test_10.il
index d5a590f9752907..af758a263a7e52 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/test_10.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/test_10.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly base017{}
+.assembly 'test_10'{}
 .assembly extern xunit.core {}
-.module base017.exe
 
 
   .class public sequential ansi sealed beforefieldinit base017
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/nullref.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/nullref.il
index ef494412570819..17745bd850dc9b 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/nullref.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/nullref.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly field017{}
+.assembly 'nullref'{}
 .assembly extern xunit.core {}
-.module field017.exe
 
 .class private auto ansi beforefieldinit MyTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/test_04a.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/test_04a.il
index 12193238b5fb7c..b39782ac0348b5 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/test_04a.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/test_04a.il
@@ -10,9 +10,8 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test {}
+.assembly 'test_04a' {}
 .assembly extern xunit.core {}
-.module test_04a.exe
 
 .class private auto ansi beforefieldinit test extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/test_04a.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/test_04a.il
index a68bc273626359..4b78e0568ce8d2 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/test_04a.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/test_04a.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly test_08{}
+.assembly 'test_04a'{}
 .assembly extern xunit.core {}
-.module test_08.exe
 
 .class public auto ansi beforefieldinit repro
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/test_17.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/test_17.il
index 648b559e9b16cd..1f707e91518a94 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/test_17.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/test_17.il
@@ -4,7 +4,6 @@
 .assembly extern mscorlib{}
 .assembly test_17{}
 .assembly extern xunit.core {}
-.module test_17.exe
 
 .class interface public abstract auto ansi ITrees
 {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/init_byte.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/init_byte.il
index f97e68f1a10f63..1d8f50b5cb7374 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/init_byte.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/init_byte.il
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module init_byte.exe
 // MVID: {FDCD7B4C-5230-4304-82F7-A3D10057533E}
 .imagebase 0x00400000
 .file alignment 0x00001000
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/repro.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/repro.il
index ce590a360454c9..5ddb33eaca0f4d 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/repro.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/repro.il
@@ -2,7 +2,7 @@
 .assembly extern legacy library mscorlib {}
 .assembly extern common{}
 .assembly extern legacy library mscorlib {}
-.assembly call06{}
+.assembly 'repro'{}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit LocallocTest
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/hole.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/hole.il
index 9ebf0969e6a534..106c4605d41f41 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/hole.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/hole.il
@@ -14,7 +14,6 @@
 }
 .assembly hole {}
 .assembly extern xunit.core {}
-.module hole.exe
 // MVID: {972ABF67-C385-44E6-B525-571BCCECC13C}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/tailcallcalli.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/tailcallcalli.il
index 458cee9fae1677..84d37afd7116fb 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/tailcallcalli.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/tailcallcalli.il
@@ -16,12 +16,11 @@
 {
   .ver 0:0:0:0
 }
-.assembly legacy library bug
+.assembly legacy library 'tailcallcalli'
 {
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module bug.exe
 // MVID: {643CA244-98FB-40AF-A64C-CDBA1F121F03}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/test_08.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/test_08.il
index 823bdd4dc0ccf2..cb4784c64845da 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/test_08.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/test_08.il
@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly attrib014_2{}
+.assembly 'test_08'{}
 .assembly extern xunit.core {}
-.module attrib014_2.exe
 
 .class private auto ansi import beforefieldinit ShellApplication
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/call01.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/call01.il
index 36aa6bafd64cec..44f52cbcb6b05f 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/call01.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/call01.il
@@ -25,7 +25,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module call01.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/bug2.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/bug2.il
index 0c6433cc71afac..c24a5350b543d6 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/bug2.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/bug2.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xf14ee849 {}
+.assembly 'bug2' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xf14ee849
 {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/bug5.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/bug5.il
index 03dc81fc6cff2f..3c96c8db37460b 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/bug5.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/bug5.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xa2df15de {}
+.assembly 'bug5' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xa2df15de {
 .field static native int[] field_0x0
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/test_25.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/test_25.il
index 766dcb6550a529..cc9e755099488d 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/test_25.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/test_25.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly jumper{}
+.assembly 'test_25'{}
 .assembly extern xunit.core {}
 
   .class private sequential ansi sealed beforefieldinit VT
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/test1a.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/test1a.il
index 5b4ba3aed018a8..388232c1b2307d 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/test1a.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/test1a.il
@@ -15,7 +15,7 @@
 .assembly extern mscorlib
 {
 }
-.assembly test
+.assembly 'test1a'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {268B9244-26E3-4F41-AE49-5311347AFB4B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/bug4.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/bug4.il
index b2eadf1fc46002..44f077e11d7d21 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/bug4.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/bug4.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xd3a45436 {}
+.assembly 'bug4' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xd3a45436
 {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/test.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/test.il
index e69373341be5f3..035f4a2ed6d825 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/test.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/test.il
@@ -26,7 +26,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module test.exe
 // MVID: {268B9244-26E3-4F41-AE49-5311347AFB4B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/test_01.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/test_01.il
index f8c7e53130cdae..2e264509f644c8 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/test_01.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/test_01.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern mscorlib{}
-.assembly double_ulong_e_1{}
+.assembly 'test_01'{}
 .assembly extern xunit.core {}
 
   .class public auto ansi beforefieldinit Driver extends [mscorlib]System.Object
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/test_09.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/test_09.il
index b9dddadef53f66..7b65a556f1d806 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/test_09.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/test_09.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 .assembly extern mscorlib{}
-.assembly decm014{}
+.assembly 'test_09'{}
 .assembly extern xunit.core {}
 
 .class public auto ansi beforefieldinit MyClass
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/branch_06.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/branch_06.il
index 8abf433f3ef3ec..f81c0374e5e3eb 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/branch_06.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/branch_06.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib{}
-.assembly test{}
+.assembly 'branch_06'{}
 .assembly extern xunit.core {}
 
 .class private auto ansi beforefieldinit test
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/1.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/1.il
index 04ce939528a85c..00dcdf2ff99069 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/1.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/1.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0x5f95bcd2 {}
+.assembly '1' {}
 .assembly extern xunit.core {}
 .class ILGEN_0x5f95bcd2 {
 .method static int32 Main() {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/test64.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/test64.il
index 3db875af5f3393..919f22da848ed6 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/test64.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/test64.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test {}
+.assembly 'test64' {}
 .assembly extern xunit.core {}
 
 
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/2.il b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/2.il
index f5b6c21959397e..52ec46e77feb54 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/2.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/2.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ILGEN_0xb8267005 {}
+.assembly '2' {}
 .assembly extern xunit.core {}
 .class ILGEN_0xb8267005 {
 
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/bug2.il b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/bug2.il
index a4cb71fd14db4f..5fe26e2499fe5b 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/bug2.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/bug2.il
@@ -7,7 +7,7 @@
   .ver 4:0:0:0
 }
 
-.assembly Test1 {}
+.assembly 'bug2' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class FullProof {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.il b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.il
index 8e770bab452336..50e4e656d36796 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.il
@@ -17,14 +17,13 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly foo
+.assembly 'b333008'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module foo.exe
 // MVID: {71EBFD38-3F6F-4607-8A53-CC82B4C15BE3}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.il b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.il
index f71bb24a619887..0b3da33da18028 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.il
@@ -17,14 +17,13 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly foo
+.assembly 'b356258'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module foo.exe
 // MVID: {3C4B1460-B1C6-4337-8B12-587C5269CE8D}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.il b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.il
index aaae03d8dc61ed..68ec509e7575f5 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly repro_32
+.assembly 'b431098'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
 }
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.il b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.il
index f5bcff056f687d..167744ffcd6346 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.il
@@ -8,7 +8,7 @@
 }
 
 
-.assembly Test1 {}
+.assembly 'b460385' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 .class FullProof {
diff --git a/src/tests/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.il b/src/tests/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.il
index 5f2ac9b0f46eb0..175caab1cc94ea 100644
--- a/src/tests/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.il
+++ b/src/tests/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.il
@@ -13,13 +13,12 @@
 
 
 // Metadata version: v2.0.50727
-.module extern kernel32
 .assembly extern mscorlib
 {
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly ddb173569
+.assembly 'b173569'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
diff --git a/src/tests/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.il b/src/tests/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.il
index 3f34ad40ccac63..64af5d3f83d9d1 100644
--- a/src/tests/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.il
+++ b/src/tests/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.il
@@ -5,7 +5,7 @@
 
 
 
-.assembly ILGEN_0xad4651aa {}
+.assembly 'b602182' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
diff --git a/src/tests/JIT/Regression/v4/dev10_804810/dev10_804810.il b/src/tests/JIT/Regression/v4/dev10_804810/dev10_804810.il
index 6ff191b3742bab..ca6cb47132871b 100644
--- a/src/tests/JIT/Regression/v4/dev10_804810/dev10_804810.il
+++ b/src/tests/JIT/Regression/v4/dev10_804810/dev10_804810.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly TestCase
+.assembly 'dev10_804810'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -23,7 +23,6 @@
   .ver 0:0:0:0
 }
 .assembly extern xunit.core {}
-.module TestCase.exe
 // MVID: {3357017E-FF15-4114-B1F9-AB857327E8CC}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.il b/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.il
index e1138aa44e7737..90ceefe4e802f0 100644
--- a/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.il
+++ b/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.il
@@ -10,8 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib {}
 .assembly extern common {}
-.assembly test {}
-.module throw.exe
+.assembly 'throwisfirstinstruction' {}
 
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/call/call05_dynamic.il b/src/tests/JIT/jit64/localloc/call/call05_dynamic.il
index c255270b2bddfb..b51a997eb4e707 100644
--- a/src/tests/JIT/jit64/localloc/call/call05_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/call/call05_dynamic.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly call05{}
+.assembly 'call05_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/call/call05_large.il b/src/tests/JIT/jit64/localloc/call/call05_large.il
index 19fc4e65c39460..abe3a04dd7e392 100644
--- a/src/tests/JIT/jit64/localloc/call/call05_large.il
+++ b/src/tests/JIT/jit64/localloc/call/call05_large.il
@@ -9,7 +9,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly call05{}
+.assembly 'call05_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/call/call05_small.il b/src/tests/JIT/jit64/localloc/call/call05_small.il
index d80856db385dff..bef8fdb9e3f770 100644
--- a/src/tests/JIT/jit64/localloc/call/call05_small.il
+++ b/src/tests/JIT/jit64/localloc/call/call05_small.il
@@ -9,7 +9,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly call05{}
+.assembly 'call05_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/call/call07_dynamic.il b/src/tests/JIT/jit64/localloc/call/call07_dynamic.il
index 1d7f16f1b2e0bd..d753ba25f249ea 100644
--- a/src/tests/JIT/jit64/localloc/call/call07_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/call/call07_dynamic.il
@@ -8,7 +8,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly call07{}
+.assembly 'call07_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/call/call07_small.il b/src/tests/JIT/jit64/localloc/call/call07_small.il
index b7d5ab5223ac0b..774232f169d92d 100644
--- a/src/tests/JIT/jit64/localloc/call/call07_small.il
+++ b/src/tests/JIT/jit64/localloc/call/call07_small.il
@@ -8,7 +8,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly call07{}
+.assembly 'call07_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/eh/eh03_dynamic.il b/src/tests/JIT/jit64/localloc/eh/eh03_dynamic.il
index 9daa299698651f..a124c8d7c86673 100644
--- a/src/tests/JIT/jit64/localloc/eh/eh03_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/eh/eh03_dynamic.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common {}
-.assembly eh03{}
+.assembly 'eh03_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/eh/eh03_large.il b/src/tests/JIT/jit64/localloc/eh/eh03_large.il
index 773951577a4b3f..784b850baf636e 100644
--- a/src/tests/JIT/jit64/localloc/eh/eh03_large.il
+++ b/src/tests/JIT/jit64/localloc/eh/eh03_large.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common {}
-.assembly eh03{}
+.assembly 'eh03_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/eh/eh03_small.il b/src/tests/JIT/jit64/localloc/eh/eh03_small.il
index 150e3d0cc47f23..53b60ab333cbd6 100644
--- a/src/tests/JIT/jit64/localloc/eh/eh03_small.il
+++ b/src/tests/JIT/jit64/localloc/eh/eh03_small.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common {}
-.assembly eh03{}
+.assembly 'eh03_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/eh/eh04_dynamic.il b/src/tests/JIT/jit64/localloc/eh/eh04_dynamic.il
index f2b0f8456477f7..efa5301677af76 100644
--- a/src/tests/JIT/jit64/localloc/eh/eh04_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/eh/eh04_dynamic.il
@@ -9,7 +9,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh03{}
+.assembly 'eh04_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/eh/eh04_large.il b/src/tests/JIT/jit64/localloc/eh/eh04_large.il
index 584f4db66bd77a..c6345752e3355e 100644
--- a/src/tests/JIT/jit64/localloc/eh/eh04_large.il
+++ b/src/tests/JIT/jit64/localloc/eh/eh04_large.il
@@ -9,7 +9,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh03{}
+.assembly 'eh04_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/eh/eh04_small.il b/src/tests/JIT/jit64/localloc/eh/eh04_small.il
index d33598b21742cd..71dd321d884794 100644
--- a/src/tests/JIT/jit64/localloc/eh/eh04_small.il
+++ b/src/tests/JIT/jit64/localloc/eh/eh04_small.il
@@ -9,7 +9,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh03{}
+.assembly 'eh04_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh05_dynamic.il b/src/tests/JIT/jit64/localloc/ehverify/eh05_dynamic.il
index 0db6ea3f45ec91..57c8304469504f 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh05_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh05_dynamic.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh05_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh05_large.il b/src/tests/JIT/jit64/localloc/ehverify/eh05_large.il
index b0daafa3cfe59c..bbbe22e02ca1db 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh05_large.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh05_large.il
@@ -8,7 +8,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh05_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh05_small.il b/src/tests/JIT/jit64/localloc/ehverify/eh05_small.il
index 01aa29f90b4ae4..c6b673d44056cd 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh05_small.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh05_small.il
@@ -8,7 +8,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh05_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh06_dynamic.il b/src/tests/JIT/jit64/localloc/ehverify/eh06_dynamic.il
index 548edf5d40d8d7..6f7b052f29b94f 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh06_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh06_dynamic.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh06_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh06_large.il b/src/tests/JIT/jit64/localloc/ehverify/eh06_large.il
index e8194f277a15c7..1c1f421d6810a7 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh06_large.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh06_large.il
@@ -8,7 +8,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh06_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh06_small.il b/src/tests/JIT/jit64/localloc/ehverify/eh06_small.il
index cf0f2cef6a18e8..f865a02a08a43a 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh06_small.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh06_small.il
@@ -8,7 +8,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh06_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh07_dynamic.il b/src/tests/JIT/jit64/localloc/ehverify/eh07_dynamic.il
index ab15798ce21821..81f0eda710c57f 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh07_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh07_dynamic.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh07_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh07_large.il b/src/tests/JIT/jit64/localloc/ehverify/eh07_large.il
index b097e5614c3ec7..9502fe09cfa2cb 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh07_large.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh07_large.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh07_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh07_small.il b/src/tests/JIT/jit64/localloc/ehverify/eh07_small.il
index 0bde1fd0678138..efc37edc7410a3 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh07_small.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh07_small.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh07_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh08_dynamic.il b/src/tests/JIT/jit64/localloc/ehverify/eh08_dynamic.il
index c323b96db2c77e..331c9940bd85d0 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh08_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh08_dynamic.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh08_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh08_large.il b/src/tests/JIT/jit64/localloc/ehverify/eh08_large.il
index 9cc01277ab1028..c43bb2b3772150 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh08_large.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh08_large.il
@@ -8,7 +8,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh08_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh08_small.il b/src/tests/JIT/jit64/localloc/ehverify/eh08_small.il
index 6113ead2f81a10..1a2f4a07b79466 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh08_small.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh08_small.il
@@ -8,7 +8,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh05{}
+.assembly 'eh08_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh11_dynamic.il b/src/tests/JIT/jit64/localloc/ehverify/eh11_dynamic.il
index 4d7729de437701..7cf71198d07f5d 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh11_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh11_dynamic.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh10{}
+.assembly 'eh11_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh11_large.il b/src/tests/JIT/jit64/localloc/ehverify/eh11_large.il
index 18bb06752a6209..89d8af7e9ff6bd 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh11_large.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh11_large.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh10{}
+.assembly 'eh11_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh11_small.il b/src/tests/JIT/jit64/localloc/ehverify/eh11_small.il
index 678910f046d3e1..4de02c60ddb394 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh11_small.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh11_small.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh10{}
+.assembly 'eh11_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh12_dynamic.il b/src/tests/JIT/jit64/localloc/ehverify/eh12_dynamic.il
index b29c0441d4ca41..6fe573a8f340ff 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh12_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh12_dynamic.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh09{}
+.assembly 'eh12_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh12_large.il b/src/tests/JIT/jit64/localloc/ehverify/eh12_large.il
index 5ae5fb2063b805..4490eab60c0139 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh12_large.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh12_large.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh09{}
+.assembly 'eh12_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh12_small.il b/src/tests/JIT/jit64/localloc/ehverify/eh12_small.il
index acc726908f3073..5df0c1638f0785 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh12_small.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh12_small.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh09{}
+.assembly 'eh12_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh13_dynamic.il b/src/tests/JIT/jit64/localloc/ehverify/eh13_dynamic.il
index 756daf24e0ece1..9a83ff4d7ea013 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh13_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh13_dynamic.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh13{}
+.assembly 'eh13_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh13_large.il b/src/tests/JIT/jit64/localloc/ehverify/eh13_large.il
index 290193803c0308..357e0c562c0e55 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh13_large.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh13_large.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh13{}
+.assembly 'eh13_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh13_small.il b/src/tests/JIT/jit64/localloc/ehverify/eh13_small.il
index 907ede2426bbcb..7b815ce0c1fbcc 100644
--- a/src/tests/JIT/jit64/localloc/ehverify/eh13_small.il
+++ b/src/tests/JIT/jit64/localloc/ehverify/eh13_small.il
@@ -10,7 +10,7 @@
 
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly eh13{}
+.assembly 'eh13_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind04_dynamic.il b/src/tests/JIT/jit64/localloc/unwind/unwind04_dynamic.il
index 3e047e2dac9256..f2c313f958cbac 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind04_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind04_dynamic.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind03{}
+.assembly 'unwind04_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind04_large.il b/src/tests/JIT/jit64/localloc/unwind/unwind04_large.il
index 26073ea6ed7ebe..5c0d52e93b3e39 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind04_large.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind04_large.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind03{}
+.assembly 'unwind04_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind04_small.il b/src/tests/JIT/jit64/localloc/unwind/unwind04_small.il
index 8b11d9fa022db9..2152e53c57ef97 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind04_small.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind04_small.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind03{}
+.assembly 'unwind04_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind05_dynamic.il b/src/tests/JIT/jit64/localloc/unwind/unwind05_dynamic.il
index 138491cc7b8bc0..a21de715bdb886 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind05_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind05_dynamic.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind02{}
+.assembly 'unwind05_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind05_large.il b/src/tests/JIT/jit64/localloc/unwind/unwind05_large.il
index a05b4931b595f1..743195ad4a8b32 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind05_large.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind05_large.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind02{}
+.assembly 'unwind05_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind05_small.il b/src/tests/JIT/jit64/localloc/unwind/unwind05_small.il
index f261372fe8be9c..5f7f665f9e8b05 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind05_small.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind05_small.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind02{}
+.assembly 'unwind05_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind06_dynamic.il b/src/tests/JIT/jit64/localloc/unwind/unwind06_dynamic.il
index 039e0032f761af..9f71cfb6c0ce87 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind06_dynamic.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind06_dynamic.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind06{}
+.assembly 'unwind06_dynamic'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind06_large.il b/src/tests/JIT/jit64/localloc/unwind/unwind06_large.il
index a9957832b14b33..d7120bf7a6e1fd 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind06_large.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind06_large.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind06{}
+.assembly 'unwind06_large'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/unwind/unwind06_small.il b/src/tests/JIT/jit64/localloc/unwind/unwind06_small.il
index 8597aea7abd658..6b4dc083d4f803 100644
--- a/src/tests/JIT/jit64/localloc/unwind/unwind06_small.il
+++ b/src/tests/JIT/jit64/localloc/unwind/unwind06_small.il
@@ -10,7 +10,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib{}
 .assembly extern common{}
-.assembly unwind06{}
+.assembly 'unwind06_small'{}
 
 .class private auto ansi beforefieldinit LocallocTest
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/zeroinit/zeroinit01_large.il b/src/tests/JIT/jit64/localloc/zeroinit/zeroinit01_large.il
index 7254f9b8c2c894..11e9c8288240f3 100644
--- a/src/tests/JIT/jit64/localloc/zeroinit/zeroinit01_large.il
+++ b/src/tests/JIT/jit64/localloc/zeroinit/zeroinit01_large.il
@@ -10,7 +10,7 @@
 
 // Test zero initialization of localloc
 .assembly extern mscorlib{}
-.assembly zeroinit01{}
+.assembly 'zeroinit01_large'{}
 
 .class private auto ansi beforefieldinit T
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/localloc/zeroinit/zeroinit01_small.il b/src/tests/JIT/jit64/localloc/zeroinit/zeroinit01_small.il
index c39c8f76c846e6..984417eceabd72 100644
--- a/src/tests/JIT/jit64/localloc/zeroinit/zeroinit01_small.il
+++ b/src/tests/JIT/jit64/localloc/zeroinit/zeroinit01_small.il
@@ -10,7 +10,7 @@
 
 // Test zero initialization of localloc
 .assembly extern mscorlib{}
-.assembly zeroinit01{}
+.assembly 'zeroinit01_small'{}
 
 .class private auto ansi beforefieldinit T
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i00.il b/src/tests/JIT/jit64/mcc/interop/mcc_i00.il
index 56f2c9574cb290..1d506469f0b1e0 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i00.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i00.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i00.exe
+.assembly 'mcc_i00' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i01.il b/src/tests/JIT/jit64/mcc/interop/mcc_i01.il
index 47c1ed5fd8409c..7605905713db2e 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i01.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i01.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i01.exe
+.assembly 'mcc_i01' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i02.il b/src/tests/JIT/jit64/mcc/interop/mcc_i02.il
index 54a186aa924f42..c215ae2f540162 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i02.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i02.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i02.exe
+.assembly 'mcc_i02' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i03.il b/src/tests/JIT/jit64/mcc/interop/mcc_i03.il
index 5caa0c42870fd3..b6aa87300d613d 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i03.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i03.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i03.exe
+.assembly 'mcc_i03' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i04.il b/src/tests/JIT/jit64/mcc/interop/mcc_i04.il
index b7b8b693b2c8dc..940bebac85d668 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i04.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i04.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i04.exe
+.assembly 'mcc_i04' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i05.il b/src/tests/JIT/jit64/mcc/interop/mcc_i05.il
index fddce8de2564aa..429503e842ffd1 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i05.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i05.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i05.exe
+.assembly 'mcc_i05' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i06.il b/src/tests/JIT/jit64/mcc/interop/mcc_i06.il
index 4b359f32a15a9d..30db333bf1f239 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i06.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i06.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i06.exe
+.assembly 'mcc_i06' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i07.il b/src/tests/JIT/jit64/mcc/interop/mcc_i07.il
index 98501e02310366..f366c9a1c9933e 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i07.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i07.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i07.exe
+.assembly 'mcc_i07' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i10.il b/src/tests/JIT/jit64/mcc/interop/mcc_i10.il
index 9219f22ac0adfc..c36160bd3098c8 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i10.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i10.il
@@ -4,8 +4,7 @@
 
 .assembly extern mscorlib {}
 .assembly extern xunit.core {}
-.assembly MCCTest {}
-.module mcc_i10.exe
+.assembly 'mcc_i10' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i11.il b/src/tests/JIT/jit64/mcc/interop/mcc_i11.il
index 80ed3d431d7f79..6ef73317df52f8 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i11.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i11.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i11.exe
+.assembly 'mcc_i11' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i12.il b/src/tests/JIT/jit64/mcc/interop/mcc_i12.il
index 550bff4f503353..2b6386a70cfae2 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i12.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i12.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i12.exe
+.assembly 'mcc_i12' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i13.il b/src/tests/JIT/jit64/mcc/interop/mcc_i13.il
index 5e28b3306892ab..2a5146802877a2 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i13.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i13.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i13.exe
+.assembly 'mcc_i13' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i14.il b/src/tests/JIT/jit64/mcc/interop/mcc_i14.il
index ae7d29a82b0105..77d6a30db0ef2a 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i14.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i14.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i14.exe
+.assembly 'mcc_i14' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i15.il b/src/tests/JIT/jit64/mcc/interop/mcc_i15.il
index f3e35badc39909..bdd9a6ac9831e0 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i15.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i15.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i15.exe
+.assembly 'mcc_i15' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i16.il b/src/tests/JIT/jit64/mcc/interop/mcc_i16.il
index c2c04dc29ad9f9..e51b864541861c 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i16.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i16.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i16.exe
+.assembly 'mcc_i16' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i17.il b/src/tests/JIT/jit64/mcc/interop/mcc_i17.il
index edf636f268f2b8..f45172897d5048 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i17.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i17.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i17.exe
+.assembly 'mcc_i17' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i30.il b/src/tests/JIT/jit64/mcc/interop/mcc_i30.il
index 94d0739ef0df1a..17120ac7ffbc8e 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i30.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i30.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i30.exe
+.assembly 'mcc_i30' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i31.il b/src/tests/JIT/jit64/mcc/interop/mcc_i31.il
index 7c5e5d08fb1078..a4cacaffac276c 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i31.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i31.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i31.exe
+.assembly 'mcc_i31' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i32.il b/src/tests/JIT/jit64/mcc/interop/mcc_i32.il
index d5a90ff50c6769..02113761e82a2c 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i32.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i32.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i32.exe
+.assembly 'mcc_i32' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i33.il b/src/tests/JIT/jit64/mcc/interop/mcc_i33.il
index 90667335c2a086..adb6fe0c2a1666 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i33.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i33.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i33.exe
+.assembly 'mcc_i33' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i34.il b/src/tests/JIT/jit64/mcc/interop/mcc_i34.il
index abe748c37b526f..ee95ce68224b8e 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i34.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i34.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i34.exe
+.assembly 'mcc_i34' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i35.il b/src/tests/JIT/jit64/mcc/interop/mcc_i35.il
index ba985fe5b41961..fdfd45b8c246c1 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i35.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i35.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i35.exe
+.assembly 'mcc_i35' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i36.il b/src/tests/JIT/jit64/mcc/interop/mcc_i36.il
index f753508e53fea2..f0fe88e825d966 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i36.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i36.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i36.exe
+.assembly 'mcc_i36' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i37.il b/src/tests/JIT/jit64/mcc/interop/mcc_i37.il
index 11ab5b8fd62511..81e0a000c9efd4 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i37.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i37.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i37.exe
+.assembly 'mcc_i37' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i50.il b/src/tests/JIT/jit64/mcc/interop/mcc_i50.il
index f01fb0d63aaea2..2aa67ad5f70504 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i50.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i50.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i50.exe
+.assembly 'mcc_i50' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i51.il b/src/tests/JIT/jit64/mcc/interop/mcc_i51.il
index ff557cc1a3c438..9f509301c06d8a 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i51.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i51.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i51.exe
+.assembly 'mcc_i51' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i52.il b/src/tests/JIT/jit64/mcc/interop/mcc_i52.il
index 6c7306a081ce75..f83ef5c682bf3a 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i52.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i52.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i52.exe
+.assembly 'mcc_i52' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i53.il b/src/tests/JIT/jit64/mcc/interop/mcc_i53.il
index f6ff300b292b7c..436d03ef5f6fc4 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i53.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i53.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i53.exe
+.assembly 'mcc_i53' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i54.il b/src/tests/JIT/jit64/mcc/interop/mcc_i54.il
index 081e6481c164ee..83f78d2fbe3647 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i54.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i54.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i54.exe
+.assembly 'mcc_i54' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i55.il b/src/tests/JIT/jit64/mcc/interop/mcc_i55.il
index 9c0fc7b17c0290..94e36a49284b87 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i55.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i55.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i55.exe
+.assembly 'mcc_i55' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i56.il b/src/tests/JIT/jit64/mcc/interop/mcc_i56.il
index 33d8208ec46da9..ea63504cb3ff42 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i56.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i56.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i56.exe
+.assembly 'mcc_i56' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i57.il b/src/tests/JIT/jit64/mcc/interop/mcc_i57.il
index 7ff97612180228..b0919e48845287 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i57.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i57.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i57.exe
+.assembly 'mcc_i57' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i60.il b/src/tests/JIT/jit64/mcc/interop/mcc_i60.il
index e16791d0663b96..6621cff83ca625 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i60.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i60.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i60.exe
+.assembly 'mcc_i60' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i61.il b/src/tests/JIT/jit64/mcc/interop/mcc_i61.il
index 132edc42205ae2..856dee4fff27f1 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i61.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i61.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i61.exe
+.assembly 'mcc_i61' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i62.il b/src/tests/JIT/jit64/mcc/interop/mcc_i62.il
index 221b383a29600d..881dbb10275b60 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i62.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i62.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i62.exe
+.assembly 'mcc_i62' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i63.il b/src/tests/JIT/jit64/mcc/interop/mcc_i63.il
index 9142d8ad03093a..a5fff816e72ab5 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i63.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i63.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i63.exe
+.assembly 'mcc_i63' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i64.il b/src/tests/JIT/jit64/mcc/interop/mcc_i64.il
index 5d7bf057cc147e..0e0e617e9efcc4 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i64.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i64.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i64.exe
+.assembly 'mcc_i64' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i65.il b/src/tests/JIT/jit64/mcc/interop/mcc_i65.il
index 9c6af51be7baa8..087a5b96e45ece 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i65.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i65.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i65.exe
+.assembly 'mcc_i65' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i66.il b/src/tests/JIT/jit64/mcc/interop/mcc_i66.il
index 2f51c689ac1bdb..24a646d18d415f 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i66.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i66.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i66.exe
+.assembly 'mcc_i66' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i67.il b/src/tests/JIT/jit64/mcc/interop/mcc_i67.il
index f557eef41a3e62..d966aae28584cc 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i67.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i67.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i67.exe
+.assembly 'mcc_i67' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i70.il b/src/tests/JIT/jit64/mcc/interop/mcc_i70.il
index 75c7bc6b25089a..d596dce2119b37 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i70.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i70.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i70.exe
+.assembly 'mcc_i70' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i71.il b/src/tests/JIT/jit64/mcc/interop/mcc_i71.il
index 9ed1e4f3c624a8..1dfccc1e739db5 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i71.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i71.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i71.exe
+.assembly 'mcc_i71' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i72.il b/src/tests/JIT/jit64/mcc/interop/mcc_i72.il
index 183103b44d7477..8adf537be3fe9d 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i72.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i72.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i72.exe
+.assembly 'mcc_i72' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i73.il b/src/tests/JIT/jit64/mcc/interop/mcc_i73.il
index 6c644c0d78a0ac..eb1a5a6fe5707a 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i73.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i73.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i73.exe
+.assembly 'mcc_i73' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i74.il b/src/tests/JIT/jit64/mcc/interop/mcc_i74.il
index 01e18527134b1e..8f76850a088e52 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i74.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i74.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i74.exe
+.assembly 'mcc_i74' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i75.il b/src/tests/JIT/jit64/mcc/interop/mcc_i75.il
index 66aebab7c884ec..02f810c3cc832f 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i75.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i75.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i75.exe
+.assembly 'mcc_i75' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i76.il b/src/tests/JIT/jit64/mcc/interop/mcc_i76.il
index 59eb8539e6410d..fcf37763aaa948 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i76.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i76.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i76.exe
+.assembly 'mcc_i76' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i77.il b/src/tests/JIT/jit64/mcc/interop/mcc_i77.il
index 59dde5add424c3..1d6527108e1657 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i77.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i77.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i77.exe
+.assembly 'mcc_i77' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i80.il b/src/tests/JIT/jit64/mcc/interop/mcc_i80.il
index 96ed924f92587a..be4b666cb7c62d 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i80.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i80.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i80.exe
+.assembly 'mcc_i80' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i81.il b/src/tests/JIT/jit64/mcc/interop/mcc_i81.il
index 907fca6e9f2340..768ea867cf02fc 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i81.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i81.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i81.exe
+.assembly 'mcc_i81' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i82.il b/src/tests/JIT/jit64/mcc/interop/mcc_i82.il
index c48d71f0c9b629..c90bc914f93218 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i82.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i82.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i82.exe
+.assembly 'mcc_i82' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i83.il b/src/tests/JIT/jit64/mcc/interop/mcc_i83.il
index f2e194ad3729ae..c8901957523721 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i83.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i83.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i83.exe
+.assembly 'mcc_i83' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i84.il b/src/tests/JIT/jit64/mcc/interop/mcc_i84.il
index 2883eb41d8d365..eea5a12f06fad8 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i84.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i84.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i84.exe
+.assembly 'mcc_i84' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i85.il b/src/tests/JIT/jit64/mcc/interop/mcc_i85.il
index 39e997a6a45130..76d3f6f4d50390 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i85.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i85.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i85.exe
+.assembly 'mcc_i85' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i86.il b/src/tests/JIT/jit64/mcc/interop/mcc_i86.il
index a243df62541b16..74a6e14c87b46a 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i86.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i86.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i86.exe
+.assembly 'mcc_i86' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/mcc/interop/mcc_i87.il b/src/tests/JIT/jit64/mcc/interop/mcc_i87.il
index 65ee210f372231..76a786e1aa861a 100644
--- a/src/tests/JIT/jit64/mcc/interop/mcc_i87.il
+++ b/src/tests/JIT/jit64/mcc/interop/mcc_i87.il
@@ -6,8 +6,7 @@
 .assembly extern xunit.core {}
 .assembly extern mscorlib { auto }
 
-.assembly MCCTest {}
-.module mcc_i87.exe
+.assembly 'mcc_i87' {}
 
 
 .namespace MCCTest
diff --git a/src/tests/JIT/jit64/opt/cprop/Dev10_844071.il b/src/tests/JIT/jit64/opt/cprop/Dev10_844071.il
index 20af1f1f859cd8..c5af34fed3d1a1 100644
--- a/src/tests/JIT/jit64/opt/cprop/Dev10_844071.il
+++ b/src/tests/JIT/jit64/opt/cprop/Dev10_844071.il
@@ -22,7 +22,6 @@
   .hash algorithm 0x00008004
   .ver 4:0:30105:0
 }
-.module Dev10_844071.exe
 // MVID: {234C628E-92DC-420F-A9F2-3F461436B9D9}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/jit64/opt/cprop/Dev10_884217_IL.il b/src/tests/JIT/jit64/opt/cprop/Dev10_884217_IL.il
index ca3330df74d8c6..4d323934d46df7 100644
--- a/src/tests/JIT/jit64/opt/cprop/Dev10_884217_IL.il
+++ b/src/tests/JIT/jit64/opt/cprop/Dev10_884217_IL.il
@@ -15,7 +15,6 @@
 .assembly Dev10_884217_IL
 {
 }
-.module Dev10_884217_IL.exe
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
 // Image base: 0x0000000000170000
diff --git a/src/tests/JIT/jit64/opt/cprop/cprop002.il b/src/tests/JIT/jit64/opt/cprop/cprop002.il
index b045feb17a0a36..479948a6f78d29 100644
--- a/src/tests/JIT/jit64/opt/cprop/cprop002.il
+++ b/src/tests/JIT/jit64/opt/cprop/cprop002.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly legacy library test {}
+.assembly legacy library 'cprop002' {}
 
 .class public auto ansi beforefieldinit TEST
 	extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/opt/inl/inl001.il b/src/tests/JIT/jit64/opt/inl/inl001.il
index d1803a13f50489..62ca804bcf74ef 100644
--- a/src/tests/JIT/jit64/opt/inl/inl001.il
+++ b/src/tests/JIT/jit64/opt/inl/inl001.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly legacy library inlbug {}
+.assembly legacy library 'inl001' {}
 
 .class private auto ansi beforefieldinit Test_inl001
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/opt/lim/lim_001.il b/src/tests/JIT/jit64/opt/lim/lim_001.il
index 407392937dd214..8fea137e20aac3 100644
--- a/src/tests/JIT/jit64/opt/lim/lim_001.il
+++ b/src/tests/JIT/jit64/opt/lim/lim_001.il
@@ -12,7 +12,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test {}
+.assembly 'lim_001' {}
 
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/opt/osr/osr015.il b/src/tests/JIT/jit64/opt/osr/osr015.il
index 4e1af6f51f702d..8b6da6abc5ac92 100644
--- a/src/tests/JIT/jit64/opt/osr/osr015.il
+++ b/src/tests/JIT/jit64/opt/osr/osr015.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test {}
+.assembly 'osr015' {}
 
 
 .class private auto ansi beforefieldinit test
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.il
index e0f4f9edd135a0..24a5b0a23fe5dd 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/bne.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly cprop_test {}
+.assembly 'bne' {}
 .assembly extern mscorlib{auto}
 .class cprop_test {
 .method static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv.il
index 33b10b5992c338..c61d2a97a9c2fe 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/conv.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly Class_test {}
+.assembly 'conv' {}
 .assembly extern mscorlib{auto}
 .class Class_test {
 .method static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div.il
index 9e51374e893eac..6c5cdd0091fb25 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/div.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly cprop_test {}
+.assembly 'div' {}
 .assembly extern mscorlib{auto}
 .class cprop_test {
 .method static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1.il
index 787916f41abc8d..f5ba58ce63cb94 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul1.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly cprop_test {}
+.assembly 'mul1' {}
 .assembly extern mscorlib{auto}
 .class cprop_test {
 .method static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception.il
index cf8ff91c20f221..d1ed95cdd7aae8 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly cprop_test {}
+.assembly 'mul_exception' {}
 .assembly extern mscorlib{auto}
 .class cprop_test {
 .method static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem.il
index e58708b364829c..6e16e0d1ee0b13 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/223862/rem.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly cprop_test {}
+.assembly 'rem' {}
 .assembly extern mscorlib{auto}
 .class cprop_test {
 .method static int32 Main() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv.il
index 7d6b190ab49963..ff41cf0d9d7689 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/228572/conv.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 
-.assembly Conv_test {}
+.assembly 'conv' {}
 .assembly extern mscorlib{auto}
 .class Conv_test {
 .method static int32 Main_test() {
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo.il
index 6aa0207cc28298..955c0b76ea852d 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo.il
@@ -15,7 +15,6 @@
 {
 }
 
-.module foo.exe
 
 
 
diff --git a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
index 21fdb04053d639..413866fe340951 100644
--- a/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
+++ b/src/tests/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
@@ -11,11 +11,10 @@
   .ver 2:0:0:0
 }
 .assembly extern xunit.core {}
-.assembly foo
+.assembly 'foo2'
 {
 }
 
-.module foo.exe
 
 
 
diff --git a/src/tests/JIT/jit64/regress/ddb/118414/118414.il b/src/tests/JIT/jit64/regress/ddb/118414/118414.il
index f9c767841ec186..2d89b529729d84 100644
--- a/src/tests/JIT/jit64/regress/ddb/118414/118414.il
+++ b/src/tests/JIT/jit64/regress/ddb/118414/118414.il
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-.assembly ILGEN_0x3243f637 {}
+.assembly '118414' {}
 .assembly extern xunit.core {}
 .assembly extern mscorlib{auto}
 
diff --git a/src/tests/JIT/jit64/regress/phoenix/62322/test.il b/src/tests/JIT/jit64/regress/phoenix/62322/test.il
index c18a6476343890..d754018d3ccb57 100644
--- a/src/tests/JIT/jit64/regress/phoenix/62322/test.il
+++ b/src/tests/JIT/jit64/regress/phoenix/62322/test.il
@@ -18,13 +18,12 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly b441487
+.assembly 'test'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module b441487.exe
 // MVID: {9AF9288D-3BE9-4952-AFD0-E77098E2DD26}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/jit64/regress/vsw/102754/test1.il b/src/tests/JIT/jit64/regress/vsw/102754/test1.il
index 37a0c94fc389e9..2dcd47a45d999b 100644
--- a/src/tests/JIT/jit64/regress/vsw/102754/test1.il
+++ b/src/tests/JIT/jit64/regress/vsw/102754/test1.il
@@ -19,14 +19,13 @@
            01 2A 9C E3 )                                     
   
 }
-.assembly legacy library hello
+.assembly legacy library 'test1'
 {
 
 
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module hello.exe
 .custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 ) 
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/jit64/regress/vsw/266693/test.il b/src/tests/JIT/jit64/regress/vsw/266693/test.il
index d82de8d6dfd4b3..1db5d131e934cd 100644
--- a/src/tests/JIT/jit64/regress/vsw/266693/test.il
+++ b/src/tests/JIT/jit64/regress/vsw/266693/test.il
@@ -12,7 +12,6 @@
   .ver 4:0:0:0
 }
 .assembly test {}
-.module test.il
 
 .class private auto ansi beforefieldinit Test_test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/jit64/regress/vsw/333007/test1.il b/src/tests/JIT/jit64/regress/vsw/333007/test1.il
index 4b3949f6106acc..81f61de652c18d 100644
--- a/src/tests/JIT/jit64/regress/vsw/333007/test1.il
+++ b/src/tests/JIT/jit64/regress/vsw/333007/test1.il
@@ -24,13 +24,12 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:3600:0
 }
-.assembly foo
+.assembly 'test1'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module foo.exe
 // MVID: {13BD850E-1B6A-467D-8081-5F9C3901672A}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/jit64/regress/vsw/373472/test.il b/src/tests/JIT/jit64/regress/vsw/373472/test.il
index 73f538ab6a85d6..8e55964cb1e6d7 100644
--- a/src/tests/JIT/jit64/regress/vsw/373472/test.il
+++ b/src/tests/JIT/jit64/regress/vsw/373472/test.il
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module test.exe
 // MVID: {D7D039EB-2FFD-4888-8BC9-782CC0C93C1E}
 .imagebase 0x10000000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/jit64/regress/vsw/404708/test.il b/src/tests/JIT/jit64/regress/vsw/404708/test.il
index 009c093c3077ea..4787c6aecd0597 100644
--- a/src/tests/JIT/jit64/regress/vsw/404708/test.il
+++ b/src/tests/JIT/jit64/regress/vsw/404708/test.il
@@ -9,8 +9,7 @@
   .ver 4:0:0:0
 }
 
-.assembly test1 {}
-.module test1.exe
+.assembly 'test' {}
 
 .namespace Test
 {
diff --git a/src/tests/JIT/jit64/regress/vsw/460412/test.il b/src/tests/JIT/jit64/regress/vsw/460412/test.il
index 1f535fe81f3eed..02817ac35c8083 100644
--- a/src/tests/JIT/jit64/regress/vsw/460412/test.il
+++ b/src/tests/JIT/jit64/regress/vsw/460412/test.il
@@ -18,13 +18,12 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly b441487
+.assembly 'test'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module b441487.exe
 // MVID: {1BC10DDA-FF11-4E02-AEEF-C2F0AAC78A25}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/jit64/regress/vsw/543645/test.il b/src/tests/JIT/jit64/regress/vsw/543645/test.il
index 61da8f6d3a19c7..e70f9872512f75 100644
--- a/src/tests/JIT/jit64/regress/vsw/543645/test.il
+++ b/src/tests/JIT/jit64/regress/vsw/543645/test.il
@@ -15,11 +15,10 @@
 {
   .ver 0:0:0:0
 }
-.assembly ovfldiv1
+.assembly 'test'
 {
   .ver 0:0:0:0
 }
-.module ovfldiv1_il_r.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/jit64/regress/vsw/552940/test.il b/src/tests/JIT/jit64/regress/vsw/552940/test.il
index cbc03a5a194c22..711a4389459225 100644
--- a/src/tests/JIT/jit64/regress/vsw/552940/test.il
+++ b/src/tests/JIT/jit64/regress/vsw/552940/test.il
@@ -11,7 +11,6 @@
 .assembly extern common {}
 .assembly test {}
 
-.module test.exe
 
 
 .class private auto ansi beforefieldinit Program
diff --git a/src/tests/JIT/jit64/regress/vsw/606733/Bug606733.il b/src/tests/JIT/jit64/regress/vsw/606733/Bug606733.il
index 4a5cc028bec6ff..b129c9320160f8 100644
--- a/src/tests/JIT/jit64/regress/vsw/606733/Bug606733.il
+++ b/src/tests/JIT/jit64/regress/vsw/606733/Bug606733.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly fib
+.assembly 'Bug606733'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -18,7 +18,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module fib.exe
 // MVID: {F244F6A1-918F-4DD8-ABB5-5917EA8526B2}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/jit64/regress/vsw/607586/607586.il b/src/tests/JIT/jit64/regress/vsw/607586/607586.il
index 3a67a9fabb813c..f7afcc689cb2db 100644
--- a/src/tests/JIT/jit64/regress/vsw/607586/607586.il
+++ b/src/tests/JIT/jit64/regress/vsw/607586/607586.il
@@ -13,7 +13,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )
   .ver 2:0:0:0
 }
-.assembly b607586
+.assembly '607586'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -21,7 +21,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module b607586.exe
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
diff --git a/src/tests/JIT/jit64/verif/sniff/fg/ver_fg_13.il b/src/tests/JIT/jit64/verif/sniff/fg/ver_fg_13.il
index 55f3996f2c7dce..b755e9fd499fd3 100644
--- a/src/tests/JIT/jit64/verif/sniff/fg/ver_fg_13.il
+++ b/src/tests/JIT/jit64/verif/sniff/fg/ver_fg_13.il
@@ -11,9 +11,8 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly test { }
+.assembly 'ver_fg_13' { }
 
-.module ver_fg_13.exe
 
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/opt/AssertionPropagation/CPropOverflow.il b/src/tests/JIT/opt/AssertionPropagation/CPropOverflow.il
index ba3efe43d4b5e6..2df3680ceb2a36 100644
--- a/src/tests/JIT/opt/AssertionPropagation/CPropOverflow.il
+++ b/src/tests/JIT/opt/AssertionPropagation/CPropOverflow.il
@@ -26,7 +26,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module CPropOverflow.exe
 // MVID: {68FF9260-9E27-4CCF-88D3-5AE07292CE94}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/opt/Devirtualization/GenericArrayOverride.il b/src/tests/JIT/opt/Devirtualization/GenericArrayOverride.il
index 27374f568a1256..408378fec30852 100644
--- a/src/tests/JIT/opt/Devirtualization/GenericArrayOverride.il
+++ b/src/tests/JIT/opt/Devirtualization/GenericArrayOverride.il
@@ -45,7 +45,6 @@
   .hash algorithm 0x00008004
   .ver 1:0:0:0
 }
-.module GenericArrayOverride.dll
 // MVID: {36F29C33-E2D3-47BA-B888-D30052D5C374}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/opt/Devirtualization/override.il b/src/tests/JIT/opt/Devirtualization/override.il
index 3046144bbc99de..205892827eb755 100644
--- a/src/tests/JIT/opt/Devirtualization/override.il
+++ b/src/tests/JIT/opt/Devirtualization/override.il
@@ -10,7 +10,7 @@
 // or a MyBar reference.
 
 .assembly extern mscorlib{}
-.assembly self_override1{}
+.assembly 'override'{}
 
 .class public abstract auto ansi beforefieldinit MyBar
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/opt/ETW/TailCallCases.il b/src/tests/JIT/opt/ETW/TailCallCases.il
index 75d743e39568ef..352698950fbf26 100644
--- a/src/tests/JIT/opt/ETW/TailCallCases.il
+++ b/src/tests/JIT/opt/ETW/TailCallCases.il
@@ -30,7 +30,6 @@
   .hash algorithm 0x00008004
   .ver 4:0:20225:0
 }
-.module TailCallCases.exe
 // MVID: {E63A46BE-A0B6-41DA-82A6-56B3E895EC8C}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/JIT/opt/Inline/regression/badcallee/badcallee.il b/src/tests/JIT/opt/Inline/regression/badcallee/badcallee.il
index 774ac55c179732..cd3bc451edb619 100644
--- a/src/tests/JIT/opt/Inline/regression/badcallee/badcallee.il
+++ b/src/tests/JIT/opt/Inline/regression/badcallee/badcallee.il
@@ -14,11 +14,10 @@
   .ver 4:0:0:0
 }
 
-.assembly BadCallee
+.assembly 'badcallee'
 {
 }
 
-.module BadCallee.exe
 
 .class public auto ansi beforefieldinit P
        extends [mscorlib]System.Object
diff --git a/src/tests/JIT/opt/Inline/regression/mismatch32/mismatch32.il b/src/tests/JIT/opt/Inline/regression/mismatch32/mismatch32.il
index 72e58775c13d28..035a096d0722aa 100644
--- a/src/tests/JIT/opt/Inline/regression/mismatch32/mismatch32.il
+++ b/src/tests/JIT/opt/Inline/regression/mismatch32/mismatch32.il
@@ -11,8 +11,7 @@
 .assembly extern xunit.core {}
 .assembly extern System.Console {}
 .assembly extern System.Runtime {}
-.assembly main {}
-.module main.exe
+.assembly 'mismatch32' {}
 
 .class public sealed F extends System.ValueType
 {
diff --git a/src/tests/JIT/opt/Inline/regression/mismatch64/mismatch64.il b/src/tests/JIT/opt/Inline/regression/mismatch64/mismatch64.il
index 61dc0efff146da..bc3454e13fac3c 100644
--- a/src/tests/JIT/opt/Inline/regression/mismatch64/mismatch64.il
+++ b/src/tests/JIT/opt/Inline/regression/mismatch64/mismatch64.il
@@ -11,8 +11,7 @@
 .assembly extern xunit.core {}
 .assembly extern System.Console {}
 .assembly extern System.Runtime {}
-.assembly main {}
-.module main.exe
+.assembly 'mismatch64' {}
 
 .class public sealed F extends System.ValueType
 {
diff --git a/src/tests/JIT/opt/Inline/tests/calli.il b/src/tests/JIT/opt/Inline/tests/calli.il
index 97e94ceecd0e38..ca5e422f1b32be 100644
--- a/src/tests/JIT/opt/Inline/tests/calli.il
+++ b/src/tests/JIT/opt/Inline/tests/calli.il
@@ -6,7 +6,7 @@
 .assembly extern legacy library mscorlib {}
 .assembly extern xunit.core {}
 
-.assembly legacy library calli_inline {}
+.assembly legacy library 'calli' {}
 .class private auto ansi beforefieldinit calli_test
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/opt/JitMinOpts/Perf/CodeSize0.il b/src/tests/JIT/opt/JitMinOpts/Perf/CodeSize0.il
index b5dd58657a8ae7..5aa7c5abee6d54 100644
--- a/src/tests/JIT/opt/JitMinOpts/Perf/CodeSize0.il
+++ b/src/tests/JIT/opt/JitMinOpts/Perf/CodeSize0.il
@@ -13,7 +13,6 @@
   .ver 4:0:0:0
 }
 .assembly CodeSize0 {}
-.module CodeSize0.exe
 .class private auto ansi beforefieldinit CodeSize0
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/opt/JitMinOpts/Perf/CodeSize1.il b/src/tests/JIT/opt/JitMinOpts/Perf/CodeSize1.il
index 1b53ce5a160881..a71e2fb3c22584 100644
--- a/src/tests/JIT/opt/JitMinOpts/Perf/CodeSize1.il
+++ b/src/tests/JIT/opt/JitMinOpts/Perf/CodeSize1.il
@@ -14,7 +14,6 @@
   .ver 4:0:0:0
 }
 .assembly CodeSize1 {}
-.module CodeSize1.exe
 .class private auto ansi beforefieldinit CodeSize1
        extends [mscorlib]System.Object
 {
diff --git a/src/tests/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il b/src/tests/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
index db6e6a4c30252d..6a62f45eae36ee 100644
--- a/src/tests/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
+++ b/src/tests/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
@@ -4,7 +4,6 @@
 
 
 // Metadata version: v2.0.50727
-.module extern kernel32
 .module extern libc
 
 .assembly extern mscorlib { }
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il
index 24ee8bb3a5e897..60bcb56a5a3e0d 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/diamondshape/diamondshape.il
@@ -28,7 +28,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module diamondshape.exe
 // MVID: {25B467F3-D284-4DB6-BAD4-C7EAC75CF064}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il
index 78b571b1647902..4aaead5c4d0a40 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/genericmethods/genericmethods.il
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module genericmethods.exe
 // MVID: {62CAFB9A-4CDB-4A62-8A4F-DC7648609070}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il
index d54b5be16e9586..d13c566da2f815 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/methodimpl/methodimpl.il
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module methodimpl.exe
 // MVID: {F249A85F-3FD2-488F-B084-97B542AD68D6}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.il
index 5883ab07cac3cf..3050e26e35506b 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/non_virtual_calls_to_instance_methods.il
@@ -29,7 +29,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module non_virtual_calls_to_instance_methods.dll
 // MVID: {6E650FE8-EE99-4C1A-8206-71823E127FC2}
 .imagebase 0x0000000140000000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il
index a23a4d1618e043..2f4e4114aadeb1 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/sharedgenerics/sharedgenerics.il
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module sharedgenerics.exe
 // MVID: {0DEEC74C-30FE-495C-9653-12BE5220327A}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.il
index c36bf3c8559384..db9db1605a2a81 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/simple/simple.il
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module simple.exe
 // MVID: {0B8FCFD0-673A-4DEB-90CC-B96749DE09C8}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il b/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il
index 40c1daaea4d263..3030401e7b2dc2 100644
--- a/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il
+++ b/src/tests/Loader/classloader/DefaultInterfaceMethods/valuetypes/valuetypes.il
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module valuetypes.exe
 // MVID: {E191F723-B724-4D70-B3A8-CEA89FD033D3}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/InterfaceFolding/Ambiguous.il b/src/tests/Loader/classloader/InterfaceFolding/Ambiguous.il
index 9bf4939ac54017..2e59eb2ea75be9 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/Ambiguous.il
+++ b/src/tests/Loader/classloader/InterfaceFolding/Ambiguous.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Ambiguous.exe
 // MVID: {7CFDE9D8-A5B3-4D83-86E7-E48FE93FEB09}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/InterfaceFolding/TestCase7.il b/src/tests/Loader/classloader/InterfaceFolding/TestCase7.il
index dd8ff6235fcfc4..926bf4e9e82393 100644
--- a/src/tests/Loader/classloader/InterfaceFolding/TestCase7.il
+++ b/src/tests/Loader/classloader/InterfaceFolding/TestCase7.il
@@ -4,7 +4,7 @@
 .assembly extern System.Console { }
 .assembly extern xunit.core {}
 .assembly extern mscorlib {}
-.assembly TestCase0 {}
+.assembly 'TestCase7' {}
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario1.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario1.il
index 2c9cef445df23c..8aa4906099ed2a 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario1.il
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/Interfaces/UnsupportedScenario1.il
@@ -8,7 +8,7 @@
 .assembly extern System.Console { }
 .assembly extern xunit.core {}
 .assembly extern mscorlib { }
-.assembly UnsupportedScenario2 { }
+.assembly 'UnsupportedScenario1' { }
 
 .class public auto ansi beforefieldinit A { 
   .method public hidebysig specialname rtspecialname instance void  .ctor() cil managed { ret } 
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/CompatibleWithTest.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/CompatibleWithTest.il
index 9af1b72756ed13..d897cbc49045e5 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/CompatibleWithTest.il
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/CompatibleWithTest.il
@@ -3,7 +3,7 @@
 .assembly extern System.Collections { }
 .assembly extern System.Runtime { }
 .assembly extern mscorlib { }
-.assembly UnitTest { }
+.assembly 'CompatibleWithTest' { }
 
 .class public auto ansi abstract Base {}
 .class public auto ansi abstract Derived extends Base {}
diff --git a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.il b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.il
index 5a3f94b6a9b786..fb803ab54411f4 100644
--- a/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.il
+++ b/src/tests/Loader/classloader/MethodImpl/CovariantReturns/UnitTest/OverrideMoreDerivedReturn.il
@@ -5,7 +5,7 @@
 .assembly extern xunit.core {}
 .assembly extern System.Runtime { }
 .assembly extern mscorlib { }
-.assembly ReOverrideMoreDerivedReturn { }
+.assembly 'OverrideMoreDerivedReturn' { }
 
 // ========================================================================================
 // Types that will be used as return types on the various methods
diff --git a/src/tests/Loader/classloader/MethodImpl/generics_override1.il b/src/tests/Loader/classloader/MethodImpl/generics_override1.il
index 3037f18c30bf39..88de948ec101aa 100644
--- a/src/tests/Loader/classloader/MethodImpl/generics_override1.il
+++ b/src/tests/Loader/classloader/MethodImpl/generics_override1.il
@@ -14,7 +14,7 @@
   .ver 4:0:0:0
 }
 .assembly extern xunit.core {}
-.assembly Program
+.assembly 'generics_override1'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -26,7 +26,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Program.exe
 // MVID: {C6C266E9-7949-4242-B429-F9011402D996}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.il b/src/tests/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.il
index 4e0c98fb20ed89..0c45d1ff7cbc87 100644
--- a/src/tests/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.il
+++ b/src/tests/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.il
@@ -29,7 +29,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Test6_ImplementingClass.exe
 // MVID: {899F22E9-D0C0-4B61-9698-A96DF1D4E4BE}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t1.il b/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t1.il
index ffc1a3d33fdaca..48d114069fe6ea 100644
--- a/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t1.il
+++ b/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t1.il
@@ -4,7 +4,7 @@
 .assembly extern System.Console { }
 .assembly extern xunit.core {}
 .assembly extern mscorlib { } 
-.assembly typeload { }
+.assembly 't1' { }
 
 .class public main extends [mscorlib]System.Object 
 { 
diff --git a/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t2.il b/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t2.il
index cf1d04ec87e55b..6082b3fdede293 100644
--- a/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t2.il
+++ b/src/tests/Loader/classloader/SequentialLayout/Regress/217070/t2.il
@@ -4,7 +4,7 @@
 .assembly extern System.Console { }
 .assembly extern xunit.core {}
 .assembly extern mscorlib { } 
-.assembly typeload { } 
+.assembly 't2' { } 
 .class sequential sealed public NumberNode 
        extends [mscorlib]System.ValueType 
 { 
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/InterfaceVariance/InterfaceVariance.il b/src/tests/Loader/classloader/StaticVirtualMethods/InterfaceVariance/InterfaceVariance.il
index a4c4e9e1965669..be7a5f046c943a 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/InterfaceVariance/InterfaceVariance.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/InterfaceVariance/InterfaceVariance.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'InterfaceVariance' {}
 
 .class interface public abstract auto ansi InterfaceScenario1`1<- T>
 {
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/CuriouslyRecurringGenericWithUnimplementedMethod.il b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/CuriouslyRecurringGenericWithUnimplementedMethod.il
index 0ff093a38286ea..51b8f7be05fcd0 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/CuriouslyRecurringGenericWithUnimplementedMethod.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/CuriouslyRecurringGenericWithUnimplementedMethod.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'CuriouslyRecurringGenericWithUnimplementedMethod' {}
 .class interface public abstract auto ansi InterfaceScenario1`1<T>
 {
   .method public newslot virtual abstract static int32 Method() cil managed noinlining
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodBodyOnUnrelatedType.il b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodBodyOnUnrelatedType.il
index f6a8d0aebe619b..8706f27388e31e 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodBodyOnUnrelatedType.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodBodyOnUnrelatedType.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'MethodBodyOnUnrelatedType' {}
 .class interface public abstract auto ansi InterfaceScenario1
 {
   .method public newslot virtual abstract static int32 Method() cil managed noinlining
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodConstraintMismatch.il b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodConstraintMismatch.il
index f4356c3a7753b5..d60e99d81c2a13 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodConstraintMismatch.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodConstraintMismatch.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'MethodConstraintMismatch' {}
 .class interface public abstract auto ansi InterfaceScenario1
 {
   .method public newslot virtual abstract static int32 GenericMethod<U>() cil managed noinlining
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodFlags.il b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodFlags.il
index 33d55dba2fd562..67b60d75bbee28 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodFlags.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MethodFlags.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'MethodFlags' {}
 
 .class public auto ansi BaseScenario1
        extends [System.Runtime]System.Object
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MultipleMethodImplRecordsSameMethodDecl.il b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MultipleMethodImplRecordsSameMethodDecl.il
index fb5397704a5357..d11faf480a5661 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MultipleMethodImplRecordsSameMethodDecl.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/MultipleMethodImplRecordsSameMethodDecl.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'MultipleMethodImplRecordsSameMethodDecl' {}
 .class interface public abstract auto ansi InterfaceScenario1
 {
   .method public newslot virtual abstract static int32 Method() cil managed noinlining
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnAbstractClass.il b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnAbstractClass.il
index 4f328e0761394d..89882c1daf24a3 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnAbstractClass.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnAbstractClass.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'UnimplementedAbstractMethodOnAbstractClass' {}
 .class interface public abstract auto ansi InterfaceScenario1
 {
   .method public newslot virtual abstract static int32 Method() cil managed noinlining
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnConcreteClass.il b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnConcreteClass.il
index 7155a29cbdd606..c831f4eb15394f 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnConcreteClass.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnConcreteClass.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'UnimplementedAbstractMethodOnConcreteClass' {}
 .class interface public abstract auto ansi InterfaceScenario1
 {
   .method public newslot virtual abstract static int32 Method() cil managed noinlining
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/VarianceSafety.il b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/VarianceSafety.il
index 2c6666f926462f..e5b7e26c748be4 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/VarianceSafety.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/NegativeTestCases/VarianceSafety.il
@@ -6,7 +6,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'VarianceSafety' {}
 
 .class interface public abstract auto ansi InterfaceScenario1`1<- T>
 {
diff --git a/src/tests/Loader/classloader/StaticVirtualMethods/TypeHierarchy/TypeHierarchyTest_minimal.il b/src/tests/Loader/classloader/StaticVirtualMethods/TypeHierarchy/TypeHierarchyTest_minimal.il
index 2124789165b9b1..49a503c9888251 100644
--- a/src/tests/Loader/classloader/StaticVirtualMethods/TypeHierarchy/TypeHierarchyTest_minimal.il
+++ b/src/tests/Loader/classloader/StaticVirtualMethods/TypeHierarchy/TypeHierarchyTest_minimal.il
@@ -7,7 +7,7 @@
 .assembly extern mscorlib {}
 .assembly extern System.Runtime {}
 .assembly extern TypeHierarchyCommonCs {}
-.assembly TypeHierarchyTest {}
+.assembly 'TypeHierarchyTest_minimal' {}
 .class interface public abstract auto ansi InterfaceScenario1
 {
   .method public newslot virtual abstract static int32 Method() cil managed noinlining
diff --git a/src/tests/Loader/classloader/TSAmbiguities/CollapsedInterfaces/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/CollapsedInterfaces/HelloWorld.il
index f1b6b78154eb19..86d2fe1d6c9046 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/CollapsedInterfaces/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/CollapsedInterfaces/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {ED3BD1E6-3FBD-4590-8CC8-2B84D3A177C9}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceDefinition/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceDefinition/HelloWorld.il
index 8ce41af8303149..db81b458562ddf 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceDefinition/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceDefinition/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {CA3A864B-A75E-4A75-9454-0BEF07F1FCF4}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TSAmbiguities/CollapsedMethods/Override/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/CollapsedMethods/Override/HelloWorld.il
index 17ab4d737cc744..4cd51c7c8417ef 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/CollapsedMethods/Override/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/CollapsedMethods/Override/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {30A53143-221A-4FEF-A46B-0607BADC72A0}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TSAmbiguities/SameMethodImpl/CollapsedInterfaces/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/SameMethodImpl/CollapsedInterfaces/HelloWorld.il
index f0f4c3321f3597..af6d5556e54227 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/SameMethodImpl/CollapsedInterfaces/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/SameMethodImpl/CollapsedInterfaces/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {EE84F77E-91BD-4DE7-9EF8-6E248B067B89}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TSAmbiguities/SameMethodImpl/Override/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/SameMethodImpl/Override/HelloWorld.il
index be0feb6dbf296d..4c7a30ddf8e62d 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/SameMethodImpl/Override/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/SameMethodImpl/Override/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {EE5EBACC-D919-44C6-9FC2-1636154C3772}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TSAmbiguities/Variance/Covariant_CollapsedInterfaces/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/Variance/Covariant_CollapsedInterfaces/HelloWorld.il
index a8bff78363a5de..155ec3d2ee1b58 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/Variance/Covariant_CollapsedInterfaces/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/Variance/Covariant_CollapsedInterfaces/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {713D21D5-3295-43C3-9260-D4E561C25BB7}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TSAmbiguities/Variance/Covariant_InherittedCollision/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/Variance/Covariant_InherittedCollision/HelloWorld.il
index 2c852bf3eac210..b7b2e2ff7cbbdd 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/Variance/Covariant_InherittedCollision/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/Variance/Covariant_InherittedCollision/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {E623A36D-5AFB-422F-A603-902960F86566}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TSAmbiguities/Variance/Variant_CollapsedInterfaces/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/Variance/Variant_CollapsedInterfaces/HelloWorld.il
index fac0d2e9cf3fed..32f2a52b24e250 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/Variance/Variant_CollapsedInterfaces/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/Variance/Variant_CollapsedInterfaces/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {926DC4B2-C753-404F-9BD2-D179FBD7F4F7}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TSAmbiguities/Variance/Variant_InherittedCollision/HelloWorld.il b/src/tests/Loader/classloader/TSAmbiguities/Variance/Variant_InherittedCollision/HelloWorld.il
index 70c6178d3fc524..8a82fcaae360c7 100644
--- a/src/tests/Loader/classloader/TSAmbiguities/Variance/Variant_InherittedCollision/HelloWorld.il
+++ b/src/tests/Loader/classloader/TSAmbiguities/Variance/Variant_InherittedCollision/HelloWorld.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module HelloWorld.exe
 // MVID: {8F0BCC1D-8425-48B7-A9BE-1043DA25AD87}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowLDFTNStaticMethod.il b/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowLDFTNStaticMethod.il
index 364b7cdc518145..a3bafedc037fca 100644
--- a/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowLDFTNStaticMethod.il
+++ b/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowLDFTNStaticMethod.il
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module CctorThrowLDFTNStaticMethod.exe
 // MVID: {DFA6FFCF-599E-4DF2-8538-B842C6A0AD10}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticFieldBFI.il b/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticFieldBFI.il
index 5d49fe5459bad6..bfc78bd93ff193 100644
--- a/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticFieldBFI.il
+++ b/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticFieldBFI.il
@@ -21,7 +21,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module CctorThrowStaticFieldBFI.exe
 // MVID: {A7BE6B3C-FF8D-43DB-B091-60CBA24AD082}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/ResetGlobalFields.il b/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/ResetGlobalFields.il
index 94f81707ce320f..2f2ceca2295d60 100644
--- a/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/ResetGlobalFields.il
+++ b/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/ResetGlobalFields.il
@@ -21,7 +21,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module ResetGlobalFields.exe
 // MVID: {7BF531CB-7206-4C53-A779-930294C1158F}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcepBFI.il b/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcepBFI.il
index c6d2657ab997f2..551822f4a8ffb3 100644
--- a/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcepBFI.il
+++ b/src/tests/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcepBFI.il
@@ -15,13 +15,12 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 2:0:0:0
 }
-.assembly TypeLoadInitExcep
+.assembly 'TypeLoadInitExcepBFI'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module TypeLoadInitExcep.exe
 // MVID: {A7BE6B3C-FF8D-43DB-B091-60CBA24AD082}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
index a0af39fdc089b5..9bd0054ee48945 100644
--- a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
+++ b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
@@ -10,13 +10,12 @@
 // Metadata version: v2.0.50103
 .assembly extern mscorlib { auto }
 
-.assembly CircularCctorFourThreads
+.assembly 'CircularCctorFourThreadsBFI'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module CircularCctorFourThreads.exe
 // MVID: {DCC29B4C-2098-4C6E-A788-8284AF4F4942}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
index 3b2745be079fd2..edd655194ca40d 100644
--- a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
+++ b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
@@ -10,13 +10,12 @@
 // Metadata version: v2.0.50103
 .assembly extern mscorlib { auto }
 
-.assembly CircularCctorThreeThreads01
+.assembly 'CircularCctorThreeThreads01BFI'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module CircularCctorThreeThreads01.exe
 // MVID: {391DADEC-FC20-4965-82DE-5A0027055F7B}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
index c360039d1ca285..d29541c378ab96 100644
--- a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
+++ b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
@@ -10,13 +10,12 @@
 // Metadata version: v2.0.50103
 .assembly extern mscorlib { auto }
 
-.assembly CircularCctorThreeThreads02
+.assembly 'CircularCctorThreeThreads02BFI'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module CircularCctorThreeThreads02.exe
 // MVID: {D90A3A61-FEDA-4DC1-A90B-0FEBC5C34B33}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
index 870f9029b71ffb..07eab2633de761 100644
--- a/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
+++ b/src/tests/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
@@ -10,13 +10,12 @@
 // Metadata version: v2.0.50103
 .assembly extern mscorlib { auto }
 
-.assembly CircularCctorThreeThreads03
+.assembly 'CircularCctorThreeThreads03BFI'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module CircularCctorThreeThreads03.exe
 // MVID: {11FF80B2-E180-44EE-815F-912DD3D6227D}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test11.il b/src/tests/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test11.il
index a563af7cf517a4..25dbde46b403a6 100644
--- a/src/tests/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test11.il
+++ b/src/tests/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test11.il
@@ -4,7 +4,7 @@
 .assembly extern System.Console { }
 .assembly extern xunit.core {}
 // non-blittable by objref field, really large offset, and force GC collect
-.assembly test10{}
+.assembly 'test11'{}
 .assembly extern mscorlib{}
 
 .class public explicit Class1 extends [mscorlib]System.Object{
diff --git a/src/tests/Loader/classloader/generics/GenericMethods/arity01.il b/src/tests/Loader/classloader/generics/GenericMethods/arity01.il
index c41114d9b28317..ef489b395050d9 100644
--- a/src/tests/Loader/classloader/generics/GenericMethods/arity01.il
+++ b/src/tests/Loader/classloader/generics/GenericMethods/arity01.il
@@ -27,7 +27,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module arity01.exe
 // MVID: {076E2FBD-6901-448E-AD54-697AB5AE59C9}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/GenericMethods/method014.il b/src/tests/Loader/classloader/generics/GenericMethods/method014.il
index 541596f01b631c..656041d76399c3 100644
--- a/src/tests/Loader/classloader/generics/GenericMethods/method014.il
+++ b/src/tests/Loader/classloader/generics/GenericMethods/method014.il
@@ -86,7 +86,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module method014.exe
 // MVID: {5E79BC95-82C1-4B20-8867-C903C4ECBE7E}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/GenericMethods/method016.il b/src/tests/Loader/classloader/generics/GenericMethods/method016.il
index 4039a7538b7adf..cd840c7a354440 100644
--- a/src/tests/Loader/classloader/generics/GenericMethods/method016.il
+++ b/src/tests/Loader/classloader/generics/GenericMethods/method016.il
@@ -131,7 +131,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module method016.exe
 // MVID: {05F812CC-B829-4F5E-8DBB-C106ABA247EF}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract01.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract01.il
index 6072fae34d5553..804b71c10c225c 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract01.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract01.il
@@ -27,7 +27,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module abstract01.exe
 // MVID: {278BBD66-C040-4E84-A7AB-909BC878147E}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract05.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract05.il
index e242c7368e8eac..e9c0c62945e658 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract05.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract05.il
@@ -26,7 +26,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly abstract01
+.assembly 'abstract05'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -36,7 +36,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module abstract01.exe
 // MVID: {C66B38D1-A1E8-4754-85FF-7C2036CAF09B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract06.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract06.il
index 03e2831eb896d7..8a567e8ebd3bff 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract06.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract06.il
@@ -26,7 +26,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly abstract01
+.assembly 'abstract06'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -36,7 +36,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module abstract01.exe
 // MVID: {C66B38D1-A1E8-4754-85FF-7C2036CAF09B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract07.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract07.il
index 783ba97cccc6c4..6b6de20e71812b 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract07.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract07.il
@@ -25,7 +25,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly abstract01
+.assembly 'abstract07'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -35,7 +35,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module abstract01.exe
 // MVID: {E7F7EB55-8B3A-4BA8-B124-041C478571F7}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract08.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract08.il
index 3387b48a8855ed..6d455969e8c226 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract08.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract08.il
@@ -28,7 +28,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly abstract01
+.assembly 'abstract08'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -38,7 +38,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module abstract01.exe
 // MVID: {C66B38D1-A1E8-4754-85FF-7C2036CAF09B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract09.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract09.il
index 812c55cd64eb56..72cf66aa1cfbaa 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract09.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract09.il
@@ -13,7 +13,7 @@
 
 .assembly extern mscorlib {}
 
-.assembly abstract01 {}
+.assembly 'abstract09' {}
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract10.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract10.il
index 482437c096dacc..c542f64ca397e5 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract10.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/abstract10.il
@@ -25,7 +25,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly abstract01
+.assembly 'abstract10'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -35,7 +35,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module abstract01.exe
 // MVID: {5A88CE82-E7F1-4C78-86E2-8F583AB86D2B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/param01.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/param01.il
index bf2a24a804c1b1..ae7076f2adb065 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/param01.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/param01.il
@@ -23,7 +23,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly Negative001
+.assembly 'param01'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -33,7 +33,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Negative001.exe
 // MVID: {9BF036B6-DE42-44EE-B1DF-CC4A10E1400C}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/param02.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/param02.il
index 2e528c4ce01fdc..f6226582711f2f 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/param02.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/param02.il
@@ -23,7 +23,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly Negative001
+.assembly 'param02'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -33,7 +33,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Negative001.exe
 // MVID: {9BF036B6-DE42-44EE-B1DF-CC4A10E1400C}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/param03.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/param03.il
index 052d7ff4e5cd42..44237ebe9b968c 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/param03.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/param03.il
@@ -23,7 +23,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly Negative001
+.assembly 'param03'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -33,7 +33,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Negative001.exe
 // MVID: {B86C7C7A-5711-4AC7-8792-3E7302C1FCD0}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/param04.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/param04.il
index c350d7a81aa90b..069e5c14514115 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/param04.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/param04.il
@@ -23,7 +23,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly Negative001
+.assembly 'param04'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -33,7 +33,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Negative001.exe
 // MVID: {B86C7C7A-5711-4AC7-8792-3E7302C1FCD0}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/param05.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/param05.il
index 9b491f567577fe..00166d745f7c5d 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/param05.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/param05.il
@@ -17,7 +17,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly Negative001
+.assembly 'param05'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -27,7 +27,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Negative001.exe
 // MVID: {10B7EEBB-6BD5-443C-BF41-3D82794EE6F9}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/param06.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/param06.il
index 5909932eb6bcb1..c7f5100eaf7b7c 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/param06.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/param06.il
@@ -17,7 +17,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly Negative001
+.assembly 'param06'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -27,7 +27,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Negative001.exe
 // MVID: {10B7EEBB-6BD5-443C-BF41-3D82794EE6F9}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/param07.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/param07.il
index 417193c7b0a1e2..8b6a0338f14bf6 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/param07.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/param07.il
@@ -17,7 +17,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly Negative001
+.assembly 'param07'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -27,7 +27,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Negative001.exe
 // MVID: {A165307B-2178-469D-A064-956E56145B09}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Instantiation/Negative/param08.il b/src/tests/Loader/classloader/generics/Instantiation/Negative/param08.il
index 86c795810f81d2..92b524b04325d1 100644
--- a/src/tests/Loader/classloader/generics/Instantiation/Negative/param08.il
+++ b/src/tests/Loader/classloader/generics/Instantiation/Negative/param08.il
@@ -17,7 +17,7 @@
            42 87 88 29 )                                     // B..)
   .ver 1:1:3300:0
 }
-.assembly Negative001
+.assembly 'param08'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -27,7 +27,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Negative001.exe
 // MVID: {A165307B-2178-469D-A064-956E56145B09}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/Loader/classloader/generics/Variance/Interfaces/NoVarianceCheckForStaticMethods.il b/src/tests/Loader/classloader/generics/Variance/Interfaces/NoVarianceCheckForStaticMethods.il
index bd362ecb534c58..b65adee8782912 100644
--- a/src/tests/Loader/classloader/generics/Variance/Interfaces/NoVarianceCheckForStaticMethods.il
+++ b/src/tests/Loader/classloader/generics/Variance/Interfaces/NoVarianceCheckForStaticMethods.il
@@ -13,7 +13,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )                         // .?_....:
   .ver 4:1:2:0
 }
-.assembly ConsoleApp5
+.assembly 'NoVarianceCheckForStaticMethods'
 {
   .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [System.Runtime]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -25,7 +25,6 @@
   .hash algorithm 0x00008004
   .ver 1:0:0:0
 }
-.module ConsoleApp5.dll
 // MVID: {580B623A-FB1A-403C-8F9C-8DB0E42D429C}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.il b/src/tests/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.il
index b0007d5517f8e8..006a4b184a6988 100644
--- a/src/tests/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.il
+++ b/src/tests/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.il
@@ -27,7 +27,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module dev10_468712.exe
 // MVID: {A08CCC44-9903-487B-892B-8613075988F7}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/generics/regressions/109968/test.il b/src/tests/Loader/classloader/generics/regressions/109968/test.il
index a76c987a03df12..c750ca7093b750 100644
--- a/src/tests/Loader/classloader/generics/regressions/109968/test.il
+++ b/src/tests/Loader/classloader/generics/regressions/109968/test.il
@@ -6,7 +6,6 @@
 
 .assembly extern mscorlib {}
 .assembly test {}
-.module test.exe
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/src/tests/Loader/classloader/generics/regressions/dev10_393447/dev10_393447.il b/src/tests/Loader/classloader/generics/regressions/dev10_393447/dev10_393447.il
index 90dc47a2a5d0f4..cc31bcc21f5129 100644
--- a/src/tests/Loader/classloader/generics/regressions/dev10_393447/dev10_393447.il
+++ b/src/tests/Loader/classloader/generics/regressions/dev10_393447/dev10_393447.il
@@ -69,7 +69,7 @@ class Program
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly bug393447
+.assembly 'dev10_393447'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -77,7 +77,6 @@ class Program
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module bug393447.exe
 // MVID: {1A8972AD-8254-4063-BA42-1661A4257C01}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/generics/regressions/dev10_531793/dev10_531793.il b/src/tests/Loader/classloader/generics/regressions/dev10_531793/dev10_531793.il
index aaa2ad9212d9ac..6c1c1cd78b03a5 100644
--- a/src/tests/Loader/classloader/generics/regressions/dev10_531793/dev10_531793.il
+++ b/src/tests/Loader/classloader/generics/regressions/dev10_531793/dev10_531793.il
@@ -18,7 +18,6 @@
   .hash algorithm 0x00008004
   .ver 1:0:0:0
 }
-.module dev10_531793.exe
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/src/tests/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride2.il b/src/tests/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride2.il
index f563b787af04d8..223920e05e84b0 100644
--- a/src/tests/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride2.il
+++ b/src/tests/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride2.il
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module testExplicitOverride2.exe
 // MVID: {8B3E6954-BAFA-445B-A5E1-CECA62B7DCE6}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/nesting/coreclr/exec3.il b/src/tests/Loader/classloader/nesting/coreclr/exec3.il
index 0a7072b7119706..2a9a70c8c83959 100644
--- a/src/tests/Loader/classloader/nesting/coreclr/exec3.il
+++ b/src/tests/Loader/classloader/nesting/coreclr/exec3.il
@@ -6,7 +6,7 @@
 // model revision #2
 // To compile: ilasm exec3.il
 
-.assembly exec {}
+.assembly 'exec3' {}
 .assembly extern mscorlib {}
 
 .assembly extern nesting3 {}
diff --git a/src/tests/Loader/classloader/regressions/139056/Foo.il b/src/tests/Loader/classloader/regressions/139056/Foo.il
index 885baddfd3da8f..afb7b5310f8ca3 100644
--- a/src/tests/Loader/classloader/regressions/139056/Foo.il
+++ b/src/tests/Loader/classloader/regressions/139056/Foo.il
@@ -27,7 +27,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Foo.exe
 // MVID: {E2294DFD-8443-4AA7-9104-BC680C3B8133}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/421439/Test.il b/src/tests/Loader/classloader/regressions/421439/Test.il
index 12c0d745b9b127..f5db50dfac5f09 100644
--- a/src/tests/Loader/classloader/regressions/421439/Test.il
+++ b/src/tests/Loader/classloader/regressions/421439/Test.il
@@ -7,7 +7,7 @@
 .assembly extern RefX1 {}
 .assembly extern ValX1 {}
 
-.assembly Test_Test {}
+.assembly 'Test' {}
 
 .class public sequential ansi sealed beforefieldinit Gen<T>
        extends [mscorlib]System.ValueType
diff --git a/src/tests/Loader/classloader/regressions/429802/CMain.il b/src/tests/Loader/classloader/regressions/429802/CMain.il
index 00363ba266de8d..ffb59205da160d 100644
--- a/src/tests/Loader/classloader/regressions/429802/CMain.il
+++ b/src/tests/Loader/classloader/regressions/429802/CMain.il
@@ -32,7 +32,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module M
 // MVID: {01C3371C-004D-0000-A745-03831C37C341}
 .imagebase 0x034f0000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/440935/Test.il b/src/tests/Loader/classloader/regressions/440935/Test.il
index 68cc307f71b44b..b2f8241241a4a6 100644
--- a/src/tests/Loader/classloader/regressions/440935/Test.il
+++ b/src/tests/Loader/classloader/regressions/440935/Test.il
@@ -24,12 +24,11 @@
 {
   .ver 0:0:0:0
 }
-.assembly Test_Test
+.assembly 'Test'
 {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module M
 // MVID: {01EC94B1-004D-0000-A745-0383B194EC41}
 .imagebase 0x034f0000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/452707/b452707.il b/src/tests/Loader/classloader/regressions/452707/b452707.il
index 144f738517ed7a..b0453641b8e513 100644
--- a/src/tests/Loader/classloader/regressions/452707/b452707.il
+++ b/src/tests/Loader/classloader/regressions/452707/b452707.il
@@ -10,7 +10,6 @@
 .assembly extern mscorlib {}
 
 .assembly b452707 {}
-.module b452707.exe
 
 .class private sequential ansi sealed beforefieldinit MyS
        extends [mscorlib]System.ValueType
diff --git a/src/tests/Loader/classloader/regressions/GitHub_41571/GitHub_41571.il b/src/tests/Loader/classloader/regressions/GitHub_41571/GitHub_41571.il
index 040d506c6b72c9..687c1986fba286 100644
--- a/src/tests/Loader/classloader/regressions/GitHub_41571/GitHub_41571.il
+++ b/src/tests/Loader/classloader/regressions/GitHub_41571/GitHub_41571.il
@@ -9,7 +9,7 @@
   .ver 5:0:0:0
 }
 .assembly extern xunit.core {}
-.assembly '41571'
+.assembly 'GitHub_41571'
 {
   .custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [System.Runtime]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -31,7 +31,6 @@
   .hash algorithm 0x00008004
   .ver 1:0:0:0
 }
-.module '41571.dll'
 // MVID: {7F828A34-F3E8-43DB-A60B-950719B2314B}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_403582/dev10_403582.il b/src/tests/Loader/classloader/regressions/dev10_403582/dev10_403582.il
index fcc0ea0c355c0a..c00ac167017ac7 100644
--- a/src/tests/Loader/classloader/regressions/dev10_403582/dev10_403582.il
+++ b/src/tests/Loader/classloader/regressions/dev10_403582/dev10_403582.il
@@ -18,7 +18,7 @@
 {
   .ver 0:0:0:0
 }
-.assembly ddb187632
+.assembly 'dev10_403582'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -26,7 +26,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module ddb187632.exe
 // MVID: {B6CD7E92-EDE7-4493-B78F-D3F743C68390}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_443322/dev10_443322.il b/src/tests/Loader/classloader/regressions/dev10_443322/dev10_443322.il
index b8f0544c0c53c7..428d68c487b4b8 100644
--- a/src/tests/Loader/classloader/regressions/dev10_443322/dev10_443322.il
+++ b/src/tests/Loader/classloader/regressions/dev10_443322/dev10_443322.il
@@ -40,7 +40,7 @@ static int Main() {
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly bug443322
+.assembly 'dev10_443322'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -48,7 +48,6 @@ static int Main() {
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module bug443322.exe
 // MVID: {EDF83A15-9E74-47F0-B94B-197894607E38}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_493135/dev10_493135.il b/src/tests/Loader/classloader/regressions/dev10_493135/dev10_493135.il
index 2793090e7a4a3d..e14311a648b670 100644
--- a/src/tests/Loader/classloader/regressions/dev10_493135/dev10_493135.il
+++ b/src/tests/Loader/classloader/regressions/dev10_493135/dev10_493135.il
@@ -15,11 +15,10 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 0:0:0:0
 }
-.assembly AppCompatBug
+.assembly 'dev10_493135'
 {
   .ver 0:0:0:0
 }
-.module AppCompatBug.exe
 // MVID: {EAE2209C-4B54-47C6-96C2-EC2352FC6386}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/MethodCalls.il b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/MethodCalls.il
index d4164c196a9d82..f4d93606154c86 100644
--- a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/MethodCalls.il
+++ b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/MethodCalls.il
@@ -15,7 +15,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly StaticMethods
+.assembly 'MethodCalls'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module StaticMethods.exe
 // MVID: {D3FCE52A-664A-48CB-A101-57680CEB43F1}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/RecursiveGen.il b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/RecursiveGen.il
index dd1f6baaf3e292..e30cb30acebaa5 100644
--- a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/RecursiveGen.il
+++ b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/RecursiveGen.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module RecursiveGen.exe
 // MVID: {CCE38E80-73AC-4FAC-A7CD-8B523BD6C64F}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/SealedTypes.il b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/SealedTypes.il
index 2d8798ef059425..bff2101f335677 100644
--- a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/SealedTypes.il
+++ b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/SealedTypes.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module SealedTypes.exe
 // MVID: {926F9C9D-6690-45EB-B4DA-12725C405BC3}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/Variance1.il b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/Variance1.il
index 4683ad354d9a80..2a56adb24776e5 100644
--- a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/Variance1.il
+++ b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/Variance1.il
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Variance1.exe
 // MVID: {DC3FB067-F52C-4120-BD62-DFA180241B4B}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/Variance2.il b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/Variance2.il
index dca99bd67e643c..df7807ac8e2023 100644
--- a/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/Variance2.il
+++ b/src/tests/Loader/classloader/regressions/dev10_568786/4_Misc/Variance2.il
@@ -15,7 +15,7 @@
   .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
   .ver 4:0:0:0
 }
-.assembly Variance1
+.assembly 'Variance2'
 {
   .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 ) 
   .custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78   // ....T..WrapNonEx
@@ -23,7 +23,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module Variance1.exe
 // MVID: {DC3FB067-F52C-4120-BD62-DFA180241B4B}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/dev10_710121/dev10_710121.il b/src/tests/Loader/classloader/regressions/dev10_710121/dev10_710121.il
index 3f95ba2a650f60..bf09bb946a46cd 100644
--- a/src/tests/Loader/classloader/regressions/dev10_710121/dev10_710121.il
+++ b/src/tests/Loader/classloader/regressions/dev10_710121/dev10_710121.il
@@ -16,7 +16,7 @@ The bug related to populating MethodDesc slots in generic dictionaries at runtim
 */
 
 .assembly extern mscorlib {}
-.assembly Generated30 {}
+.assembly 'dev10_710121' {}
 
 .class public DerivedDerived
 		extends class Derived`2<string,string>
diff --git a/src/tests/Loader/classloader/regressions/dev10_715437/dev10_715437.il b/src/tests/Loader/classloader/regressions/dev10_715437/dev10_715437.il
index 7a8cf4ac9706d6..4aef430a667f12 100644
--- a/src/tests/Loader/classloader/regressions/dev10_715437/dev10_715437.il
+++ b/src/tests/Loader/classloader/regressions/dev10_715437/dev10_715437.il
@@ -12,7 +12,7 @@ function call DerivedDerived::Method() since the method is not defined on this t
 */
 
 .assembly extern mscorlib {}
-.assembly Generated26 {}
+.assembly 'dev10_715437' {}
 
 
 .class public DerivedDerived extends class Derived`2<string,int32>
diff --git a/src/tests/Loader/classloader/regressions/dev10_720779/dev10_720779.il b/src/tests/Loader/classloader/regressions/dev10_720779/dev10_720779.il
index da4d2520673d44..1b66f2e0d8cda0 100644
--- a/src/tests/Loader/classloader/regressions/dev10_720779/dev10_720779.il
+++ b/src/tests/Loader/classloader/regressions/dev10_720779/dev10_720779.il
@@ -16,7 +16,7 @@ where MyClosedDel is:
 
 */
 .assembly extern mscorlib {}
-.assembly Generated0 {}
+.assembly 'dev10_720779' {}
 
 
 
diff --git a/src/tests/Loader/classloader/regressions/dev10_788724/dev10_788724.il b/src/tests/Loader/classloader/regressions/dev10_788724/dev10_788724.il
index 0126124a2f2cb9..1c12b2dc2b4f98 100644
--- a/src/tests/Loader/classloader/regressions/dev10_788724/dev10_788724.il
+++ b/src/tests/Loader/classloader/regressions/dev10_788724/dev10_788724.il
@@ -4,8 +4,7 @@
 .assembly extern System.Console { }
 .assembly extern xunit.core {}
 .assembly extern mscorlib {}
-.assembly Generated0 {}
-.module Generated0.exe
+.assembly 'dev10_788724' {}
 
 .class public sequential sealed MyStruct0 extends [mscorlib]System.ValueType
 {
diff --git a/src/tests/Loader/classloader/regressions/vsw188290/vsw188290.il b/src/tests/Loader/classloader/regressions/vsw188290/vsw188290.il
index a09708f82940f6..36888dbfeca031 100644
--- a/src/tests/Loader/classloader/regressions/vsw188290/vsw188290.il
+++ b/src/tests/Loader/classloader/regressions/vsw188290/vsw188290.il
@@ -17,7 +17,7 @@
            37 E9 11 BE )                                     // 7...
   .ver 2:0:3600:0
 }
-.assembly initialize
+.assembly 'vsw188290'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -28,7 +28,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module initialize.exe
 // MVID: {31E86D7D-808F-4F1C-A755-94B3084C6466}
 .imagebase 0x00400000
 .file alignment 0x00000200
diff --git a/src/tests/Loader/classloader/regressions/vsw305955/GenericAssert.il b/src/tests/Loader/classloader/regressions/vsw305955/GenericAssert.il
index f2b447a7d0444b..b07c5028fcd861 100644
--- a/src/tests/Loader/classloader/regressions/vsw305955/GenericAssert.il
+++ b/src/tests/Loader/classloader/regressions/vsw305955/GenericAssert.il
@@ -15,7 +15,6 @@
 				"Flags=\"SkipVerification\"/>" +
 		"</PermissionSet>"
 }
-.module GenericAssert
 
 .class interface public ContraVariantInterface<-T> { }
 .class public interface StandardInterface { }
diff --git a/src/tests/Loader/classloader/rmv/il/RMV-2-15-12b.il b/src/tests/Loader/classloader/rmv/il/RMV-2-15-12b.il
index 165e55f3e2007b..96c606fa424192 100644
--- a/src/tests/Loader/classloader/rmv/il/RMV-2-15-12b.il
+++ b/src/tests/Loader/classloader/rmv/il/RMV-2-15-12b.il
@@ -3,7 +3,7 @@
 
 .assembly extern System.Console { }
 .assembly extern xunit.core {}
-.assembly 'RMV-2-15-12'{}
+.assembly 'RMV-2-15-12b'{}
 .assembly extern mscorlib {}
 
 .class Parent{
diff --git a/src/tests/baseservices/exceptions/generics/try-fault-struct01.il b/src/tests/baseservices/exceptions/generics/try-fault-struct01.il
index b9860e063ac201..5c2e37ef206406 100644
--- a/src/tests/baseservices/exceptions/generics/try-fault-struct01.il
+++ b/src/tests/baseservices/exceptions/generics/try-fault-struct01.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-finally01'
+.assembly 'try-fault-struct01'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-finally01.exe'
 // MVID: {736049C4-A4DA-41B1-895D-B9E4A517BBE4}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-fault-struct02.il b/src/tests/baseservices/exceptions/generics/try-fault-struct02.il
index 4aafe06763cb16..5c4a8e9bb5ccc8 100644
--- a/src/tests/baseservices/exceptions/generics/try-fault-struct02.il
+++ b/src/tests/baseservices/exceptions/generics/try-fault-struct02.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-finally01'
+.assembly 'try-fault-struct02'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-finally01.exe'
 // MVID: {736049C4-A4DA-41B1-895D-B9E4A517BBE4}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-fault-struct03.il b/src/tests/baseservices/exceptions/generics/try-fault-struct03.il
index ec986e352cf582..badfb65b254e52 100644
--- a/src/tests/baseservices/exceptions/generics/try-fault-struct03.il
+++ b/src/tests/baseservices/exceptions/generics/try-fault-struct03.il
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-fault-struct03.exe'
 // MVID: {64D27B72-3BAB-4B06-AC5B-6ECC5A9F3FB9}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-fault01.il b/src/tests/baseservices/exceptions/generics/try-fault01.il
index 1b56de0dc13f0a..58394f67c85c2c 100644
--- a/src/tests/baseservices/exceptions/generics/try-fault01.il
+++ b/src/tests/baseservices/exceptions/generics/try-fault01.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-finally01'
+.assembly 'try-fault01'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-finally01.exe'
 // MVID: {736049C4-A4DA-41B1-895D-B9E4A517BBE4}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-fault02.il b/src/tests/baseservices/exceptions/generics/try-fault02.il
index e172492d344df8..c20002ea1c6a90 100644
--- a/src/tests/baseservices/exceptions/generics/try-fault02.il
+++ b/src/tests/baseservices/exceptions/generics/try-fault02.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-finally01'
+.assembly 'try-fault02'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-finally01.exe'
 // MVID: {736049C4-A4DA-41B1-895D-B9E4A517BBE4}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-fault03.il b/src/tests/baseservices/exceptions/generics/try-fault03.il
index 3db16eb608b4c0..7703eb568d9d01 100644
--- a/src/tests/baseservices/exceptions/generics/try-fault03.il
+++ b/src/tests/baseservices/exceptions/generics/try-fault03.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-finally03'
+.assembly 'try-fault03'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-finally03.exe'
 // MVID: {64D27B72-3BAB-4B06-AC5B-6ECC5A9F3FB9}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-filter-finally01.il b/src/tests/baseservices/exceptions/generics/try-filter-finally01.il
index dfc1c5b07b8fd3..33bee4e4ebcba4 100644
--- a/src/tests/baseservices/exceptions/generics/try-filter-finally01.il
+++ b/src/tests/baseservices/exceptions/generics/try-filter-finally01.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-catch01'
+.assembly 'try-filter-finally01'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-catch01.exe'
 // MVID: {76712D77-A992-40B1-9AD0-E58BD9DA334B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-filter-finally02.il b/src/tests/baseservices/exceptions/generics/try-filter-finally02.il
index fea9c60403281b..658a4adedb04f6 100644
--- a/src/tests/baseservices/exceptions/generics/try-filter-finally02.il
+++ b/src/tests/baseservices/exceptions/generics/try-filter-finally02.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-catch01'
+.assembly 'try-filter-finally02'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-catch01.exe'
 // MVID: {76712D77-A992-40B1-9AD0-E58BD9DA334B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-filter-struct02.il b/src/tests/baseservices/exceptions/generics/try-filter-struct02.il
index 8e11b47853c727..66c43d20a46d70 100644
--- a/src/tests/baseservices/exceptions/generics/try-filter-struct02.il
+++ b/src/tests/baseservices/exceptions/generics/try-filter-struct02.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-catch01'
+.assembly 'try-filter-struct02'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-catch01.exe'
 // MVID: {76712D77-A992-40B1-9AD0-E58BD9DA334B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/generics/try-filter02.il b/src/tests/baseservices/exceptions/generics/try-filter02.il
index ce505dc643cabb..0bdb09881b8bf9 100644
--- a/src/tests/baseservices/exceptions/generics/try-filter02.il
+++ b/src/tests/baseservices/exceptions/generics/try-filter02.il
@@ -14,7 +14,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'try-catch01'
+.assembly 'try-filter02'
 {
 
   // --- The following custom attribute is added automatically, do not uncomment -------
@@ -24,7 +24,6 @@
   .hash algorithm 0x00008004
   .ver 0:0:0:0
 }
-.module 'try-catch01.exe'
 // MVID: {76712D77-A992-40B1-9AD0-E58BD9DA334B}
 .imagebase 0x00400000
 .subsystem 0x00000003
diff --git a/src/tests/baseservices/exceptions/regressions/v1.0/15266.il b/src/tests/baseservices/exceptions/regressions/v1.0/15266.il
index 74ac7d015abe89..67a0ad3e0cf373 100644
--- a/src/tests/baseservices/exceptions/regressions/v1.0/15266.il
+++ b/src/tests/baseservices/exceptions/regressions/v1.0/15266.il
@@ -11,8 +11,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly b15266 {}
-.module b15266.exe
+.assembly '15266' {}
 
 .class private auto ansi beforefieldinit test
        extends [mscorlib]System.Object
diff --git a/src/tests/baseservices/varargs/varargsupport.il b/src/tests/baseservices/varargs/varargsupport.il
index f9eb43b7ad5e84..9c3d085728e013 100644
--- a/src/tests/baseservices/varargs/varargsupport.il
+++ b/src/tests/baseservices/varargs/varargsupport.il
@@ -8,7 +8,7 @@
 }
 .assembly extern xunit.core {}
 .assembly extern legacy library mscorlib {}
-.assembly 'vafilt'
+.assembly 'varargsupport'
 {
   
   
