diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt
new file mode 100644
index 00000000000000..c3f82e3261a881
--- /dev/null
+++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt
@@ -0,0 +1,15 @@
+project (ForeignUnhandledNative)
+
+include_directories(${INC_PLATFORM_DIR})
+
+set(SOURCES ForeignUnhandledNative.cpp)
+
+if(NOT CLR_CMAKE_HOST_WIN32)
+    add_compile_options(-pthread)
+endif()
+
+# add the executable
+add_library (ForeignUnhandledNative SHARED ${SOURCES})
+
+# add the install targets
+install (TARGETS ForeignUnhandledNative DESTINATION bin)
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/ForeignThreadRevPInvokeUnhandled.cs b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/ForeignUnhandled.cs
similarity index 93%
rename from src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/ForeignThreadRevPInvokeUnhandled.cs
rename to src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/ForeignUnhandled.cs
index 31fe416519c08d..4eb41dd6f455eb 100644
--- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/ForeignThreadRevPInvokeUnhandled.cs
+++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/ForeignUnhandled.cs
@@ -9,9 +9,9 @@
 
 public delegate void MyCallback();
 
-public class PInvokeRevPInvokeUnhandled
+public class ForeignUnhandled
 {
-    [DllImport("ForeignThreadRevPInvokeUnhandled")]
+    [DllImport("ForeignUnhandledNative")]
     public static extern void InvokeCallbackOnNewThread(MyCallback callback);
 
     [ThreadStatic]
@@ -30,7 +30,7 @@ private static void SetHandler()
     }
 
     // test-wide setup
