diff --git a/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il b/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il
index fd08a8eb35e5d8..e1451dcac22fd0 100644
--- a/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il
+++ b/src/tests/JIT/Directed/IL/Tailcall/Jittailcall2.il
@@ -10,7 +10,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'aaa'// as "aaa.exe"
+.assembly 'aaa'// as "aaa"
 {
   
   
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist.il
index 7559a8c6cfc179..99ddad161eb97b 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist.il
@@ -19,7 +19,7 @@ arg1==arg4, arg2==arg5, arg3==arg6.
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist64.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist64.il
index 4b328281e2863b..74ad14baf0e67a 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist64.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglist64.il
@@ -19,7 +19,7 @@ arg1==arg4, arg2==arg5, arg3==arg6.
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il
index 3778c5d9f9aed9..055e6f6f78fcd1 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/arglistARM.il
@@ -28,7 +28,7 @@ ARM is closer to the native ABI:
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.il
index f0728d8e9e1a40..6eb564c3db932c 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/initblk.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initblk.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'initblk'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.il
index 3d4b21b555205b..8cb42f524984aa 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/initobj.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initobj.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'initobj'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.il b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.il
index f8aed3eae64ffc..11e0f5efd3c2b5 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/1/ldind_stind.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ldind_stind.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly ldind_stind{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist.il
index 18a653b9cdda16..9fc39834409849 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist.il
@@ -19,7 +19,7 @@ arg1==arg4, arg2==arg5, arg3==arg6.
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist64.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist64.il
index ab5fafadacd21c..751f86b0e53a2d 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist64.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglist64.il
@@ -19,7 +19,7 @@ arg1==arg4, arg2==arg5, arg3==arg6.
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il
index 06d1017e036a6f..f3eed6072f9cd5 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/arglistARM.il
@@ -27,7 +27,7 @@ ARM is closer to the native ABI:
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.il
index d7d123e144216a..82a080901ba74d 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/initblk.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initblk.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'initblk'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.il
index 26d402b5bb42d5..5157b22a05a425 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/initobj.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initobj.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'initobj'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.il b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.il
index 44976df3d5c852..4269313f23a942 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/2/ldind_stind.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ldind_stind.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly ldind_stind{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist.il
index cea7f3686214b2..f7cb305d9d707f 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist.il
@@ -19,7 +19,7 @@ arg1==arg4, arg2==arg5, arg3==arg6.
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist64.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist64.il
index 8d947cf8dc3679..635623f76a71da 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist64.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglist64.il
@@ -19,7 +19,7 @@ arg1==arg4, arg2==arg5, arg3==arg6.
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglistARM.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglistARM.il
index 1dbd16ca018703..85626d71e7cd02 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/4/arglistARM.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/arglistARM.il
@@ -27,7 +27,7 @@ ARM is closer to the native ABI:
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.il
index 00ee567afa142c..652925eb3ba152 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/initblk.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initblk.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'initblk'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.il
index dc05f3873a801a..3b8be322827376 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/initobj.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initobj.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'initobj'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.il b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.il
index f3952f94b53042..3c84384f863af5 100644
--- a/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.il
+++ b/src/tests/JIT/Directed/PREFIX/unaligned/4/ldind_stind.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ldind_stind.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly ldind_stind{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist.il b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist.il
index bd712a96b40d3c..782151eb003ee8 100644
--- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist.il
+++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist.il
@@ -19,7 +19,7 @@ arg1==arg4, arg2==arg5, arg3==arg6.
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist64.il b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist64.il
index 263d6b16ca77dc..5a5b3517aa0198 100644
--- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglist64.il
+++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglist64.il
@@ -19,7 +19,7 @@ arg1==arg4, arg2==arg5, arg3==arg6.
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/arglistARM.il b/src/tests/JIT/Directed/PREFIX/volatile/1/arglistARM.il
index 2588f24b5f98e9..cd9e5017aa84f9 100644
--- a/src/tests/JIT/Directed/PREFIX/volatile/1/arglistARM.il
+++ b/src/tests/JIT/Directed/PREFIX/volatile/1/arglistARM.il
@@ -27,7 +27,7 @@ ARM is closer to the native ABI:
 */
 
 .assembly extern legacy library mscorlib {}
-.assembly arglist.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'arglist'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.il b/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.il
index c77e74c2ebb098..fdf40da118bd0e 100644
--- a/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.il
+++ b/src/tests/JIT/Directed/PREFIX/volatile/1/initblk.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initblk.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'initblk'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.il b/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.il
index 35ad51df1646a5..59235c30b590fa 100644
--- a/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.il
+++ b/src/tests/JIT/Directed/PREFIX/volatile/1/initobj.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initobj.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly 'initobj'{ //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 )]
                         }
 
diff --git a/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.il b/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.il
index 65389c0f53dce5..20ac7afc91ba94 100644
--- a/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.il
+++ b/src/tests/JIT/Directed/PREFIX/volatile/1/ldind_stind.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ldind_stind.exe{ //This byte field requests that this assembly not be verified at run time and corresponds to this C# declaration:
+.assembly ldind_stind{ //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 )]
                         }
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/add.il b/src/tests/JIT/IL_Conformance/Old/Base/add.il
index 9dfe91a50261b0..2c4e8fef7af3a1 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/add.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/add.il
@@ -17,7 +17,7 @@
 //-----------------------------------------------------
 
 
-.assembly add.exe{
+.assembly 'add'{
   //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 )]
 }
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/add_ovf.il b/src/tests/JIT/IL_Conformance/Old/Base/add_ovf.il
index 292a50772456cd..cf8380e32c2ff5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/add_ovf.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/add_ovf.il
@@ -4,7 +4,7 @@
 .assembly extern legacy library mscorlib {}
 
 
-.assembly add_ovf.exe{}
+.assembly add_ovf{}
 
 
 .class public add_ovf {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/and.il b/src/tests/JIT/IL_Conformance/Old/Base/and.il
index 36378247fb843c..e5a71647024f4f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/and.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/and.il
@@ -4,7 +4,7 @@
 .assembly extern legacy library mscorlib {}
 
 
-.assembly and.exe{}
+.assembly 'and'{}
 
 .class public _and {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/beq.il b/src/tests/JIT/IL_Conformance/Old/Base/beq.il
index 531b9e515fb238..b24c4c247af241 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/beq.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/beq.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly beq.exe{}
+.assembly 'beq'{}
 
 .method public	static int32 main(class [mscorlib]System.String[]) {
 .locals		(class [mscorlib]System.String)
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/beq_s.il b/src/tests/JIT/IL_Conformance/Old/Base/beq_s.il
index 66eda3868963ad..b0f751a3e695db 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/beq_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/beq_s.il
@@ -55,5 +55,5 @@ end:
 }
 
 
-.assembly beq_s.exe {}
+.assembly beq_s {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/bge.il b/src/tests/JIT/IL_Conformance/Old/Base/bge.il
index 9385223481cb2c..589e6f318d56ea 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/bge.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/bge.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly bge.exe{}
+.assembly 'bge'{}
 
 .method public	static int32 main(class [mscorlib]System.String[]) {
 .locals		(class [mscorlib]System.String)
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/bge_s.il b/src/tests/JIT/IL_Conformance/Old/Base/bge_s.il
index 2cc1fb8675c486..a227914e92910a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/bge_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/bge_s.il
@@ -78,5 +78,5 @@ end:
 }
 
 
-.assembly bge_s.exe {}
+.assembly bge_s {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/bgt.il b/src/tests/JIT/IL_Conformance/Old/Base/bgt.il
index 000140926595d3..1b323d8259592e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/bgt.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/bgt.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly bgt.exe{}
+.assembly 'bgt'{}
 
 
 .method public	static int32 main(class [mscorlib]System.String[]) {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/bgt_s.il b/src/tests/JIT/IL_Conformance/Old/Base/bgt_s.il
index 44ccd502f4529a..5733b277808641 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/bgt_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/bgt_s.il
@@ -80,5 +80,5 @@ end:
 }
 
 
-.assembly bgt_s.exe {}
+.assembly bgt_s {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ble.il b/src/tests/JIT/IL_Conformance/Old/Base/ble.il
index d3845de3796ffd..cfcf6d05549c5c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ble.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ble.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ble.exe{}
+.assembly 'ble'{}
 
 .method public	static int32 main(class [mscorlib]System.String[]) {
 .locals		(class [mscorlib]System.String)
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ble_s.il b/src/tests/JIT/IL_Conformance/Old/Base/ble_s.il
index a52f287efe7d94..d6ee5cce30fcdb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ble_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ble_s.il
@@ -79,5 +79,5 @@ end:
 }
 
 
-.assembly ble_s.exe {}
+.assembly ble_s {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/blt.il b/src/tests/JIT/IL_Conformance/Old/Base/blt.il
index a367c7f192bda1..5a51ab2fdee895 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/blt.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/blt.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly blt.exe{}
+.assembly 'blt'{}
 
 .method public	static int32 main(class [mscorlib]System.String[]) {
 .locals		(class [mscorlib]System.String)
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/blt_s.il b/src/tests/JIT/IL_Conformance/Old/Base/blt_s.il
index 77e48aadb3138e..fa3cf86c78e551 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/blt_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/blt_s.il
@@ -79,5 +79,5 @@ end:
 }
 
 
-.assembly blt_s.exe {}
+.assembly blt_s {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/bne.il b/src/tests/JIT/IL_Conformance/Old/Base/bne.il
index 42671bd8f423a3..0efff3a8b3a68e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/bne.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/bne.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly bne.exe{}
+.assembly bne{}
 
 .method public	static int32 main(class [mscorlib]System.String[]) {
 .locals		(class [mscorlib]System.String)
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/bne_s.il b/src/tests/JIT/IL_Conformance/Old/Base/bne_s.il
index b3028e9ee7cb37..bfb97a56b181c4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/bne_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/bne_s.il
@@ -79,5 +79,5 @@ end:
 }
 
 
-.assembly bne_s.exe {}
+.assembly bne_s {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/br.il b/src/tests/JIT/IL_Conformance/Old/Base/br.il
index 922adb53f7bc20..d70a9c9cfe9b27 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/br.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/br.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly br.exe{}
+.assembly 'br'{}
 
 .class public _br {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/br_s.il b/src/tests/JIT/IL_Conformance/Old/Base/br_s.il
index 4e4df5de05645e..bcc90fbd8d6a37 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/br_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/br_s.il
@@ -26,4 +26,4 @@ PASS:
 }
 }
 
-.assembly br_s.exe {}
+.assembly br_s {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/brfalse.il b/src/tests/JIT/IL_Conformance/Old/Base/brfalse.il
index 26bd6beb0bcfd4..9703dd6f5f87e3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/brfalse.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/brfalse.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly brfalse.exe{}
+.assembly 'brfalse'{}
 
 .class public _brfalse {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/brfalse_s.il b/src/tests/JIT/IL_Conformance/Old/Base/brfalse_s.il
index e59f9413ab2b6d..0a2238982aae70 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/brfalse_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/brfalse_s.il
@@ -21,4 +21,4 @@ PASS:
 }
 }
 
-.assembly brfalse_s.exe {}
+.assembly brfalse_s {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/brtrue.il b/src/tests/JIT/IL_Conformance/Old/Base/brtrue.il
index a6bfc343295231..52f2edb48bc70c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/brtrue.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/brtrue.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly brtrue.exe{}
+.assembly 'brtrue'{}
 
 .class public _brtrue {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/brtrue_s.il b/src/tests/JIT/IL_Conformance/Old/Base/brtrue_s.il
index 71a508a8359de9..2ad50440016328 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/brtrue_s.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/brtrue_s.il
@@ -20,4 +20,4 @@ PASS:
 }
 }
 
-.assembly brtrue_s.exe {}
+.assembly brtrue_s {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/call.il b/src/tests/JIT/IL_Conformance/Old/Base/call.il
index 5ce6d09058595f..f2095563e284cb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/call.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/call.il
@@ -5,7 +5,7 @@
 
 
 
-.assembly call.exe{}
+.assembly 'call'{}
 
 .method public public static int32 test() {
 	ldc.i4	0xFF
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ceq.il b/src/tests/JIT/IL_Conformance/Old/Base/ceq.il
index 22d99f768e61ca..ca90608f776114 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ceq.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ceq.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ceq.exe{}
+.assembly 'ceq'{}
 
 .class public _ceq {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/cgt.il b/src/tests/JIT/IL_Conformance/Old/Base/cgt.il
index e038a440a0d47b..b6d68dc1f5403e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/cgt.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/cgt.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly cgt.exe{}
+.assembly 'cgt'{}
 
 .class public _cgt {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il b/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il
index 9ee1badb5238a4..96d81177b0818d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ckfinite.exe{}
+.assembly 'ckfinite'{}
 
 .class public _ckfinite {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/clt.il b/src/tests/JIT/IL_Conformance/Old/Base/clt.il
index d3e36a3cdb7155..c54969d73eb069 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/clt.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/clt.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly clt.exe{
+.assembly 'clt'{
 }
 
 .class public _clt {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/conv.il b/src/tests/JIT/IL_Conformance/Old/Base/conv.il
index dacc820f90289f..eabca38ca7f43c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/conv.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/conv.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly conv.exe{}
+.assembly conv{}
 
 .class public conv {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/conv_ovf.il b/src/tests/JIT/IL_Conformance/Old/Base/conv_ovf.il
index a6403200605cad..ce5e3d05f3f3d1 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/conv_ovf.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/conv_ovf.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly conv_ovf.exe{}
+.assembly conv_ovf{}
 
 .class public conv_ovf {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/cpblk.il b/src/tests/JIT/IL_Conformance/Old/Base/cpblk.il
index a70683c43993a0..c2e5f649ee10a1 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/cpblk.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/cpblk.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly cpblk.exe{
+.assembly 'cpblk'{
 }
 
 .class public _cpblk {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/div.il b/src/tests/JIT/IL_Conformance/Old/Base/div.il
index 0a12a553082c96..5e626d3e95098a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/div.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/div.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly div.exe{}
+.assembly 'div'{}
 
 .class public _div {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/dup.il b/src/tests/JIT/IL_Conformance/Old/Base/dup.il
index 2fdeb4d64b1586..6627bd4056292a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/dup.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/dup.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly dup.exe{
+.assembly 'dup'{
 }
 
 .class public _dup {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/initblk.il b/src/tests/JIT/IL_Conformance/Old/Base/initblk.il
index 3d6d38b5cea52f..cf898744d0b67a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/initblk.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/initblk.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly initblk.exe{
+.assembly 'initblk'{
 }
 
 .class public _initblk {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/jmp.il b/src/tests/JIT/IL_Conformance/Old/Base/jmp.il
index 767b0c73915546..4f48e4cc9995e6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/jmp.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/jmp.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly jmp.exe{
+.assembly 'jmp'{
 }
 
 .method public static int32 main(class [mscorlib]System.String[]) {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldarg_n.il b/src/tests/JIT/IL_Conformance/Old/Base/ldarg_n.il
index 72cfe7842da81b..ed0a1fa050d7fd 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldarg_n.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldarg_n.il
@@ -395,5 +395,5 @@ FAIL:
 }
 }
 
-.assembly ldarg_n.exe {}
+.assembly ldarg_n {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldarg_starg.il b/src/tests/JIT/IL_Conformance/Old/Base/ldarg_starg.il
index 46e88423ad5397..d9dd7dcf39fbbf 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldarg_starg.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldarg_starg.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ldarg_starg.exe{
+.assembly ldarg_starg{
 }
 
 .class public ldarg_starg {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldargs_stargs.il b/src/tests/JIT/IL_Conformance/Old/Base/ldargs_stargs.il
index a42363e7837c69..06b9d357990ad5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldargs_stargs.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldargs_stargs.il
@@ -110,4 +110,4 @@ FAIL:
 }
 }
 
-.assembly ldargs_stargs.exe {}
+.assembly ldargs_stargs {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldc.il b/src/tests/JIT/IL_Conformance/Old/Base/ldc.il
index 0f5b3da8b4da58..b83dcf7be0e889 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldc.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldc.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ldc.exe{}
+.assembly ldc{}
 
 .class public ldc {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldc_i4_n.il b/src/tests/JIT/IL_Conformance/Old/Base/ldc_i4_n.il
index 945f30b5b02ee8..bdaa6b320cce11 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldc_i4_n.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldc_i4_n.il
@@ -70,5 +70,5 @@ FAIL:
 }
 }
 
-.assembly ldc_i4_n.exe {}
+.assembly ldc_i4_n {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldftn_calli.il b/src/tests/JIT/IL_Conformance/Old/Base/ldftn_calli.il
index 2fcd161c551ab0..083a4a38c2f883 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldftn_calli.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldftn_calli.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ldftn_calli.exe{}
+.assembly ldftn_calli{}
 
 
 .method public public static int32 test() {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldind_stind.il b/src/tests/JIT/IL_Conformance/Old/Base/ldind_stind.il
index 470be079f911f5..78a0a9e4d67c15 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldind_stind.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldind_stind.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ldind_stind.exe{}
+.assembly ldind_stind{}
 
 .class public ldind_stind {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldloc_stloc.il b/src/tests/JIT/IL_Conformance/Old/Base/ldloc_stloc.il
index 341e97408fe083..84d33f5b3cf94b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldloc_stloc.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldloc_stloc.il
@@ -5,7 +5,7 @@
 
 
 
-.assembly ldloc_stloc.exe{
+.assembly ldloc_stloc{
 }
 
 .class public value sealed vclass{
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldloca.il b/src/tests/JIT/IL_Conformance/Old/Base/ldloca.il
index 22707100495c49..d70a68364be041 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldloca.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldloca.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ldloca.exe{
+.assembly 'ldloca'{
 }
 
 .class public _ldloca {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ldnull.il b/src/tests/JIT/IL_Conformance/Old/Base/ldnull.il
index 661bec5a469c0f..6b11ab3dba3662 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ldnull.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ldnull.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ldnull.exe{}
+.assembly 'ldnull'{}
 
 .class public _ldnull {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/mul.il b/src/tests/JIT/IL_Conformance/Old/Base/mul.il
index d2342ad684b9fb..20cf98dee29ce3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/mul.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/mul.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly mul.exe{}
+.assembly 'mul'{}
 
 .class public _mul {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/mul_ovf.il b/src/tests/JIT/IL_Conformance/Old/Base/mul_ovf.il
index 7cfe254af98333..9c7c4c05d2c59b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/mul_ovf.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/mul_ovf.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly mul_ovf.exe{}
+.assembly mul_ovf{}
 
 .class public mul_ovf {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/neg.il b/src/tests/JIT/IL_Conformance/Old/Base/neg.il
index c987590695b2ac..499557a4e5abee 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/neg.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/neg.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly neg.exe{}
+.assembly 'neg'{}
 
 .class public _neg {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/nop.il b/src/tests/JIT/IL_Conformance/Old/Base/nop.il
index ca3f6790b49637..9e5bd26c5a135d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/nop.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/nop.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly nop.exe{}
+.assembly 'nop'{}
 
 .class public _nop {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/not.il b/src/tests/JIT/IL_Conformance/Old/Base/not.il
index a3642d7fa3e15c..872fb942b0fc74 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/not.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/not.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly not.exe{}
+.assembly 'not'{}
 
 .class public _not {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/or.il b/src/tests/JIT/IL_Conformance/Old/Base/or.il
index 9af0e5d56f4a78..44919e8aa49e99 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/or.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/or.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly or.exe{}
+.assembly 'or'{}
 
 .class public _or {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/pop.il b/src/tests/JIT/IL_Conformance/Old/Base/pop.il
index b2afd00abc90c6..2b88d63a21e0f2 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/pop.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/pop.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly pop.exe{}
+.assembly 'pop'{}
 
 .class public _pop {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/rem.il b/src/tests/JIT/IL_Conformance/Old/Base/rem.il
index 2eaf56eb12198c..d9f460bc1a12ea 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/rem.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/rem.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly rem.exe{}
+.assembly 'rem'{}
 
 .class public _rem {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/ret.il b/src/tests/JIT/IL_Conformance/Old/Base/ret.il
index 375fbd47282a16..3978c54036cc7b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/ret.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/ret.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly ret.exe{}
+.assembly 'ret'{}
 
 .class public _ret {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/shl.il b/src/tests/JIT/IL_Conformance/Old/Base/shl.il
index d66247476c6932..31eabab9165fbe 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/shl.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/shl.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly shl.exe{}
+.assembly 'shl'{}
 
 .class public _shl {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/shr.il b/src/tests/JIT/IL_Conformance/Old/Base/shr.il
index 300cf2aea66642..cdbf9d3e448325 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/shr.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/shr.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly shr.exe{}
+.assembly 'shr'{}
 
 .class public _shr {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/sub.il b/src/tests/JIT/IL_Conformance/Old/Base/sub.il
index 5e16f8ba2e659d..d55144072d9b69 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/sub.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/sub.il
@@ -4,7 +4,7 @@
 .assembly extern legacy library mscorlib {}
 .assembly extern  mscorlib {}
 .assembly extern legacy library mscorlib {}
-.assembly sub.exe{}
+.assembly 'sub'{}
 
 .class public _sub {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/sub_ovf.il b/src/tests/JIT/IL_Conformance/Old/Base/sub_ovf.il
index ad56b1c7e5bcba..58fe0fb98eb651 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/sub_ovf.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/sub_ovf.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly sub_ovf.exe{}
+.assembly sub_ovf{}
 
 .class public sub_ovf {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/switch.il b/src/tests/JIT/IL_Conformance/Old/Base/switch.il
index bc87c1c695816e..bf604abd347940 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/switch.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/switch.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly switch.exe{}
+.assembly 'switch'{}
 
 .class public _switch {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/tailcall.il b/src/tests/JIT/IL_Conformance/Old/Base/tailcall.il
index 5504e3732554e3..4cf2d331335048 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/tailcall.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/tailcall.il
@@ -6,7 +6,7 @@
 .assembly extern legacy library mscorlib { auto }
 
 
-.assembly tailcall.exe{}
+.assembly tailcall{}
 
 .method public static int32 main(string[]) {
 .locals     (class [mscorlib]System.IO.TextWriter,class _tailcall)
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/unaligned.il b/src/tests/JIT/IL_Conformance/Old/Base/unaligned.il
index 301fdbee41372a..edcaca9a4d1f98 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/unaligned.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/unaligned.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly unaligned.exe{
+.assembly unaligned{
 }
 
 .method public static int32 main(class [mscorlib]System.String[]) {
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/volatile.il b/src/tests/JIT/IL_Conformance/Old/Base/volatile.il
index aabb8fda1deb67..934c696ec69c64 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/volatile.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/volatile.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly volatile.exe{}
+.assembly volatile{}
 .class public _volatile
 {
   .field public static native int PTR
diff --git a/src/tests/JIT/IL_Conformance/Old/Base/xor.il b/src/tests/JIT/IL_Conformance/Old/Base/xor.il
index cbd60598762fa4..b6a0dd9bee914f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Base/xor.il
+++ b/src/tests/JIT/IL_Conformance/Old/Base/xor.il
@@ -3,7 +3,7 @@
 
 .assembly extern legacy library mscorlib {}
 
-.assembly xor.exe{}
+.assembly 'xor'{}
 
 .class public _xor {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.il
index 66c7c6c34469ff..17b59c524d6154 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.il
@@ -701,4 +701,4 @@ END:
 }
 }
 
-.assembly Conv_I4.exe{}
+.assembly Conv_I4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8-64.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8-64.il
index 6957d00a283665..afb32986e2a27f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8-64.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8-64.il
@@ -590,4 +590,4 @@ END:
 }
 }
 
-.assembly Conv_I8.exe{}
+.assembly Conv_I8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.il
index 000f2cb1c2b69d..888505ac3089ec 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.il
@@ -586,4 +586,4 @@ END:
 }
 }
 
-.assembly Conv_R4.exe{}
+.assembly Conv_R4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_I4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_I4.il
index 587a7e59f84b4c..e130c00d835c80 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_I4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_I4.il
@@ -275,4 +275,4 @@ FAIL:
 	ret
 }
 }
-.assembly add_I4.exe{}
+.assembly add_I4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_i.il
index 1c8717ec2bf3f5..1ee212adde1db8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_i.il
@@ -40,4 +40,4 @@ FAIL:
 	ret
 }
 }
-.assembly add_i.exe{}
+.assembly add_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_i8.il
index 642a8e8c9538c5..b2db47d81dc244 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_i8.il
@@ -277,4 +277,4 @@ FAIL:
 	ret
 }
 }
-.assembly add_i8.exe{}
+.assembly add_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.il
index 89dced523ba377..de3fbe6eb1c2d4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.il
@@ -416,4 +416,4 @@ END:
 
 
 
-.assembly add_ovf_i1.exe{}
+.assembly add_ovf_i1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.il
index d9b34528d53271..f244e3c24f05df 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.il
@@ -415,4 +415,4 @@ END:
 
 
 
-.assembly add_ovf_i2.exe{}
+.assembly add_ovf_i2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.il
index 662ebc36f7b4b5..3e057e5e2ecbe3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.il
@@ -414,4 +414,4 @@ END:
 }
 
 
-.assembly add_ovf_i4.exe{}
+.assembly add_ovf_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.il
index f7ae9da9d31c9a..1937a243dad499 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.il
@@ -414,4 +414,4 @@ END:
 }
 
 
-.assembly add_ovf_i8.exe{}
+.assembly add_ovf_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.il
index 85a77139a2f4d3..9cbcdd389f1dca 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.il
@@ -320,4 +320,4 @@ END:
 }
 
 
-.assembly add_ovf_u1.exe{}
+.assembly add_ovf_u1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.il
index 679165a905ed14..5b5c9163517379 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.il
@@ -319,4 +319,4 @@ END:
 }
 }
 
-.assembly add_ovf_u2.exe{}
+.assembly add_ovf_u2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.il
index c664c2bae0dd52..7f8fe0565d4551 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.il
@@ -318,4 +318,4 @@ END:
 }
 }
 
-.assembly add_ovf_u4.exe{}
+.assembly add_ovf_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.il
index 35819e49bd55f0..2ffa7768c7161c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.il
@@ -318,4 +318,4 @@ END:
 }
 }
 
-.assembly add_ovf_u8.exe{}
+.assembly add_ovf_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_r4.il
index 8133f39737c5c4..fccd86c0722d82 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_r4.il
@@ -498,4 +498,4 @@ FAIL:
 	ret
 }
 }
-.assembly add_r4.exe{}
+.assembly add_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_r8.il
index 8b2eabb81351c3..7428ab5a8eea44 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/add_r8.il
@@ -500,4 +500,4 @@ FAIL:
 	ret
 }
 }
-.assembly add_r8.exe{}
+.assembly add_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/and_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/and_u4.il
index 6567fb0ce1a824..1239062bc6304a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/and_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/and_u4.il
@@ -108,4 +108,4 @@ FAIL:
 	ret
 }
 }
-.assembly and_u4.exe{}
+.assembly and_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/and_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/and_u8.il
index cb0d9dcad22ab1..40766e28246c27 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/and_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/and_u8.il
@@ -108,4 +108,4 @@ FAIL:
 	ret
 }
 }
-.assembly and_u8.exe{}
+.assembly and_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i.il
index e3eecf01ae4e6d..6f28c6fcf88571 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i.il
@@ -43,4 +43,4 @@ FAIL:
 	ret
 }
 }
-.assembly beq_i.exe{}
+.assembly beq_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.il
index 27fb2f1fdf552d..809b836c6e032c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.il
@@ -265,4 +265,4 @@ FAIL:
 	ret
 }
 }
-.assembly beq_i4.exe{}
+.assembly beq_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.il
index 0a274eb1278b73..1d5c8309c7a232 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.il
@@ -265,4 +265,4 @@ FAIL:
 	ret
 }
 }
-.assembly beq_i8.exe{}
+.assembly beq_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.il
index 3a19785237968c..8033300accac13 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.il
@@ -540,4 +540,4 @@ FAIL:
 	ret
 
 }
-.assembly beq_r4.exe{}
+.assembly beq_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.il
index 0e162d47aa7fec..c001b191276578 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.il
@@ -542,4 +542,4 @@ FAIL:
 	ret
 
 }
-.assembly beq_r8.exe{}
+.assembly beq_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.il
index 63b09e4c8e6e2b..dd8a96b1b3c58c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.il
@@ -307,4 +307,4 @@ FAIL:
 	ret
 }
 }
-.assembly bge_i4.exe{}
+.assembly bge_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.il
index 4168c45044c79e..bce07ae7c39837 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.il
@@ -306,4 +306,4 @@ FAIL:
 	ret
 }
 }
-.assembly bge_i8.exe{}
+.assembly bge_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.il
index eb35e62379408c..aaf63721e013aa 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.il
@@ -596,4 +596,4 @@ FAIL:
 	ret
 
 }
-.assembly bge_r4.exe{}
+.assembly bge_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.il
index 99d7b6007ed431..c3960a929518fa 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.il
@@ -598,4 +598,4 @@ FAIL:
 	ret
 
 }
-.assembly bge_r8.exe{}
+.assembly bge_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_u.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_u.il
index 6b4f2fca1cc676..536a2fb601ada8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_u.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_u.il
@@ -45,4 +45,4 @@ FAIL:
 	ret
 }
 }
-.assembly bge_u.exe{}
+.assembly bge_u{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.il
index f5cd419c864259..399491e13a1c58 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.il
@@ -127,4 +127,4 @@ FAIL:
 	ret
 }
 }
-.assembly bge_un_i4.exe{}
+.assembly bge_un_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.il
index f2186f9e4cf197..f7fd81865a329d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.il
@@ -127,4 +127,4 @@ FAIL:
 	ret
 }
 }
-.assembly bge_un_i8.exe{}
+.assembly bge_un_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.il
index c652ab6766c755..446cd67c8535f3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.il
@@ -1085,4 +1085,4 @@ FAIL:
 	ret
 
 }
-.assembly bge_un_r4.exe{}
+.assembly bge_un_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.il
index 0a4f995fd95e68..92c230619c0d2b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.il
@@ -1085,4 +1085,4 @@ FAIL:
 	ret
 
 }
-.assembly bge_un_r8.exe{}
+.assembly bge_un_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.il
index 888bf068f1f0a0..62e5557e91a995 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.il
@@ -299,4 +299,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_i4.exe{}
+.assembly bgt_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.il
index 611a2bea749e77..32acdd7a1240c9 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.il
@@ -299,4 +299,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_i8.exe{}
+.assembly bgt_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.il
index 246c39a9466786..27ec28fceac797 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.il
@@ -439,4 +439,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_r4.exe{}
+.assembly bgt_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.il
index a4bf075b7de7a8..84f2ad86c0e7c6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.il
@@ -439,4 +439,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_r8.exe{}
+.assembly bgt_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.il
index 7e493ebc4eba9c..922253f3ee268f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.il
@@ -51,4 +51,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_u.exe{}
+.assembly bgt_u{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.il
index 28b917a8c4828d..1cb8b404286091 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.il
@@ -120,4 +120,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_u4.exe{}
+.assembly bgt_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.il
index 785eb79801b146..5e4b4f61f67626 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.il
@@ -120,4 +120,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_u8.exe{}
+.assembly bgt_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.il
index 4b5eed4d97dbff..8216501a26b7c8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.il
@@ -894,4 +894,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_un_r4.exe{}
+.assembly bgt_un_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.il
index e3f46e8509a006..8e597262ad69e5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.il
@@ -894,4 +894,4 @@ FAIL:
 	ret
 }
 }
-.assembly bgt_un_r8.exe{}
+.assembly bgt_un_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.il
index 9dfd1b8ac40165..05b932d2066417 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.il
@@ -311,4 +311,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_i4.exe{}
+.assembly ble_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.il
index 515e012b9d85f7..4c26ba0fad8204 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.il
@@ -311,4 +311,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_i8.exe{}
+.assembly ble_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.il
index c7053cf8e5b21f..c76bd2b9025499 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.il
@@ -475,4 +475,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_r4.exe{}
+.assembly ble_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.il
index 4403a1fb6bbf39..135c2c60c49ce6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.il
@@ -475,4 +475,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_r8.exe{}
+.assembly ble_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u.il
index ac746efe57f8ae..ebc02ad0c571c0 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u.il
@@ -45,4 +45,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_u.exe{}
+.assembly ble_u{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.il
index 3dc5ad97d5b517..ee975b1ec35631 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.il
@@ -127,4 +127,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_u4.exe{}
+.assembly ble_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.il
index 2488e64419ed05..038331a1a01218 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.il
@@ -127,4 +127,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_u8.exe{}
+.assembly ble_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.il
index 82eb0f6c47dfcb..75939de4c972f5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.il
@@ -934,4 +934,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_un_r4.exe{}
+.assembly ble_un_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.il
index 8f83e4de49d8be..f637c9d67d4754 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.il
@@ -934,4 +934,4 @@ FAIL:
 	ret
 }
 }
-.assembly ble_un_r8.exe{}
+.assembly ble_un_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.il
index 748aac387c9630..8a8ef5d844c3be 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.il
@@ -305,4 +305,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_i4.exe{}
+.assembly blt_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.il
index e3b6214de3043b..71f38dba26f132 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.il
@@ -305,4 +305,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_i8.exe{}
+.assembly blt_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.il
index 47cb5979f0c212..502c10f52de10d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.il
@@ -464,4 +464,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_r4.exe{}
+.assembly blt_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.il
index 071ec2ab79fd64..5be61768d71f45 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.il
@@ -464,4 +464,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_r8.exe{}
+.assembly blt_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u.il
index 3b7c62f88178e3..7390d5d1537962 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u.il
@@ -43,4 +43,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_u.exe{}
+.assembly blt_u{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.il
index b4d049f825019e..73707d167372d2 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.il
@@ -124,4 +124,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_u4.exe{}
+.assembly blt_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.il
index a09212935ba6fe..1a735a042547ac 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.il
@@ -124,4 +124,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_u8.exe{}
+.assembly blt_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.il
index 158ef20b8bbb2d..a9392345033803 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.il
@@ -904,4 +904,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_un_r4.exe{}
+.assembly blt_un_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.il
index 514e66222ef4d7..a2147ad0c16da7 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.il
@@ -904,4 +904,4 @@ FAIL:
 	ret
 }
 }
-.assembly blt_un_r8.exe{}
+.assembly blt_un_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u.il
index 795cc50aaa1a77..d62bc21b0dec11 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u.il
@@ -44,4 +44,4 @@ FAIL:
 	ret
 }
 }
-.assembly bne_u.exe{}
+.assembly bne_u{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.il
index 3a7c95d35e5be0..72e076a7e549b4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.il
@@ -128,4 +128,4 @@ FAIL:
 	ret
 }
 }
-.assembly bne_u4.exe{}
+.assembly bne_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.il
index 49e36ab035de3f..f8112f39f71190 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.il
@@ -129,4 +129,4 @@ FAIL:
 	ret
 }
 }
