diff --git a/comtypes/test/test_dispifc_records.py b/comtypes/test/test_dispifc_records.py
index ec797d61..7666d612 100644
--- a/comtypes/test/test_dispifc_records.py
+++ b/comtypes/test/test_dispifc_records.py
@@ -26,7 +26,7 @@ class Test_DispMethods(unittest.TestCase):
     def _create_dispifc(self) -> "ComtypesCppTestSrvLib.IDispRecordParamTest":
         # Explicitely ask for the dispinterface of the component.
         return CreateObject(
-            "Comtypes.DispIfcParamTests",
+            "Comtypes.DispRecordParamTest",
             clsctx=CLSCTX_LOCAL_SERVER,
             interface=ComtypesCppTestSrvLib.IDispRecordParamTest,
         )
diff --git a/source/CppTestSrv/CoComtypesDispIfcParamTests.cpp b/source/CppTestSrv/CoComtypesDispRecordParamTest.cpp
similarity index 97%
rename from source/CppTestSrv/CoComtypesDispIfcParamTests.cpp
rename to source/CppTestSrv/CoComtypesDispRecordParamTest.cpp
index 54ac8ecf..7355aab5 100644
--- a/source/CppTestSrv/CoComtypesDispIfcParamTests.cpp
+++ b/source/CppTestSrv/CoComtypesDispRecordParamTest.cpp
@@ -7,7 +7,7 @@
 */
 
 //
-// CoComtypesDispIfcParamTests.cpp - Component
+// CoComtypesDispRecordParamTest.cpp - Component
 //
 #include <objbase.h>
 #include <string.h>
@@ -18,7 +18,7 @@
 #include "Util.h"
 #include "CUnknown.h"
 #include "CFactory.h" // Needed for module handle
-#include "CoComtypesDispIfcParamTests.h"
+#include "CoComtypesDispRecordParamTest.h"
 
 // We need to put this declaration here because we explicitely expose a dispinterface
 // in parallel to the dual interface but dispinterfaces don't appear in the
@@ -26,9 +26,9 @@
 EXTERN_C const IID DIID_IDispRecordParamTest;
 
 static inline void trace(const char* msg)
-	{ Util::Trace("Component", msg, S_OK) ;}
+	{ Util::Trace("CoComtypesDispRecordParamTest", msg, S_OK) ;}
 static inline void trace(const char* msg, HRESULT hr)
-	{ Util::Trace("Component", msg, hr) ;}
+	{ Util::Trace("CoComtypesDispRecordParamTest", msg, hr) ;}
 
 ///////////////////////////////////////////////////////////
 //
diff --git a/source/CppTestSrv/CoComtypesDispIfcParamTests.h b/source/CppTestSrv/CoComtypesDispRecordParamTest.h
similarity index 97%
rename from source/CppTestSrv/CoComtypesDispIfcParamTests.h
rename to source/CppTestSrv/CoComtypesDispRecordParamTest.h
index 1dfe95fa..6647dbaa 100644
--- a/source/CppTestSrv/CoComtypesDispIfcParamTests.h
+++ b/source/CppTestSrv/CoComtypesDispRecordParamTest.h
@@ -7,7 +7,7 @@
 */
 
 //
-// CoComtypesDispIfcParamTests.cpp - Component
+// CoComtypesDispRecordParamTest.cpp - Component
 //
 
 #include "Iface.h"
diff --git a/source/CppTestSrv/MAKEFILE b/source/CppTestSrv/MAKEFILE
index f19ba1e5..5a3239bd 100644
--- a/source/CppTestSrv/MAKEFILE
+++ b/source/CppTestSrv/MAKEFILE
@@ -44,9 +44,9 @@ guids.obj : guids.c
 server.obj : server.cpp cunknown.h cfactory.h iface.h
 	cl $(CPP_FLAGS) server.cpp
 
-CoComtypesDispIfcParamTests.obj : CoComtypesDispIfcParamTests.cpp CoComtypesDispIfcParamTests.h iface.h \
-		registry.h CUnknown.h
-	cl $(CPP_FLAGS) CoComtypesDispIfcParamTests.cpp
+CoComtypesDispRecordParamTest.obj : CoComtypesDispRecordParamTest.cpp \
+		CoComtypesDispRecordParamTest.h iface.h registry.h CUnknown.h
+	cl $(CPP_FLAGS) CoComtypesDispRecordParamTest.cpp
 
 #
 # Helper classes
@@ -75,7 +75,7 @@ outproc.obj : outproc.cpp CFactory.h CUnknown.h
 #
 
 SERVER_OBJS = Server.obj     \
-              CoComtypesDispIfcParamTests.obj      \
+              CoComtypesDispRecordParamTest.obj      \
               Registry.obj   \
               Cfactory.obj   \
               Cunknown.obj   \
diff --git a/source/CppTestSrv/SERVER.CPP b/source/CppTestSrv/SERVER.CPP
index d9a6a151..4d93648e 100644
--- a/source/CppTestSrv/SERVER.CPP
+++ b/source/CppTestSrv/SERVER.CPP
@@ -8,7 +8,7 @@
 
 #include "CFactory.h"
 #include "Iface.h"
-#include "CoComtypesDispIfcParamTests.h"
+#include "CoComtypesDispRecordParamTest.h"
 
 
 ///////////////////////////////////////////////////////////
@@ -35,10 +35,10 @@
 //
 CFactoryData g_FactoryDataArray[] =
 {
-	{&CLSID_CoComtypesDispIfcParamTests, CA::CreateInstance, 
-		L"Comtypes component for dispinterface parameter tests",	// Friendly Name
-		L"Comtypes.DispIfcParamTests.1",									// ProgID
-		L"Comtypes.DispIfcParamTests",										// Version-independent ProgID
+	{&CLSID_CoComtypesDispRecordParamTest, CA::CreateInstance, 
+		L"Comtypes component for dispinterface record parameter tests",	// Friendly Name
+		L"Comtypes.DispRecordParamTest.1",									// ProgID
+		L"Comtypes.DispRecordParamTest",										// Version-independent ProgID
 		&LIBID_ComtypesCppTestSrvLib,												// Type Library ID
 		NULL, 0}
 } ;
diff --git a/source/CppTestSrv/SERVER.IDL b/source/CppTestSrv/SERVER.IDL
index 7ef84836..b2b09b87 100644
--- a/source/CppTestSrv/SERVER.IDL
+++ b/source/CppTestSrv/SERVER.IDL
@@ -59,13 +59,13 @@ library ComtypesCppTestSrvLib
 	// TLib : OLE Automation : {00020430-0000-0000-C000-000000000046}
 	importlib("stdole2.tlb") ;
 
-	// CoComtypesDispIfcParamTests
-	// Component that implements interfaces used for dispinterface parameter tests.
+	// CoComtypesDispRecordParamTest
+	// Component that implements interfaces used for dispinterface record parameter tests.
 	[
-		uuid(06571915-2431-4CA3-9C01-53002B060DAB),
-		helpstring("Comtypes component for dispinterface parameter tests.")
+		uuid(5E78C9A8-4C19-4285-BCD6-3FFBBA5B17A8),
+		helpstring("Comtypes component for dispinterface record parameter tests.")
 	]
-	coclass CoComtypesDispIfcParamTests
+	coclass CoComtypesDispRecordParamTest
 	{
 		interface IDualRecordParamTest ;
 		dispinterface IDispRecordParamTest ;