-    static PInvokeRevPInvokeUnhandled()
+    static ForeignUnhandled()
     {
         AppDomain.CurrentDomain.UnhandledException += (_, _) =>
         {
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/PInvokeRevPInvokeUnhandled.csproj b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/ForeignUnhandled.csproj
similarity index 90%
rename from src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/PInvokeRevPInvokeUnhandled.csproj
rename to src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/ForeignUnhandled.csproj
index 3e529b0a6e921a..4d46cfd15af9be 100644
--- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/PInvokeRevPInvokeUnhandled.csproj
+++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/ForeignUnhandled.csproj
@@ -8,7 +8,7 @@
     <MonoAotIncompatible>true</MonoAotIncompatible>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="PInvokeRevPInvokeUnhandled.cs" />
+    <Compile Include="ForeignUnhandled.cs" />
   </ItemGroup>
   <ItemGroup>
     <CMakeProjectReference Include="CMakeLists.txt" />
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/ForeignThreadRevPInvokeUnhandledNative.cpp b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/ForeignUnhandledNative.cpp
similarity index 100%
rename from src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/ForeignThreadRevPInvokeUnhandledNative.cpp
rename to src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/ForeignUnhandledNative.cpp
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/CMakeLists.txt b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/CMakeLists.txt
deleted file mode 100644
index dd598f160ae2ab..00000000000000
--- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-project (ForeignThreadRevPInvokeUnhandledNative)
-
-include_directories(${INC_PLATFORM_DIR})
-
-set(SOURCES ForeignThreadRevPInvokeUnhandledNative.cpp)
-
-if(NOT CLR_CMAKE_HOST_WIN32)
-    add_compile_options(-pthread)
-endif()
-
-# add the executable
-add_library (ForeignThreadRevPInvokeUnhandledNative SHARED ${SOURCES})
-
-# add the install targets
-install (TARGETS ForeignThreadRevPInvokeUnhandledNative DESTINATION bin)
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt
new file mode 100644
index 00000000000000..82d0216e586660
--- /dev/null
+++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt
@@ -0,0 +1,15 @@
+project (PInvokeUnhandledNative)
+
+include_directories(${INC_PLATFORM_DIR})
+
+set(SOURCES PInvokeUnhandledNative.cpp)
+
+if(NOT CLR_CMAKE_HOST_WIN32)
+    add_compile_options(-pthread)
+endif()
+
+# add the executable
+add_library (PInvokeUnhandledNative SHARED ${SOURCES})
+
+# add the install targets
+install (TARGETS PInvokeUnhandledNative DESTINATION bin)
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/PInvokeRevPInvokeUnhandled.cs b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/PInvokeUnhandled.cs
similarity index 93%
rename from src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/PInvokeRevPInvokeUnhandled.cs
rename to src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/PInvokeUnhandled.cs
index 5a66101d2e7ec8..eca85bc8b2120c 100644
--- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/PInvokeRevPInvokeUnhandled.cs
+++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/PInvokeUnhandled.cs
@@ -9,9 +9,9 @@
 
 public delegate void MyCallback();
 
-public class PInvokeRevPInvokeUnhandled
+public class PInvokeUnhandled
 {
-    [DllImport("PInvokeRevPInvokeUnhandledNative")]
+    [DllImport("PInvokeUnhandledNative")]
     public static extern void InvokeCallback(MyCallback callback);
 
     [ThreadStatic]
@@ -30,7 +30,7 @@ private static void SetHandler()
     }
 
     // test-wide setup
-    static PInvokeRevPInvokeUnhandled()
+    static PInvokeUnhandled()
     {
         AppDomain.CurrentDomain.UnhandledException += (_, _) =>
         {
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/ForeignThreadRevPInvokeUnhandled.csproj b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/PInvokeUnhandled.csproj
similarity index 89%
rename from src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/ForeignThreadRevPInvokeUnhandled.csproj
rename to src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/PInvokeUnhandled.csproj
index ff750db24d1f97..53b8815b656524 100644
--- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/ForeignThreadRevPInvokeUnhandled.csproj
+++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/PInvokeUnhandled.csproj
@@ -8,7 +8,7 @@
     <MonoAotIncompatible>true</MonoAotIncompatible>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ForeignThreadRevPInvokeUnhandled.cs" />
+    <Compile Include="PInvokeUnhandled.cs" />
   </ItemGroup>
   <ItemGroup>
     <CMakeProjectReference Include="CMakeLists.txt" />
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/PInvokeRevPInvokeUnhandledNative.cpp b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/PInvokeUnhandledNative.cpp
similarity index 100%
rename from src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/PInvokeRevPInvokeUnhandledNative.cpp
rename to src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/PInvokeUnhandledNative.cpp
diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/CMakeLists.txt b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/CMakeLists.txt
deleted file mode 100644
index 402d90b58a3151..00000000000000
--- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-project (PInvokeRevPInvokeUnhandledNative)
-
-include_directories(${INC_PLATFORM_DIR})
-
-set(SOURCES PInvokeRevPInvokeUnhandledNative.cpp)
-
-if(NOT CLR_CMAKE_HOST_WIN32)
-    add_compile_options(-pthread)
-endif()
-
-# add the executable
-add_library (PInvokeRevPInvokeUnhandledNative SHARED ${SOURCES})
-
-# add the install targets
-install (TARGETS PInvokeRevPInvokeUnhandledNative DESTINATION bin)
diff --git a/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt b/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt
index eb443151205063..b08c1aa651ed67 100644
--- a/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt
+++ b/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt
@@ -1,15 +1,15 @@
-project (foreignunhandled)
+project (unhandlednative)
 
 include_directories(${INC_PLATFORM_DIR})
 
-set(SOURCES foreignunhandled.cpp)
+set(SOURCES unhandlednative.cpp)
 
 if(NOT CLR_CMAKE_HOST_WIN32)
     add_compile_options(-pthread)
 endif()
 
 # add the executable
-add_library (foreignunhandled SHARED ${SOURCES})
+add_library (unhandlednative SHARED ${SOURCES})
 
 # add the install targets
-install (TARGETS foreignunhandled DESTINATION bin)
+install (TARGETS unhandlednative DESTINATION bin)
diff --git a/src/tests/baseservices/exceptions/unhandled/unhandled.cs b/src/tests/baseservices/exceptions/unhandled/unhandled.cs
index 87147c489a8b67..ff0827cc53ea10 100644
--- a/src/tests/baseservices/exceptions/unhandled/unhandled.cs
+++ b/src/tests/baseservices/exceptions/unhandled/unhandled.cs
@@ -14,7 +14,7 @@ namespace TestUnhandledException
 
     unsafe class Program
     {
-        [DllImport("foreignunhandled")]
+        [DllImport("unhandlednative")]
         public static extern void InvokeCallbackOnNewThread(delegate*unmanaged<void> callBack);
 
         private const string INTERNAL_CALL = "__internal";
diff --git a/src/tests/baseservices/exceptions/unhandled/foreignunhandled.cpp b/src/tests/baseservices/exceptions/unhandled/unhandlednative.cpp
similarity index 100%
rename from src/tests/baseservices/exceptions/unhandled/foreignunhandled.cpp
rename to src/tests/baseservices/exceptions/unhandled/unhandlednative.cpp