-.assembly bne_u8.exe{}
+.assembly bne_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.il
index 3e5d97c61d3df8..ea2a8116338790 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.il
@@ -1000,4 +1000,4 @@ FAIL:
 	ret
 }
 }
-.assembly bne_un_r4.exe{}
+.assembly bne_un_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.il
index 1f0c535d102b6f..21878fc218354e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.il
@@ -1000,4 +1000,4 @@ FAIL:
 	ret
 }
 }
-.assembly bne_un_r8.exe{}
+.assembly bne_un_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/br.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/br.il
index 030611824a7c85..0d418137523ec9 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/br.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/br.il
@@ -91,4 +91,4 @@ FAIL:
 	ret
 }
 }
-.assembly br.exe{}
+.assembly 'br'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/brfalse.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/brfalse.il
index 820b8b4d49b0c5..4109c4f0e7d4ff 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/brfalse.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/brfalse.il
@@ -137,4 +137,4 @@ FAIL:
 
 }
 }
-.assembly brfalse.exe{}
+.assembly 'brfalse'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/brtrue.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/brtrue.il
index 440bd8b43975ab..2273ee54016fbf 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/brtrue.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/brtrue.il
@@ -145,4 +145,4 @@ FAIL:
 
 }
 }
-.assembly brtrue.exe{}
+.assembly 'brtrue'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_br.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_br.il
index 68a72ed261e12c..fe79a88893ecbf 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_br.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_br.il
@@ -93,4 +93,4 @@ FAIL:
         ret
 }
 }
-.assembly c_br.exe {}
+.assembly c_br {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.il
index 9aa6605e35dbd9..e4e83d4084f46e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.il
@@ -139,4 +139,4 @@ FAIL:
 
 }
 }
-.assembly c_brfalse.exe {}
+.assembly c_brfalse {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.il
index 69173398e9015f..46ca634ee96c9e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.il
@@ -147,4 +147,4 @@ FAIL:
 
 }
 }
-.assembly c_brtrue.exe {}
+.assembly c_brtrue {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_call.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_call.il
index 68f359a47530cc..7268c77a9703fd 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_call.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_call.il
@@ -28,6 +28,6 @@ FAIL:
 }
 
 
-.assembly c_call.exe{}
+.assembly c_call{}
 
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.il
index b8f2a94048eed9..5de65a906ca63c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.il
@@ -78,5 +78,5 @@ END:
 }
 
 
-.assembly c_cpblk.exe {}
+.assembly c_cpblk {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.il
index 9d61ee79a13bf3..521e636d024be6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.il
@@ -44,5 +44,5 @@ END:
 }
 
 
-.assembly c_initblk.exe {}
+.assembly c_initblk {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.il
index 7d022962c1a59e..b5fd70de208dbf 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.il
@@ -23,4 +23,4 @@ FAIL:
     ret
 }
 }
-.assembly c_ldvirtftn.exe {}
+.assembly c_ldvirtftn {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.il
index 0e19d23ce6828e..b76ebced02aca8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.il
@@ -110,4 +110,4 @@ FAIL:
 
 }
 }
-.assembly c_localloc.exe {}
+.assembly c_localloc {}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_nop.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_nop.il
index 7e4bc0e3a2ae3d..0ff4997012e673 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_nop.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_nop.il
@@ -68,5 +68,5 @@ END:
 }
 
 
-.assembly c_nop.exe {}
+.assembly c_nop {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_ret.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_ret.il
index 757e53c5181c3e..60c33975885d4f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_ret.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_ret.il
@@ -44,5 +44,5 @@ END:
 }
 
 
-.assembly c_ret.exe {}
+.assembly c_ret {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_switch.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_switch.il
index 173d01dd5fa03c..5e52c8b3067083 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_switch.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/c_switch.il
@@ -75,5 +75,5 @@ END:
 }
 
 
-.assembly c_switch.exe {}
+.assembly c_switch {}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/call.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/call.il
index 907eec03fd7a7c..6b8627efed0db6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/call.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/call.il
@@ -29,4 +29,4 @@ FAIL:
 
 
 
-.assembly call.exe{}
+.assembly 'call'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.il
index 68703efde59200..b496358943f25c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.il
@@ -44,4 +44,4 @@ FAIL:
 	ret
 }
 }
-.assembly ceq_i.exe{}
+.assembly ceq_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.il
index 503ab4ec1e71ca..dae8ee7b2780c6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.il
@@ -295,4 +295,4 @@ FAIL:
 	ret
 }
 }
-.assembly ceq_i4.exe{}
+.assembly ceq_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.il
index bd8ab1677a2b4f..b9608bbfbbd329 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.il
@@ -296,4 +296,4 @@ FAIL:
 	ret
 }
 }
-.assembly ceq_i8.exe{}
+.assembly ceq_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.il
index 85afd75d76ec35..a4b56d869a7835 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.il
@@ -454,4 +454,4 @@ FAIL:
 }
 }
 
-.assembly ceq_r4.exe{}
+.assembly ceq_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.il
index b7c2558336d4b6..3a3229085a7280 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.il
@@ -453,4 +453,4 @@ FAIL:
 	ret
 }
 }
-.assembly ceq_r8.exe{}
+.assembly ceq_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.il
index 4b6de4d97b6f0b..8499cf3a0cc592 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.il
@@ -295,4 +295,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_i4.exe{}
+.assembly cgt_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.il
index 219ce1b30a311f..3df1c56f9579e1 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.il
@@ -293,4 +293,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_i8.exe{}
+.assembly cgt_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.il
index d6dbe06847802a..63f2c19edf5206 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.il
@@ -453,4 +453,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_r4.exe{}
+.assembly cgt_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.il
index 42cb35f968f707..4cf3d457fd47e4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.il
@@ -452,4 +452,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_r8.exe{}
+.assembly cgt_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.il
index fb85e8d1b50f2a..b25026594555cd 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.il
@@ -44,4 +44,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_u.exe{}
+.assembly cgt_u{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.il
index c1b0ac663f00a4..872819737c0021 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.il
@@ -113,4 +113,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_u4.exe{}
+.assembly cgt_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.il
index 73e67336a2c322..1fafa254280f26 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.il
@@ -113,4 +113,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_u8.exe{}
+.assembly cgt_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.il
index 1551d49e11749b..03c0392f1b9221 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.il
@@ -869,4 +869,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_un_r4.exe{}
+.assembly cgt_un_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.il
index fa5d1b315a574d..ba0653164221f7 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.il
@@ -870,4 +870,4 @@ FAIL:
 	ret
 }
 }
-.assembly cgt_un_r8.exe{}
+.assembly cgt_un_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.il
index a7acb3a9d40128..61c3ba1813a247 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.il
@@ -108,4 +108,4 @@ END:
 }
 }
 
-.assembly ckfinite_r4.exe{}
+.assembly ckfinite_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.il
index 83d57611c69e2e..31deedab008113 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.il
@@ -109,4 +109,4 @@ END:
 }
 }
 
-.assembly ckfinite_r8.exe{}
+.assembly ckfinite_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.il
index 1087ab07aad134..5edec385d4cb95 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.il
@@ -295,4 +295,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_i4.exe{}
+.assembly clt_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.il
index bb23cf3a648968..677eab292f4e25 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.il
@@ -294,4 +294,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_i8.exe{}
+.assembly clt_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.il
index 4521767704d784..a80c4b544731db 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.il
@@ -451,4 +451,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_r4.exe{}
+.assembly clt_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.il
index 00cd5713dde817..cde223f9e91155 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.il
@@ -449,4 +449,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_r8.exe{}
+.assembly clt_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u.il
index 9204dd53d42649..917abe74364571 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u.il
@@ -43,4 +43,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_u.exe{}
+.assembly clt_u{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.il
index 6fa44f8fd61acb..95cce5349068e4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.il
@@ -110,4 +110,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_u4.exe{}
+.assembly clt_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.il
index 05c3dff53ed741..cbd920209bd567 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.il
@@ -111,4 +111,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_u8.exe{}
+.assembly clt_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.il
index 91b57cc74d2810..bcc35afa65e61b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.il
@@ -868,4 +868,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_un_r4.exe{}
+.assembly clt_un_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.il
index 9187df14d7f5d4..10e93b98995a04 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.il
@@ -862,4 +862,4 @@ FAIL:
 	ret
 }
 }
-.assembly clt_un_r8.exe{}
+.assembly clt_un_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.il
index e031f518fef7e8..ef8a3bebde94df 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.il
@@ -208,4 +208,4 @@ END:
 
 
 
-.assembly conv_ovf_i4_i1.exe{}
+.assembly conv_ovf_i4_i1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.il
index e78ce2470b461f..c87f5eca9c0c5a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.il
@@ -199,4 +199,4 @@ END:
 
 
 
-.assembly conv_ovf_i4_i2.exe{}
+.assembly conv_ovf_i4_i2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.il
index 386b0f48521be4..8eefbaa89a527a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.il
@@ -166,4 +166,4 @@ END:
 }
 }
 
-.assembly conv_ovf_i4_u4.exe{}
+.assembly conv_ovf_i4_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.il
index ba0f2c1ed9c1db..67759e9c24aef4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.il
@@ -212,4 +212,4 @@ END:
 
 
 
-.assembly conv_ovf_i8_i.exe{}
+.assembly conv_ovf_i8_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.il
index a75254f8707551..06037620e65a35 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.il
@@ -200,4 +200,4 @@ END:
 
 
 
-.assembly conv_ovf_i8_i4.exe{}
+.assembly conv_ovf_i8_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.il
index 2ae12ad9178a17..fe7bc1810312f5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.il
@@ -165,4 +165,4 @@ END:
 }
 }
 
-.assembly conv_ovf_i8_u8.exe{}
+.assembly conv_ovf_i8_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.il
index 43910c8da394dd..031cd717af798c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.il
@@ -232,4 +232,4 @@ END:
 }
 
 
-.assembly conv_ovf_r8_i.exe{}
+.assembly conv_ovf_r8_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.il
index 9b3ca53ec313e2..17ac8c7bfd8eeb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.il
@@ -232,4 +232,4 @@ END:
 }
 
 
-.assembly conv_ovf_r8_i4.exe{}
+.assembly conv_ovf_r8_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.il
index 9658c033b272e4..7057d5e3e1dfab 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.il
@@ -228,4 +228,4 @@ END:
 }
 }
 
-.assembly conv_ovf_r8_i8.exe{}
+.assembly conv_ovf_r8_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.il
index 52317186be8055..de332f73dd82f9 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.il
@@ -167,4 +167,4 @@ END:
 }
 }
 
-.assembly conv_ovf_u4_i.exe{}
+.assembly conv_ovf_u4_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.il
index 53fb2e640339b7..eea6ee5e1bb0fb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.il
@@ -167,4 +167,4 @@ END:
 }
 }
 
-.assembly conv_ovf_u4_i4.exe{}
+.assembly conv_ovf_u4_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.il
index bacbf2c7ead7c1..783d8714d50293 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.il
@@ -150,4 +150,4 @@ END:
 
 
 
-.assembly conv_ovf_u4_u1.exe{}
+.assembly conv_ovf_u4_u1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.il
index 2a85eb66b88d71..3382a22f7c4a3d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.il
@@ -148,4 +148,4 @@ END:
 }
 }
 
-.assembly conv_ovf_u4_u2.exe{}
+.assembly conv_ovf_u4_u2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.il
index dc5caf1bddf39f..6cc437db3a263b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.il
@@ -177,4 +177,4 @@ END:
 }
 }
 
-.assembly conv_ovf_u8_i8.exe{}
+.assembly conv_ovf_u8_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.il
index f2d0944abbbb97..7d4054de26bdd0 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.il
@@ -159,4 +159,4 @@ END:
 }
 }
 
-.assembly conv_ovf_u8_u4.exe{}
+.assembly conv_ovf_u8_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cpblk.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cpblk.il
index 8deb42886e0ac6..522b3dadf50854 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cpblk.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/cpblk.il
@@ -78,4 +78,4 @@ END:
 
 
 
-.assembly cpblk.exe{}
+.assembly 'cpblk'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_i4.il
index f93fe9badd807f..39c10cf707efae 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_i4.il
@@ -356,4 +356,4 @@ FAIL:
 	ret
 }
 }
-.assembly div_i4.exe{}
+.assembly div_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_i8.il
index 6a12cb443c3311..04ab7b10c797d7 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_i8.il
@@ -356,4 +356,4 @@ FAIL:
 	ret
 }
 }
-.assembly div_i8.exe{}
+.assembly div_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il
index 6d4b405b970f95..3b1a9c85999a17 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r4.il
@@ -600,4 +600,4 @@ FAIL:
 	ret
 }
 }
-.assembly div_r4.exe{}
+.assembly div_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il
index dca91a23ddb897..bbdea0fad0a20a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_r8.il
@@ -604,4 +604,4 @@ FAIL:
 	ret
 }
 }
-.assembly div_r8.exe{}
+.assembly div_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_u4.il
index da36bdcd9fc366..201d2e22f7180f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_u4.il
@@ -266,4 +266,4 @@ FAIL:
 	ret
 }
 }
-.assembly div_u4.exe{}
+.assembly div_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_u8.il
index f67a35dfbe9f9e..e83c5fb85ac2c8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/div_u8.il
@@ -266,4 +266,4 @@ FAIL:
 	ret
 }
 }
-.assembly div_u8.exe{}
+.assembly div_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dup4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dup4.il
index 2ff393bfb4a693..f5129d1fbf23b5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dup4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dup4.il
@@ -53,4 +53,4 @@ FAIL:
 	ret
 }
 }
-.assembly dup4.exe{}
+.assembly dup4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dup8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dup8.il
index 4079d4787d6542..1694af97208c68 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dup8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dup8.il
@@ -52,4 +52,4 @@ FAIL:
 	ret
 }
 }
-.assembly dup8.exe{}
+.assembly dup8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dupi.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dupi.il
index 8c80618e7c0b47..7cb49334a71801 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dupi.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/dupi.il
@@ -25,4 +25,4 @@ FAIL:
 	ret
 }
 }
-.assembly dupi.exe{}
+.assembly dupi{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/initblk.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/initblk.il
index 14ebe7dd1e5430..a08617a801eab8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/initblk.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/initblk.il
@@ -43,4 +43,4 @@ END:
 
 
 
-.assembly initblk.exe{}
+.assembly 'initblk'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.il
index 5f5f4a7a5134ed..d3e71465ac9134 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.il
@@ -37,4 +37,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarg_i.exe{}
+.assembly ldarg_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.il
index 656968a7b00b26..354e96e101b822 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.il
@@ -56,4 +56,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarg_i4.exe{}
+.assembly ldarg_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.il
index 4a20edbac5d32f..d942f2922d7e0c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.il
@@ -56,4 +56,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarg_i8.exe{}
+.assembly ldarg_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.il
index dd4299016969b9..59e546cca4e17b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.il
@@ -66,4 +66,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarg_r4.exe{}
+.assembly ldarg_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.il
index 5fdd33a1ccf907..35108d5fe19f83 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.il
@@ -67,4 +67,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarg_r8.exe{}
+.assembly ldarg_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.il
index e201e707d87ecb..6f9bb379548eeb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.il
@@ -40,4 +40,4 @@ FAIL:
 }
 }
 
-.assembly ldarg_ref.exe{}
+.assembly ldarg_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.il
index a67f2ebddf685d..f386d4c1968210 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.il
@@ -39,4 +39,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarga_i.exe{}
+.assembly ldarga_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.il
index 00e0d6e9bc6c02..225edaa4a957c9 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.il
@@ -57,4 +57,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarga_i4.exe{}
+.assembly ldarga_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.il
index e928f610506128..be57713bc04f43 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.il
@@ -57,4 +57,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarga_i8.exe{}
+.assembly ldarga_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.il
index 91b562262f6a89..d7fbc317c428c5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.il
@@ -68,4 +68,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarga_r4.exe{}
+.assembly ldarga_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.il
index 3f2db7a6ac88d0..809bb7e5732203 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.il
@@ -69,4 +69,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldarga_r8.exe{}
+.assembly ldarga_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.il
index d3b0d588df2f00..495d1a87c80995 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.il
@@ -40,4 +40,4 @@ FAIL:
 }
 }
 
-.assembly ldarga_ref.exe{}
+.assembly ldarga_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.il
index 7409bcaac59f02..d7366bf261d772 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.il
@@ -2124,5 +2124,5 @@ END:
 
 
 
-.assembly ldc_add_ovf_i1.exe{}
+.assembly ldc_add_ovf_i1{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.il
index 920d66e2e81f54..530728b03b05ad 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.il
@@ -2123,5 +2123,5 @@ END:
 
 
 
-.assembly ldc_add_ovf_i2.exe{}
+.assembly ldc_add_ovf_i2{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.il
index b09a1098590540..5b249ceef5449a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.il
@@ -2122,5 +2122,5 @@ END:
 }
 
 
-.assembly ldc_add_ovf_i4.exe{}
+.assembly ldc_add_ovf_i4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.il
index 95f5143ec5ff88..6bd3a706a67992 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.il
@@ -2122,5 +2122,5 @@ END:
 }
 
 
-.assembly ldc_add_ovf_i8.exe{}
+.assembly ldc_add_ovf_i8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.il
index aba34891aad438..3efa33a71fb6f0 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.il
@@ -1572,5 +1572,5 @@ END:
 }
 
 
-.assembly ldc_add_ovf_u1.exe{}
+.assembly ldc_add_ovf_u1{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.il
index 457987df67df8e..b3eab39b7e3b33 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.il
@@ -1571,5 +1571,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_add_ovf_u2.exe{}
+.assembly ldc_add_ovf_u2{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.il
index 0cf2f157c3f731..cf4cece8590393 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.il
@@ -1535,5 +1535,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_add_ovf_u4.exe{}
+.assembly ldc_add_ovf_u4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.il
index 380c845e1be3e0..dabcc80cdfef8b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.il
@@ -1571,5 +1571,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_add_ovf_u8.exe{}
+.assembly ldc_add_ovf_u8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.il
index 75ddc66e5b8293..813cd7e3d440da 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.il
@@ -103,6 +103,6 @@ END:
 }
 
 
-.assembly ldc_c_cpblk.exe {}
+.assembly ldc_c_cpblk {}
 
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.il
index e6949725ec391b..5f166afd5381eb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.il
@@ -64,6 +64,6 @@ END:
 }
 
 
-.assembly ldc_c_initblk.exe {}
+.assembly ldc_c_initblk {}
 
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.il
index fc8d96efd65e61..d0a1745046e6d9 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.il
@@ -91,6 +91,6 @@ END:
 }
 
 
-.assembly ldc_c_nop.exe {}
+.assembly ldc_c_nop {}
 
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.il
index fa5cebb562c2d4..b563463aaf58e0 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.il
@@ -93,6 +93,6 @@ END:
 }
 
 
-.assembly ldc_c_ret.exe {}
+.assembly ldc_c_ret {}
 
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.il
index 9538a8f3905502..e12457f028fc0a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.il
@@ -115,6 +115,6 @@ END:
 }
 
 
-.assembly ldc_c_switch.exe {}
+.assembly ldc_c_switch {}
 
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.il
index 2f2f94b711e66b..987ff785fb49af 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.il
@@ -404,5 +404,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_ckfinite_r4.exe{}
+.assembly ldc_ckfinite_r4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.il
index 707e75ad89cd6f..43f42b11e5e6e3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.il
@@ -422,5 +422,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_ckfinite_r8.exe{}
+.assembly ldc_ckfinite_r8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.il
index 70eaff93e77803..984f925e4c4511 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.il
@@ -1679,5 +1679,5 @@ END:
 
 
 
-.assembly ldc_conv_ovf_i4_i1.exe{}
+.assembly ldc_conv_ovf_i4_i1{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.il
index fddd00064dc4e0..d8d1c2bde3d2c0 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.il
@@ -1600,5 +1600,5 @@ END:
 
 
 
-.assembly ldc_conv_ovf_i4_i2.exe{}
+.assembly ldc_conv_ovf_i4_i2{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.il
index ac9ebd628d78d0..521b685e3591b2 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.il
@@ -1161,5 +1161,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_conv_ovf_i4_u4.exe{}
+.assembly ldc_conv_ovf_i4_u4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.il
index 60633572b57903..296454da880e13 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.il
@@ -1639,5 +1639,5 @@ END:
 
 
 
-.assembly ldc_conv_ovf_i8_i4.exe{}
+.assembly ldc_conv_ovf_i8_i4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.il
index e4d27570d3da92..8cf31a078be24e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.il
@@ -1135,5 +1135,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_conv_ovf_i8_u8.exe{}
+.assembly ldc_conv_ovf_i8_u8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.il
index 3b16ee175c100c..63883afdfac4ea 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.il
@@ -2115,5 +2115,5 @@ END:
 }
 
 
-.assembly ldc_conv_ovf_r8_i.exe{}
+.assembly ldc_conv_ovf_r8_i{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.il
index 1084ff304b0540..9189ab3efd4710 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.il
@@ -2115,5 +2115,5 @@ END:
 }
 
 
-.assembly ldc_conv_ovf_r8_i4.exe{}
+.assembly ldc_conv_ovf_r8_i4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.il
index 78cade08735255..e16bcf5e59db3d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.il
@@ -2073,5 +2073,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_conv_ovf_r8_i8.exe{}
+.assembly ldc_conv_ovf_r8_i8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.il
index edeae291984fab..141d17891aa175 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.il
@@ -1242,5 +1242,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_conv_ovf_u4_i.exe{}
+.assembly ldc_conv_ovf_u4_i{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.il
index 4bfdd3d7eb3b85..bb6dd2b216c846 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.il
@@ -1242,5 +1242,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_conv_ovf_u4_i4.exe{}
+.assembly ldc_conv_ovf_u4_i4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.il
index 58ddf8692fb508..e131abc2167c0f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.il
@@ -675,5 +675,5 @@ END:
 
 
 
-.assembly ldc_conv_ovf_u4_u1.exe{}
+.assembly ldc_conv_ovf_u4_u1{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.il
index 0ff5820b430f79..beee7b396a538d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.il
@@ -673,5 +673,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_conv_ovf_u4_u2.exe{}
+.assembly ldc_conv_ovf_u4_u2{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.il
index f3f21db2252171..067ec892a39b1e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.il
@@ -1294,5 +1294,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_conv_ovf_u8_i8.exe{}
+.assembly ldc_conv_ovf_u8_i8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.il
index b4b45f0ff07e95..681511668880c1 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.il
@@ -826,5 +826,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_conv_ovf_u8_u4.exe{}
+.assembly ldc_conv_ovf_u8_u4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.il
index 25c3f8e7e8e8a2..00ea4df24f2ceb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.il
@@ -64,4 +64,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldc_i4.exe{}
+.assembly ldc_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.il
index 99da9a4b9ac812..4c5115be3dbb56 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.il
@@ -67,4 +67,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldc_i8.exe{}
+.assembly ldc_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.il
index f29812347d7415..4e9b5bb29a1ae5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.il
@@ -2047,5 +2047,5 @@ END:
 
 
 
-.assembly ldc_mul_ovf_i1.exe{}
+.assembly ldc_mul_ovf_i1{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.il
index feac23a08dc1cc..e1c4dfd524a6f8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.il
@@ -1878,5 +1878,5 @@ END:
 }
 
 
-.assembly ldc_mul_ovf_i2.exe{}
+.assembly ldc_mul_ovf_i2{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.il
index 010542fb8c87d8..4ceb07aeb7992e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.il
@@ -1877,5 +1877,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_mul_ovf_i4.exe{}
+.assembly ldc_mul_ovf_i4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.il
index 9f41516f800a85..260260fef2269c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.il
@@ -1877,5 +1877,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_mul_ovf_i8.exe{}
+.assembly ldc_mul_ovf_i8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.il
index 3769be4bd60c22..62daf408248cc4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.il
@@ -1392,5 +1392,5 @@ END:
 }
 
 
-.assembly ldc_mul_ovf_u1.exe{}
+.assembly ldc_mul_ovf_u1{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.il
index ef0e007f8f3a7d..8aec6f19fb1fd8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.il
@@ -1391,5 +1391,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_mul_ovf_u2.exe{}
+.assembly ldc_mul_ovf_u2{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.il
index be88d0e1c3d4a2..9cb97759671154 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.il
@@ -1391,5 +1391,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_mul_ovf_u4.exe{}
+.assembly ldc_mul_ovf_u4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.il
index 68f0283a131dde..754167a39abd06 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.il
@@ -1391,5 +1391,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_mul_ovf_u8.exe{}
+.assembly ldc_mul_ovf_u8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.il
index 92897825a6890b..99b1c4f3190b42 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.il
@@ -183,5 +183,5 @@ END:
 
 
 
-.assembly ldc_neg_i4.exe{}
+.assembly ldc_neg_i4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.il
index cac0b83fab3ffc..71eaee1cf39e1b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.il
@@ -181,5 +181,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_neg_i8.exe{}
+.assembly ldc_neg_i8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.il
index 535f812855c5a9..c9132d8dbf9fb8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.il
@@ -60,4 +60,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldc_r4.exe{}
+.assembly ldc_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.il
index 417663e839be2c..648a0c37b91c08 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.il
@@ -58,4 +58,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldc_r8.exe{}
+.assembly ldc_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.il
index 672391543751f7..193e6f68cdee90 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.il
@@ -68,5 +68,5 @@ END:
 
 
 
-.assembly ldc_ret_i.exe{}
+.assembly ldc_ret_i{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.il
index 9beb8ab5207d33..563d07e86ee144 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.il
@@ -150,5 +150,5 @@ END:
 
 
 
-.assembly ldc_ret_i4.exe{}
+.assembly ldc_ret_i4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.il
index c4aa499721b942..a64961699efc21 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.il
@@ -148,5 +148,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_ret_i8.exe{}
+.assembly ldc_ret_i8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.il
index 716e1fce4a4617..3eb10380067c14 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.il
@@ -176,5 +176,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_ret_r4.exe{}
+.assembly ldc_ret_r4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.il
index 3548d9eb25a5b4..296d48008d6b4b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.il
@@ -177,5 +177,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_ret_r8.exe{}
+.assembly ldc_ret_r8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.il
index 3d33f92f2b0b3a..1aa958d1593031 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.il
@@ -128,5 +128,5 @@ END:
 
 
 
-.assembly ldc_ret_ref.exe{}
+.assembly ldc_ret_ref{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.il
index ccdea51bc64234..08a2a8642d092e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.il
@@ -59,5 +59,5 @@ END:
 
 
 
-.assembly ldc_sub_i.exe{}
+.assembly ldc_sub_i{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.il
index cf031d7d481327..337ab90dbefc25 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.il
@@ -2023,5 +2023,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_sub_ovf_i1.exe{}
+.assembly ldc_sub_ovf_i1{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.il
index 652fb4eeb5548a..67fa23b3cee9d2 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.il
@@ -2024,5 +2024,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_sub_ovf_i2.exe{}
+.assembly ldc_sub_ovf_i2{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.il
index f1fa4b0ebf07c4..038072b12285d6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.il
@@ -2024,5 +2024,5 @@ END:
 }
 
 
-.assembly ldc_sub_ovf_i4.exe{}
+.assembly ldc_sub_ovf_i4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.il
index 79b7475f9bbc63..ba2e538727574e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.il
@@ -2023,5 +2023,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_sub_ovf_i8.exe{}
+.assembly ldc_sub_ovf_i8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.il
index 6c688d6c266f02..2934fbf6877e01 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.il
@@ -1501,5 +1501,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_sub_ovf_u1.exe{}
+.assembly ldc_sub_ovf_u1{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.il
index 50bed0d62b26a1..16d0f45dafd1dd 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.il
@@ -1501,5 +1501,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_sub_ovf_u2.exe{}
+.assembly ldc_sub_ovf_u2{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.il
index 0a7180a9d9116b..440acc70f2f279 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.il
@@ -1500,5 +1500,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_sub_ovf_u4.exe{}
+.assembly ldc_sub_ovf_u4{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.il
index 46a5d5709dec77..a80274e1946bd3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.il
@@ -1501,5 +1501,5 @@ END:
 //---- EOF ------------------
 }
 
-.assembly ldc_sub_ovf_u8.exe{}
+.assembly ldc_sub_ovf_u8{}
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldftn.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldftn.il
index aa8e2b68810aa0..95ae741603a81b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldftn.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldftn.il
@@ -45,4 +45,4 @@ FAIL:
     ret
 }
 }
-.assembly ldftn.exe{}
+.assembly 'ldftn'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.il
index ebbb597779ef53..e69dcec8bc267b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.il
@@ -79,4 +79,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_i.exe{}
+.assembly ldind_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.il
index 696d492cf71edf..3a1eb06112ef73 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.il
@@ -54,4 +54,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_i1.exe{}
+.assembly ldind_i1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.il
index 3a005c20178015..b841a8d7550268 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.il
@@ -54,4 +54,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_i2.exe{}
+.assembly ldind_i2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.il
index 6777e39628c547..111014fae797fe 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.il
@@ -60,4 +60,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_i4.exe{}
+.assembly ldind_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.il
index 53b649d18e122a..c982b260fe5a5c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.il
@@ -74,4 +74,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_i8.exe{}
+.assembly ldind_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.il
index 2e353640ec2758..b07d7e0931f2c3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.il
@@ -75,4 +75,4 @@ FAIL:
 }
 }
 
-.assembly ldind_r4.exe{}
+.assembly ldind_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.il
index 66707d04e3c9d6..925a4bcb01e1a8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.il
@@ -77,4 +77,4 @@ FAIL:
 }
 }
 
-.assembly ldind_r8.exe{}
+.assembly ldind_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.il
index 8049a84d09d33b..f023314e7e1d62 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.il
@@ -28,4 +28,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_ref.exe{}
+.assembly ldind_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.il
index 46d4ace65264de..a04505b493ba1f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.il
@@ -54,4 +54,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_u1.exe{}
+.assembly ldind_u1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.il
index 4f7bda53609878..f2e06b9f2a1396 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.il
@@ -55,4 +55,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_u2.exe{}
+.assembly ldind_u2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.il
index ae29a238414431..3be34a3c4c9fe6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.il
@@ -58,4 +58,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldind_u4.exe{}
+.assembly ldind_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.il
index b180cb7c12ab96..fee7a4769260db 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.il
@@ -27,4 +27,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldloc_i.exe{}
+.assembly ldloc_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.il
index 8af5afcd431429..cc3cf972e3a4ee 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.il
@@ -77,4 +77,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldloc_i4.exe{}
+.assembly ldloc_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.il
index 5aefe29570f707..682bd19e47c9b0 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.il
@@ -74,4 +74,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldloc_i8.exe{}
+.assembly ldloc_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.il
index 3a800c29fff13f..e5b876c47a9cb8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.il
@@ -53,4 +53,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldloc_r4.exe{}
+.assembly ldloc_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.il
index d44ca9466b877e..b8e58c09eb8376 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.il
@@ -56,4 +56,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldloc_r8.exe{}
+.assembly ldloc_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.il
index abc313672e08ab..e2996b13acc6de 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.il
@@ -27,4 +27,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldloc_ref.exe{}
+.assembly ldloc_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.il
index 7bf162f1c5a5fc..fe237b90be2bc6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.il
@@ -17,4 +17,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldnull_i.exe{}
+.assembly ldnull_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.il
index ca4952f8538bb7..941680233920e8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.il
@@ -26,4 +26,4 @@ FAIL:
 	ret
 }
 }
-.assembly ldnull_ref.exe{}
+.assembly ldnull_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.il
index 322e6b111775f7..9c7cd469c1fd1a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.il
@@ -22,4 +22,4 @@ FAIL:
     ret
 }
 }
-.assembly ldvirtftn.exe{}
+.assembly 'ldvirtftn'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/localloc.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/localloc.il
index d075e0e26171e7..a7943ef2008b08 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/localloc.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/localloc.il
@@ -108,4 +108,4 @@ FAIL:
 
 }
 }
-.assembly localloc.exe{}
+.assembly 'localloc'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.il
index b24522bcdb6675..143d4d4b7be76b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.il
@@ -276,4 +276,4 @@ FAIL:
 	ret
 }
 }
-.assembly mul_i4.exe{}
+.assembly mul_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.il
index 1a4ba03f4d665f..5b81f1c2cfd71f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.il
@@ -276,4 +276,4 @@ FAIL:
 	ret
 }
 }
-.assembly mul_i8.exe{}
+.assembly mul_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.il
index beeb4b0cf39d61..8c3a4c33d82f13 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.il
@@ -525,4 +525,4 @@ END:
 
 
 
-.assembly mul_ovf_i1.exe{}
+.assembly mul_ovf_i1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.il
index 3a9c52c48a0a5f..d6cab0117cda5c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.il
@@ -362,4 +362,4 @@ END:
 }
 
 
-.assembly mul_ovf_i2.exe{}
+.assembly mul_ovf_i2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.il
index a9958813d97cf1..0d70d01f680b8a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.il
@@ -360,4 +360,4 @@ END:
 }
 }
 
-.assembly mul_ovf_i4.exe{}
+.assembly mul_ovf_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.il
index e3dad8fb5714e5..0b972239bc9f53 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.il
@@ -360,4 +360,4 @@ END:
 }
 }
 
-.assembly mul_ovf_i8.exe{}
+.assembly mul_ovf_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.il
index f2a6b6d31e4d4f..15bfd4163ae567 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.il
@@ -280,4 +280,4 @@ END:
 }
 
 
-.assembly mul_ovf_u1.exe{}
+.assembly mul_ovf_u1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.il
index ebf9bdb77a9ccd..dc97608e7739c3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.il
@@ -279,4 +279,4 @@ END:
 }
 }
 
-.assembly mul_ovf_u2.exe{}
+.assembly mul_ovf_u2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.il
index 300d7eb616218c..45096ba92f1470 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.il
@@ -278,4 +278,4 @@ END:
 }
 }
 
-.assembly mul_ovf_u4.exe{}
+.assembly mul_ovf_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.il
index 663b568e650550..2431c4e1663d16 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.il
@@ -278,4 +278,4 @@ END:
 }
 }
 
-.assembly mul_ovf_u8.exe{}
+.assembly mul_ovf_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.il
index 9ed1faee0671d7..76c8ef744992b4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.il
@@ -589,4 +589,4 @@ FAIL:
 	ret
 }
 }
-.assembly mul_r4.exe{}
+.assembly mul_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.il
index 93e92b6d31cd15..b03e8517308a84 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.il
@@ -590,4 +590,4 @@ FAIL:
 	ret
 }
 }
-.assembly mul_r8.exe{}
+.assembly mul_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.il
index e4c7940a23fadf..7764da506cf930 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.il
@@ -81,4 +81,4 @@ END:
 
 
 
-.assembly neg_i4.exe{}
+.assembly neg_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.il
index a30d70531350a2..dacfb76f54262b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.il
@@ -79,4 +79,4 @@ END:
 }
 }
 
-.assembly neg_i8.exe{}
+.assembly neg_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/nop.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/nop.il
index b6f9ed6a55468e..047c7f0d108659 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/nop.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/nop.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly nop.exe{}
+.assembly 'nop'{}
 
 .class public		_nop {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/not_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/not_u4.il
index 0b567a1b5dae36..5ab5ba02124ea3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/not_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/not_u4.il
@@ -60,4 +60,4 @@ FAIL:
 	ret
 }
 }
-.assembly not_u4.exe{}
+.assembly not_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/not_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/not_u8.il
index 61985328ea113b..aa89c09deba757 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/not_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/not_u8.il
@@ -60,4 +60,4 @@ FAIL:
 	ret
 }
 }
-.assembly not_u8.exe{}
+.assembly not_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/or_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/or_u4.il
index 0453cf3b4ebe7d..48ea53d24c49af 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/or_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/or_u4.il
@@ -240,4 +240,4 @@ FAIL:
 	ret
 }
 }
-.assembly or_u4.exe{}
+.assembly or_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/or_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/or_u8.il
index 4f9ade07b0ffa7..2dff8fc39660fe 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/or_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/or_u8.il
@@ -240,4 +240,4 @@ FAIL:
 	ret
 }
 }
-.assembly or_u8.exe{}
+.assembly or_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/pop4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/pop4.il
index 8406f3cdfdfb04..62bbe7a23c5d6a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/pop4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/pop4.il
@@ -45,4 +45,4 @@ FAIL:
 	ret
 }
 }
-.assembly pop4.exe{}
+.assembly pop4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/pop8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/pop8.il
index b76391f85a5e8f..a4cd34d740256b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/pop8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/pop8.il
@@ -44,4 +44,4 @@ FAIL:
 	ret
 }
 }
-.assembly pop8.exe{}
+.assembly pop8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/popi.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/popi.il
index 5f3a3712b80b94..25f4f2363fa59d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/popi.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/popi.il
@@ -24,4 +24,4 @@ FAIL:
 	ret
 }
 }
-.assembly popi.exe{}
+.assembly popi{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/refs.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/refs.il
index 9080838def7595..b1db1dca02b776 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/refs.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/refs.il
@@ -60,4 +60,4 @@ FAIL:
 }
 
 
-.assembly refs.exe{}
+.assembly refs{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.il
index 15887c8dc5c196..2802459d30649c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.il
@@ -353,4 +353,4 @@ FAIL:
 	ret
 }
 }
-.assembly rem_i4.exe{}
+.assembly rem_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.il
index d316f64b7b7d14..37df93ea3d2c01 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.il
@@ -353,4 +353,4 @@ FAIL:
 	ret
 }
 }
-.assembly rem_i8.exe{}
+.assembly rem_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.il
index 836324064975ab..7ee8254698f716 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.il
@@ -871,4 +871,4 @@ FAIL:
 }
 // ----------------------------------
 
-.assembly rem_r4.exe{}
+.assembly rem_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.il
index be94156fb5fbfc..392658cdec9a49 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.il
@@ -650,4 +650,4 @@ FAIL1:
 
 }
 }
-.assembly rem_r8.exe{}
+.assembly rem_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.il
index af18b1f5a209c7..c7633777f3900e 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.il
@@ -265,4 +265,4 @@ FAIL:
 	ret
 }
 }
-.assembly rem_u4.exe{}
+.assembly rem_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.il
index ec396dc93c58b4..57c8266e79d19b 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.il
@@ -265,4 +265,4 @@ FAIL:
 	ret
 }
 }
-.assembly rem_u8.exe{}
+.assembly rem_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret.il
index b75cbc93b32573..ae3f1409bc1fbd 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly ret.exe{}
+.assembly 'ret'{}
 
 .class public		_ret {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i.il
index ab0a4f5f8bf3b0..fde6b3650036a8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i.il
@@ -47,4 +47,4 @@ END:
 
 
 
-.assembly ret_i.exe{}
+.assembly ret_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.il
index 827605acbe76ae..96ddcdf1e3fbed 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.il
@@ -79,4 +79,4 @@ END:
 
 
 
-.assembly ret_i4.exe{}
+.assembly ret_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.il
index 609fcfd0be6604..eb18ede48593d6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.il
@@ -77,4 +77,4 @@ END:
 }
 }
 
-.assembly ret_i8.exe{}
+.assembly ret_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.il
index f3237d485342d9..2f30794776ac8a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.il
@@ -89,4 +89,4 @@ END:
 }
 }
 
-.assembly ret_r4.exe{}
+.assembly ret_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.il
index 4f35ad848b49dc..a7b827167d4c3d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.il
@@ -90,4 +90,4 @@ END:
 }
 }
 
-.assembly ret_r8.exe{}
+.assembly ret_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.il
index 9506762afd8eed..0c92e0e491cf45 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.il
@@ -77,4 +77,4 @@ END:
 
 
 
-.assembly ret_ref.exe{}
+.assembly ret_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.il
index f019c89cede215..ed26ae54714a12 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.il
@@ -135,4 +135,4 @@ FAIL:
 .try TRY_START to TRY_END catch [mscorlib]System.Exception handler HANDLER to END_HANDLER
 }
 }
-.assembly shl_u4.exe{}
+.assembly shl_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.il
index 59a8c50bae67f4..e6d74a7bd510d2 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.il
@@ -137,4 +137,4 @@ FAIL:
 .try TRY_START to TRY_END catch [mscorlib]System.Exception handler HANDLER to END_HANDLER
 }
 }
-.assembly shl_u8.exe{}
+.assembly shl_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.il
index 55da891fe32ea8..1ed1efbf39e9cb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.il
@@ -220,4 +220,4 @@ FAIL:
 .try TRY_START to TRY_END catch [mscorlib]System.Exception handler HANDLER to END_HANDLER
 }
 }
-.assembly shr_i4.exe{}
+.assembly shr_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.il
index 08ff518143463a..b8b7aa3dfe1bdf 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.il
@@ -234,4 +234,4 @@ FAIL:
 .try TRY_START to TRY_END catch [mscorlib]System.Exception handler HANDLER to END_HANDLER
 }
 }
-.assembly shr_i8.exe{}
+.assembly shr_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.il
index 6a314a150f9419..569ee4efe45b0a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.il
@@ -134,4 +134,4 @@ FAIL:
 .try TRY_START to TRY_END catch [mscorlib]System.Exception handler HANDLER to END_HANDLER
 }
 }
-.assembly shr_u4.exe{}
+.assembly shr_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.il
index 23ad9a36d6d188..dbf82c1e9e6171 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.il
@@ -135,4 +135,4 @@ FAIL:
 .try TRY_START to TRY_END catch [mscorlib]System.Exception handler HANDLER to END_HANDLER
 }
 }
-.assembly shr_u8.exe{}
+.assembly shr_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sizeof.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sizeof.il
index 88149707b11e1a..15995697093af0 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sizeof.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sizeof.il
@@ -53,4 +53,4 @@ FAIL:
 	ret
 }
 }
-.assembly sizeof.exe{}
+.assembly 'sizeof'{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i.il
index 2dfd51f020c8d3..4f31ef9b1933f8 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i.il
@@ -47,4 +47,4 @@ FAIL:
 	ret
 }
 }
-.assembly starg_i.exe{}
+.assembly starg_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.il
index b3fd11cc15328e..98041bb8d60d4d 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.il
@@ -63,4 +63,4 @@ FAIL:
 	ret
 }
 }
-.assembly starg_i4.exe{}
+.assembly starg_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.il
index f6c9a56532da90..48431ae82f3e5c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.il
@@ -63,4 +63,4 @@ FAIL:
 	ret
 }
 }
-.assembly starg_i8.exe{}
+.assembly starg_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.il
index 3a16738e50094a..1a38fcdb21bcb5 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.il
@@ -78,4 +78,4 @@ FAIL:
 	ret
 }
 }
-.assembly starg_r4.exe{}
+.assembly starg_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.il
index 03489d548b5b04..1342641e5caf30 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.il
@@ -80,4 +80,4 @@ FAIL:
 	ret
 }
 }
-.assembly starg_r8.exe{}
+.assembly starg_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.il
index 5b7d83d54c4e4f..51f078c9d3cc8f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.il
@@ -29,4 +29,4 @@ FAIL:
 	ret
 }
 }
-.assembly starg_ref.exe{}
+.assembly starg_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.il
index 0eaf53cda3b87f..6c847af30469ce 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.il
@@ -45,4 +45,4 @@ FAIL:
 	ret
 }
 }
-.assembly stind_i1.exe{}
+.assembly stind_i1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.il
index 2c3d84bf53ed3f..a2443c1fb2c591 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.il
@@ -46,4 +46,4 @@ FAIL:
 	ret
 }
 }
-.assembly stind_i2.exe{}
+.assembly stind_i2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.il
index e69cfaf373b2c1..5b21cbaa673fb4 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.il
@@ -56,4 +56,4 @@ FAIL:
 	ret
 }
 }
-.assembly stind_i4.exe{}
+.assembly stind_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.il
index 11e611c91bb7ec..a13f61b10023a6 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.il
@@ -74,4 +74,4 @@ FAIL:
 	ret
 }
 }
-.assembly stind_i8.exe{}
+.assembly stind_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.il
index 8571a521c22290..5b270b16985d8f 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.il
@@ -79,4 +79,4 @@ FAIL:
 }
 }
 
-.assembly stind_r8.exe{}
+.assembly stind_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.il
index 8ebe21b9274fc5..64eb63f4f092db 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.il
@@ -28,4 +28,4 @@ FAIL:
 }
 }
 
-.assembly stind_ref.exe{}
+.assembly stind_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.il
index 64069de5cd8fe9..0bd5e8866ee864 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.il
@@ -29,4 +29,4 @@ FAIL:
 	ret
 }
 }
-.assembly stloc_i.exe{}
+.assembly stloc_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.il
index 418457708445ce..fec52c1ad2f2ea 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.il
@@ -78,4 +78,4 @@ FAIL:
 	ret
 }
 }
-.assembly stloc_i4.exe{}
+.assembly stloc_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.il
index bccea762badbbb..0736b87a9ca9a7 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.il
@@ -77,4 +77,4 @@ FAIL:
 	ret
 }
 }
-.assembly stloc_i8.exe{}
+.assembly stloc_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.il
index a28f03125e78fd..f13b291298af6a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.il
@@ -57,4 +57,4 @@ FAIL:
 	ret
 }
 }
-.assembly stloc_r4.exe{}
+.assembly stloc_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.il
index 033ea8bddbc087..02f982b2ba327a 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.il
@@ -59,4 +59,4 @@ FAIL:
 	ret
 }
 }
-.assembly stloc_r8.exe{}
+.assembly stloc_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.il
index d9c31b98c3d596..9cd5d4ab3503c3 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.il
@@ -29,4 +29,4 @@ FAIL:
 	ret
 }
 }
-.assembly stloc_ref.exe{}
+.assembly stloc_ref{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i.il
index d105ff88ef72ed..d6118efa3ce0ed 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i.il
@@ -39,4 +39,4 @@ END:
 
 
 
-.assembly sub_i.exe{}
+.assembly sub_i{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.il
index 4d428004ba8858..75be517144f61c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.il
@@ -322,4 +322,4 @@ FAIL:
 	ret
 }
 }
-.assembly sub_i4.exe{}
+.assembly sub_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.il
index dfe5bac5f2d468..13c0c8799feda0 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.il
@@ -323,4 +323,4 @@ FAIL:
 	ret
 }
 }
-.assembly sub_i8.exe{}
+.assembly sub_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.il
index 1947b5db4c9855..293f31797eee48 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.il
@@ -315,4 +315,4 @@ END:
 }
 }
 
-.assembly sub_ovf_i1.exe{}
+.assembly sub_ovf_i1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.il
index 13dee7e3834988..d7f922d35072f2 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.il
@@ -316,4 +316,4 @@ END:
 }
 }
 
-.assembly sub_ovf_i2.exe{}
+.assembly sub_ovf_i2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.il
index c0d6e48fb0ef61..bbd3688703b151 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.il
@@ -315,4 +315,4 @@ END:
 }
 
 
-.assembly sub_ovf_i4.exe{}
+.assembly sub_ovf_i4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.il
index ac12317979ecc1..fe903619024359 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.il
@@ -314,4 +314,4 @@ END:
 }
 }
 
-.assembly sub_ovf_i8.exe{}
+.assembly sub_ovf_i8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.il
index ad0eeb22bc4c10..a4fff793655f4c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.il
@@ -249,4 +249,4 @@ END:
 }
 }
 
-.assembly sub_ovf_u1.exe{}
+.assembly sub_ovf_u1{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.il
index 1cb2960e2cbe47..26e59ec78ac5fb 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.il
@@ -249,4 +249,4 @@ END:
 }
 }
 
-.assembly sub_ovf_u2.exe{}
+.assembly sub_ovf_u2{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.il
index 3aa1e37042a8c7..51dfbd2acc5247 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.il
@@ -247,4 +247,4 @@ END:
 }
 }
 
-.assembly sub_ovf_u4.exe{}
+.assembly sub_ovf_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.il
index 18baf018bb0020..f1d324366e97f7 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.il
@@ -248,4 +248,4 @@ END:
 }
 }
 
-.assembly sub_ovf_u8.exe{}
+.assembly sub_ovf_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.il
index d1b4dfcc0b4688..29f60ded351c1c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.il
@@ -583,4 +583,4 @@ END:
 	ret
 }
 }
-.assembly sub_r4.exe{}
+.assembly sub_r4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.il
index 4d1c2fd55afab7..c98fd829559c44 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.il
@@ -584,4 +584,4 @@ END:
 	ret
 }
 }
-.assembly sub_r8.exe{}
+.assembly sub_r8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/switch.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/switch.il
index 82123558a377ac..729fb53c18a720 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/switch.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/switch.il
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 .assembly extern mscorlib {}
-.assembly switch.exe{}
+.assembly 'switch'{}
 
 .class public		_switch {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.il
index 62200ac59dd2f5..670507927e306c 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.il
@@ -240,4 +240,4 @@ FAIL:
 	ret
 }
 }
-.assembly xor_u4.exe{}
+.assembly xor_u4{}
diff --git a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.il b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.il
index 5630ab5a6a9450..6c5a250cd783e2 100644
--- a/src/tests/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.il
+++ b/src/tests/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.il
@@ -240,4 +240,4 @@ FAIL:
 	ret
 }
 }
-.assembly xor_u8.exe{}
+.assembly xor_u8{}
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/AutoInit.il b/src/tests/JIT/IL_Conformance/Old/directed/AutoInit.il
index a60181e284e638..9e2dc256dbe439 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/AutoInit.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/AutoInit.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly autoinit.exe{}
+.assembly autoinit{}
 
 .class public auto_init {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/heap_ovf.il b/src/tests/JIT/IL_Conformance/Old/directed/heap_ovf.il
index ae62636387523c..0391dc0d0c275c 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/heap_ovf.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/heap_ovf.il
@@ -10,7 +10,7 @@
 }
 
 .assembly extern legacy library mscorlib {}
-.assembly heap_ovf.exe{
+.assembly heap_ovf{
 }
 
 .class public			heap_ovf {
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i1.il b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i1.il
index d62c6e5065e8de..ff8fcdd32e944b 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i1.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldarg_s_i1.exe {}
+.assembly ldarg_s_i1 {}
 .class ldarg_s_i1 {
 
 .method public static int32 test_int8()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i2.il b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i2.il
index 5c2c92df65b45d..1b1436d1e69a11 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i2.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldarg_s_i2.exe {}
+.assembly ldarg_s_i2 {}
 .class ldarg_s_i2 {
 
 .method public static int32 test_int16()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i4.il b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i4.il
index ee572ce509ee74..66766049892972 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i4.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldarg_s_i4.exe {}
+.assembly ldarg_s_i4 {}
 .class ldarg_s_i4 {
 
 .method public static int32 test_int32()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i8.il b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i8.il
index fb1c781be9152e..58e99e0f82838f 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_i8.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldarg_s_i8.exe {}
+.assembly ldarg_s_i8 {}
 .class ldarg_s_i8 {
 
 .method public static int32 test_int64()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_r4.il b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_r4.il
index 7d850362e98b27..4d690e74de7bf4 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_r4.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldarg_s_r4.exe {}
+.assembly ldarg_s_r4 {}
 .class ldarg_s_r4 {
 
 .method public static int32 test_float32()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_r8.il b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_r8.il
index a4e652081c712f..fa4f50078193ed 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldarg_s_r8.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldarg_s_r8.exe {}
+.assembly ldarg_s_r8 {}
 .class ldarg_s_r8 {
 
 .method public static int32 test_float64()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i1.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i1.il
index bd820a99bd33fa..cc5072321c686a 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i1.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloc_s_i1.exe {}
+.assembly ldloc_s_i1 {}
 .class ldloc_s_i1 {
 
 .method public static int32 test_int8()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i2.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i2.il
index 69c7821c8a3824..bdcfbc6e06c25b 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i2.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloc_s_i2.exe {}
+.assembly ldloc_s_i2 {}
 .class ldloc_s_i2 {
 
 .method public static int32 test_int16()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i4.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i4.il
index c9f86e787e7e21..ea5a23a6530be9 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i4.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloc_s_i4.exe {}
+.assembly ldloc_s_i4 {}
 .class ldloc_s_i4 {
 
 .method public static int32 test_int32()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i8.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i8.il
index fde6811d3511b6..4ddba093ed934d 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_i8.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloc_s_i8.exe {}
+.assembly ldloc_s_i8 {}
 .class ldloc_s_i8 {
 
 .method public static int32 test_int64()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_r4.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_r4.il
index feacbd7ac17141..35907b87250ee1 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_r4.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloc_s_r4.exe {}
+.assembly ldloc_s_r4 {}
 .class ldloc_s_r4 {
 
 .method public static int32 test_float32()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_r8.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_r8.il
index 95a5a73f182476..2e8867fb586d2d 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloc_s_r8.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloc_s_r8.exe {}
+.assembly ldloc_s_r8 {}
 .class ldloc_s_r8 {
 
 .method public static int32 test_float64()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i1.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i1.il
index eccdab79cac402..6cfbb3e99f4ee0 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i1.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i1.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloca_s_i1.exe {}
+.assembly ldloca_s_i1 {}
 .class ldloca_s_i1 {
 
 .method public static int32 test_int8()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i2.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i2.il
index dffdd535230795..8f6676b2fd079a 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i2.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i2.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloca_s_i2.exe {}
+.assembly ldloca_s_i2 {}
 .class ldloca_s_i2 {
 
 .method public static int32 test_int16()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i4.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i4.il
index 2d008863285a89..b0c81cc7253a4b 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i4.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i4.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloca_s_i4.exe {}
+.assembly ldloca_s_i4 {}
 .class ldloca_s_i4 {
 
 .method public static int32 test_int32()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i8.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i8.il
index 8bb32c75015b84..21a27bf718f89f 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i8.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_i8.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloca_s_i8.exe {}
+.assembly ldloca_s_i8 {}
 .class ldloca_s_i8 {
 
 .method public static int32 test_int64()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_r4.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_r4.il
index e5809536dbe9da..a2986935dc6550 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_r4.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_r4.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloca_s_r4.exe {}
+.assembly ldloca_s_r4 {}
 .class ldloca_s_r4 {
 
 .method public static int32 test_float32()
diff --git a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_r8.il b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_r8.il
index 10d3728a2812d2..21c4545c60f88a 100644
--- a/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_r8.il
+++ b/src/tests/JIT/IL_Conformance/Old/directed/ldloca_s_r8.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldloca_s_r8.exe {}
+.assembly ldloca_s_r8 {}
 .class ldloca_s_r8 {
 
 .method public static int32 test_float64()
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.il
index 2dc79576581fb7..7ba1052f14af63 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly box_unbox.exe{}
+.assembly box_unbox{}
 
 .class public value sealed valClass {
 .field public int32 Field1
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/array_tests.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/array_tests.il
index c3121b0bb18197..d55defad6e96e0 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/array_tests.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/array_tests.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly array_tests.exe{}
+.assembly array_tests{}
 
 .class public value sealed valClass {
 	.field public		int32 Field
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/callintf.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/callintf.il
index 0ce1ba1ca098fd..2e446a6aa69633 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/callintf.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/callintf.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly callintf.exe{}
+.assembly callintf{}
 
 
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/callnonvirt.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/callnonvirt.il
index c367e23ae86715..b2ba284c4b327d 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/callnonvirt.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/callnonvirt.il
@@ -4,7 +4,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly callnonvirt.exe{}
+.assembly callnonvirt{}
 
 .class public TestClass {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/callstatic.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/callstatic.il
index bd6ec1b36ac615..33e972f0f9b689 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/callstatic.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/callstatic.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly callstatic.exe{}
+.assembly callstatic{}
 
 .class public TestStatic {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/callsuper.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/callsuper.il
index 3412a9cb2a67c9..66bf02e3bc18e5 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/callsuper.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/callsuper.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly callsuper.exe{}
+.assembly callsuper{}
 
 
 .class public Super {
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/callvirt.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/callvirt.il
index 2570f18c4b5d3c..8629c9b4e9ea84 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/callvirt.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/callvirt.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly callvirt.exe{}
+.assembly 'callvirt'{}
 
 
 .class public TestClass {
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/castclass.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/castclass.il
index 89e57d94893a04..3df2fb2c4420a9 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/castclass.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/castclass.il
@@ -4,7 +4,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly castclass.exe{}
+.assembly 'castclass'{}
 
 
 .class public Super {
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/cpobj.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/cpobj.il
index 7487b5bf294d45..17daff7de7d865 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/cpobj.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/cpobj.il
@@ -9,7 +9,7 @@
 }
 
 .assembly extern legacy library mscorlib {}
-.assembly cpobj.exe{}
+.assembly 'cpobj'{}
 
 .class public			_cpobj {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/field_tests.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/field_tests.il
index 6089a3402423a7..ada1346d641ea1 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/field_tests.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/field_tests.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly field_tests.exe{}
+.assembly field_tests{}
 
 .class public field_tests {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/fielda_tests.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/fielda_tests.il
index dd83dbeecab22a..9bdcb85ddf13ab 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/fielda_tests.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/fielda_tests.il
@@ -4,7 +4,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly fielda_tests.exe{}
+.assembly fielda_tests{}
 
 .class public field_tests {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/initobj.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/initobj.il
index 2d230a5d74f645..999ecc2bbdcb2a 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/initobj.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/initobj.il
@@ -4,7 +4,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly initobj.exe{
+.assembly 'initobj'{
 }
 
 .class public value sealed valClass{
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/isinst.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/isinst.il
index 7315341821eed8..a9734e9530cde3 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/isinst.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/isinst.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly isinst.exe{}
+.assembly 'isinst'{}
 
 .class public	Super {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldlen.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldlen.il
index 786d8703655fb2..d07c7a6a5c3d05 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldlen.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldlen.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldlen.exe{}
+.assembly 'ldlen'{}
 
 .class public _ldlen {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldobj.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldobj.il
index 359f8bc3cb68ca..a86c1b590dd272 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldobj.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldobj.il
@@ -9,7 +9,7 @@
 }
 
 .assembly extern legacy library mscorlib {}
-.assembly ldobj.exe{
+.assembly 'ldobj'{
 }
 
 .class public			_ldobj {
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldstr.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldstr.il
index 54e38a13bd2188..7f29b86a133b78 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldstr.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldstr.il
@@ -9,7 +9,7 @@
 }
 
 .assembly extern legacy library mscorlib {}
-.assembly ldstr.exe{}
+.assembly 'ldstr'{}
 
 .class public	_ldstr {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldtoken.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldtoken.il
index 469ad6e91282d3..37f451d90e7fae 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldtoken.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldtoken.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldtoken.exe{}
+.assembly 'ldtoken'{}
 
 
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.il
index 60935028b20b89..edab503aa02ed5 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly ldvirtftn.exe{
+.assembly 'ldvirtftn'{
 }
 
 .method public static int32 main(class System.String[]) {
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/localloc.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/localloc.il
index c1604aecb7016e..be0c6e533f6de9 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/localloc.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/localloc.il
@@ -9,7 +9,7 @@
 }
 
 .assembly extern legacy library mscorlib {}
-.assembly localloc.exe{
+.assembly 'localloc'{
 }
 
 .class public			_localloc {
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/newobj.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/newobj.il
index b726c360a2c654..1183c2791ea70f 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/newobj.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/newobj.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly newobj.exe{}
+.assembly 'newobj'{}
 
 
 .class public	Test {
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/seh_tests.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/seh_tests.il
index 100bcb5a8f6c14..ce44b4a4983c5d 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/seh_tests.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/seh_tests.il
@@ -9,7 +9,7 @@
 }
 
 .assembly extern legacy library mscorlib {}
-.assembly seh_tests.exe{}
+.assembly seh_tests{}
 
 .class public		seh {
 
diff --git a/src/tests/JIT/IL_Conformance/Old/objectmodel/throw.il b/src/tests/JIT/IL_Conformance/Old/objectmodel/throw.il
index f1ddcebf6a6994..bcad383359716f 100644
--- a/src/tests/JIT/IL_Conformance/Old/objectmodel/throw.il
+++ b/src/tests/JIT/IL_Conformance/Old/objectmodel/throw.il
@@ -3,7 +3,7 @@
 
 
 .assembly extern legacy library mscorlib {}
-.assembly throw.exe{}
+.assembly 'throw'{}
 
 .class public	_throw {
 
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 c73a2b566ff5f6..4c3465e97bb124 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.exe"
+.assembly 'bug'// as "bug"
 {
   
   
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.il
index 3e88a473014701..91626cfb80cf65 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'SignExpand'// as "SignExpand.exe" 
+.assembly 'SignExpand'// as "SignExpand" 
 {
   
 }
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.il
index 171cb810ec4871..9346e1f79a37d3 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly 'callvirt-bug'// as "callvirt-bug.exe" 
+.assembly 'callvirt-bug'// as "callvirt-bug" 
 {
   
 }
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 2da408c7d85d3e..8e212f3284dc5e 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.exe {}
+.assembly ILGEN_0xb37e58f3 {}
 .class ILGEN_0xb37e58f3 {
 .method static int8  Method_0xf9cacde1() {
 .maxstack	9
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 696aa3554a7107..c3e532acc54049 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.exe {}
+.assembly ILGEN_0x2dda4eb5 {}
 .class ILGEN_0x2dda4eb5 {
 .method static unsigned int16  Method_0xa084659a() {
 .maxstack	13
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 c43b1541734374..66838c7e1d49f3 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.exe {}
+.assembly ILGEN_0x1f0f388d {}
 .class ILGEN_0x1f0f388d {
 .method static int32 Main() {
 .entrypoint
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 fd6bd8c2c6c86f..93194f00044752 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.exe {}
+.assembly ILGEN_0x845850e7 {}
 .class ILGEN_0x845850e7 {
 .method static float64  Method_0x498875e6(int64 Arg_0x0, float32 Arg_0x4) {
 .maxstack	15
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.il b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.il
index 8f3a8a6d42cc0a..528b1207ad5dd1 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.il
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly n.exe{}
+.assembly n{}
 .class public _n {
 .method public static int32 main(class [mscorlib]System.String[]) {
 .entrypoint
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 589b2c24b510cb..bd36d7a23dc179 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.exe {}
+.assembly ILGEN_0x50a9a77 {}
 .class ILGEN_0x50a9a77 {
 .field static	unsigned int16 field_0x5
 .field static	int64 field_0x6
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 177aa4da5ea678..ca65236e1350ab 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.exe {}
+.assembly ILGEN_0x1c9344b9 {}
 .class ILGEN_0x1c9344b9 {
 .field static	int16[] field_0x0
 .method static int32 Method_0xcf54fbcb() {
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 414aaf47ad0178..821f245e4c4051 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.exe{}
+.assembly 'initblk'{}
 
 .class public sealed Foo
     extends [mscorlib]System.ValueType
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.il b/src/tests/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.il
index 16fadf9e150870..8650d19912ef23 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.il
@@ -3,7 +3,7 @@
 
 .assembly extern mscorlib {}
 
-.assembly DevDiv_279829.exe {}
+.assembly DevDiv_279829 {}
 
 .class public Test_DevDiv_279829
 {
diff --git a/src/tests/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.il b/src/tests/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.il
index 02c11869bd3622..baf22dae93edd5 100644
--- a/src/tests/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.il
+++ b/src/tests/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly rem_r4.exe{}
+.assembly rem_r4{}
 
 .class public _rem {
 //-- 
diff --git a/src/tests/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.il b/src/tests/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.il
index 55cc7b1056e257..751e39d33f60fc 100644
--- a/src/tests/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.il
+++ b/src/tests/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.il
@@ -8,7 +8,7 @@
 
 .assembly extern mscorlib {}
 
-.assembly GitHub_CoreRT_2073.exe {}
+.assembly GitHub_CoreRT_2073 {}
 
 .class public Test_GitHub_CoreRT_2073
 {
diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_39424/Runtime_39424.il b/src/tests/JIT/Regression/JitBlue/Runtime_39424/Runtime_39424.il
index ab35b013505e20..8761d7e335556b 100644
--- a/src/tests/JIT/Regression/JitBlue/Runtime_39424/Runtime_39424.il
+++ b/src/tests/JIT/Regression/JitBlue/Runtime_39424/Runtime_39424.il
@@ -11,7 +11,7 @@
 .assembly extern System.Numerics.Extensions {}
 .assembly extern System.Runtime.CompilerServices.Unsafe {}
 
-.assembly Runtime_39424.exe {}
+.assembly Runtime_39424 {}
 
 .class private auto ansi beforefieldinit Runtime_39424
        extends [System.Runtime]System.Object
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b108366/bug.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b108366/bug.il
index 7788044df51ef1..5127900567ef21 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b108366/bug.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b108366/bug.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly div_r8.exe{}
+.assembly div_r8{}
 
 .class public _div {
 //-- 
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b109721/bug.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b109721/bug.il
index 519d7298375177..0f740cca00ac63 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b109721/bug.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b109721/bug.il
@@ -8,7 +8,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly div_i4.exe{}
+.assembly div_i4{}
 
 .class public _div {
 //
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b109878/rem_r4.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b109878/rem_r4.il
index 981546815a6e8d..0cdabbbeb28d7e 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b109878/rem_r4.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b109878/rem_r4.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly rem_r4.exe{}
+.assembly rem_r4{}
 
 .class public _rem {
 //-- 
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.il
index fa6f7e0a349384..d8336466520c4c 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly l.exe{}
+.assembly l{}
 .method public public static int32 t() {
 	ldc.i4		100
 	ret 
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.il
index 81899c7473e482..ee701495c8371c 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.il
@@ -8,7 +8,7 @@
   .ver 4:0:0:0
 }
 .assembly extern legacy library mscorlib {}
-.assembly ldobj.exe{
+.assembly 'ldobj'{
 
 }
 
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.il
index 68b7f134329a14..3565e17df48c4c 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly box_unbox.exe{}
+.assembly box_unbox{}
 .class public value sealed valClass {
 .field public int32 Field1
 }
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.il
index b054e3e649d474..409b0afbc6e29f 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly bge.exe{}
+.assembly 'bge'{}
 .method public	static int32 main() {
 .entrypoint
 	ldc.r4		1.0
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.il
index 22d8bb6e7aa298..55177f08a02e9d 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly conv.exe{}
+.assembly conv{}
 .class public conv {
 .method public static float32 r4(float32) {
 .maxstack	2
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.il
index 2e5162b3c511a6..4b6b1999d2390e 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly tailcall.exe{}
+.assembly tailcall{}
 
 .method public static int32 main(class [mscorlib]System.String[]) {
 .entrypoint
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.il
index a307e1a03b41d7..23e0e63ddcb608 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly bge2.exe{}
+.assembly bge2{}
 .method public	static int32 main() {
 .entrypoint
 // r4 real >= unordered
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.il
index 18bbd58084e466..f9ba79f6f2468d 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly initblk.exe{}
+.assembly 'initblk'{}
 
 .class public _initblk {
 	.field public static int32 DATA
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.il
index 1c15116b8eee4e..1ba8e90cfcfaff 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ble.exe{}
+.assembly 'ble'{}
 .method public	static int32 main(class [mscorlib]System.String[]) {
 .locals		(class [mscorlib]System.String)
 .entrypoint
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.il
index 9defc55ce978c1..b398fb5d8e43ad 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ldloc_stloc.exe{}
+.assembly ldloc_stloc{}
 .class public ldloc_stloc {
 .method public static int32 main(class [mscorlib]System.String[]) {
 .entrypoint
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.il
index 196bf7feaf8dcf..5717d87a062c83 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly mul.exe{}
+.assembly 'mul'{}
 
 .class public _mul {
 .method public static  int32 I4(int32,int32,int32) {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.il
index b09ba37bc20ddc..353591d51a4c1e 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly ret.exe{}
+.assembly 'ret'{}
 .class public _ret {
 .field public static native int PTR
 .method public static		int32 retI(int32*) {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.il
index be50584786319f..236856991ada19 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly s.exe{}
+.assembly s{}
 .class public s {
 .method public static int32 main(class [mscorlib]System.String[]) {
 .entrypoint
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.il
index d51a109e1d083a..dae97717c53d92 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly shl.exe{}
+.assembly 'shl'{}
 .class public _shl {
 .method public static int32 main(class [mscorlib]System.String[]) {
 .entrypoint
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85316/f2.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85316/f2.il
index 8f3a8a6d42cc0a..528b1207ad5dd1 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85316/f2.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85316/f2.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly n.exe{}
+.assembly n{}
 .class public _n {
 .method public static int32 main(class [mscorlib]System.String[]) {
 .entrypoint
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.il
index abb3c74fd35389..6428ac2db4eb3b 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly rem.exe{}
+.assembly 'rem'{}
 
 .class public _rem {
 .method public static int32 main(class [mscorlib]System.String[]) {
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.il
index 67bd1436d135cb..d45bb28c373ea3 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly s.exe{}
+.assembly s{}
 .class public s {
 .method public static int32 return(int32) {
 .maxstack	2
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.il
index 29d030c22f5c2a..370568ef913530 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly s.exe{}
+.assembly s{}
 .class public s {
 .method static int32 main(class System.String[]) {
 .entrypoint
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.il
index d506b7864fe7ea..1b9c6b2119703c 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly div_i4.exe{}
+.assembly div_i4{}
 
 .class public _div {
 //
diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.il b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.il
index 40759441ea1911..e3cec01d786981 100644
--- a/src/tests/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.il
+++ b/src/tests/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.il
@@ -7,7 +7,7 @@
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
   .ver 4:0:0:0
 }
-.assembly rem_r4.exe{}
+.assembly rem_r4{}
 
 .class public _rem {
 //-- 
diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Except.il b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Except.il
index b23ce35bc8b356..0193146f4b7f45 100644
--- a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Except.il
+++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Except.il
@@ -13,7 +13,7 @@
   .ver 4:0:0:0
 }
 
-.assembly Except.exe{}
+.assembly Except{}
 
 .class		Except {
 
diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.il b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.il
index 1d9ce41279778d..87a654624b6b2f 100644
--- a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.il
+++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.il
@@ -15,7 +15,7 @@
   .ver 4:0:0:0
 }
 
-.assembly FiltCatch.exe{}
+.assembly FiltCatch{}
 
 .class		FiltCatch {
 
diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Filter.il b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Filter.il
index e555bb5a639891..a14fddf1a77f36 100644
--- a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Filter.il
+++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Filter.il
@@ -13,7 +13,7 @@
   .ver 4:0:0:0
 }
 
-.assembly Filter.exe{}
+.assembly Filter{}
 
 
 .class		Filter {
diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Finally.il b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Finally.il
index b62aca7922be02..2f57c02fcc4955 100644
--- a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Finally.il
+++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/Finally.il
@@ -13,7 +13,7 @@
   .ver 4:0:0:0
 }
 
-.assembly Finally.exe{}
+.assembly Finally{}
 
 
 .class		Finally {
diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/NestedExcept.il b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/NestedExcept.il
index 663ca2281640b2..04051ccb630951 100644
--- a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/NestedExcept.il
+++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/NestedExcept.il
@@ -14,7 +14,7 @@
   .ver 4:0:0:0
 }
 
-.assembly NestedExcept.exe{}
+.assembly NestedExcept{}
 
 .class		NestedExcept {
 
diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/NestedFilt.il b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/NestedFilt.il
index 115d70a4991a3b..a244d57dc98eb6 100644
--- a/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/NestedFilt.il
+++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/asm/NestedFilt.il
@@ -13,7 +13,7 @@
   .ver 4:0:0:0
 }
 
-.assembly NestedFilt.exe{}
+.assembly NestedFilt{}
 
 .class		NestedFilt {