Index: apitests/setupapi/SetupDiInstallClassExA.c
===================================================================
--- apitests/setupapi/SetupDiInstallClassExA.c	(revision 67245)
+++ apitests/setupapi/SetupDiInstallClassExA.c	(working copy)
@@ -180,7 +180,7 @@
     }
 
     /* Add a reference */
-    strcat(inf, "AddService=Reactostest,,Reactostest.Service\n");
+    strcat(inf, "AddService=ReactOStest,,ReactOStest.Service\n");
     create_inf_file(inffile, inf);
     infhandle =  SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL);
     SetLastError(0xdeadbeef);
@@ -192,7 +192,7 @@
     DeleteFileA(inffile);
 
     /* Add the section */
-    strcat(inf, "[Reactostest.Service]\n");
+    strcat(inf, "[ReactOStest.Service]\n");
     create_inf_file(inffile, inf);
     infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL);
     SetLastError(0xdeadbeef);
@@ -261,7 +261,7 @@
     scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL);
 
     /* Open the service to see if it's really there */
-    svc_handle = OpenServiceA(scm_handle, "Reactostest", DELETE);
+    svc_handle = OpenServiceA(scm_handle, "ReactOStest", DELETE);
     ok(svc_handle != NULL, "Service was not created\n");
 
     SetLastError(0xdeadbeef);
Index: tests/hivetest/hivetest.c
===================================================================
--- tests/hivetest/hivetest.c	(revision 67245)
+++ tests/hivetest/hivetest.c	(working copy)
@@ -653,8 +653,8 @@
   ULONG Length,i;
 
   dprintf("Create target key\n");
-  dprintf("  Key: \\Registry\\Machine\\SOFTWARE\\Reactos\n");
-  RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\\Registry\\Machine\\SOFTWARE\\Reactos");
+  dprintf("  Key: \\Registry\\Machine\\SOFTWARE\\ReactOS\n");
+  RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\\Registry\\Machine\\SOFTWARE\\ReactOS");
   InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE
 				, NULL, NULL);
   Status = NtCreateKey(&hKey, KEY_ALL_ACCESS , &ObjectAttributes
@@ -695,9 +695,9 @@
     return;
 
   dprintf("Create link value\n");
-  dprintf("  Value: SymbolicLinkValue = '\\Registry\\Machine\\SOFTWARE\\Reactos'\n");
+  dprintf("  Value: SymbolicLinkValue = '\\Registry\\Machine\\SOFTWARE\\ReactOS'\n");
   RtlRosInitUnicodeStringFromLiteral(&ValueName, L"SymbolicLinkValue");
-  Status=NtSetValueKey(hKey,&ValueName,0,REG_LINK,(PVOID)L"\\Registry\\Machine\\SOFTWARE\\Reactos",68);
+  Status=NtSetValueKey(hKey,&ValueName,0,REG_LINK,(PVOID)L"\\Registry\\Machine\\SOFTWARE\\ReactOS",68);
   dprintf("  NtSetValueKey() called (Status %lx)\n",Status);
   if (!NT_SUCCESS(Status))
     {
Index: tests/regtest/regtest.c
===================================================================
--- tests/regtest/regtest.c	(revision 67245)
+++ tests/regtest/regtest.c	(working copy)
@@ -616,8 +616,8 @@
   ULONG Length,i;
 
   dprintf("Create target key\n");
-  dprintf("  Key: \\Registry\\Machine\\SOFTWARE\\Reactos\n");
-  RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\\Registry\\Machine\\SOFTWARE\\Reactos");
+  dprintf("  Key: \\Registry\\Machine\\SOFTWARE\\ReactOS\n");
+  RtlRosInitUnicodeStringFromLiteral(&KeyName, L"\\Registry\\Machine\\SOFTWARE\\ReactOS");
   InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE
 				, NULL, NULL);
   Status = NtCreateKey(&hKey, KEY_ALL_ACCESS , &ObjectAttributes
@@ -658,9 +658,9 @@
     return;
 
   dprintf("Create link value\n");
-  dprintf("  Value: SymbolicLinkValue = '\\Registry\\Machine\\SOFTWARE\\Reactos'\n");
+  dprintf("  Value: SymbolicLinkValue = '\\Registry\\Machine\\SOFTWARE\\ReactOS'\n");
   RtlRosInitUnicodeStringFromLiteral(&ValueName, L"SymbolicLinkValue");
-  Status=NtSetValueKey(hKey,&ValueName,0,REG_LINK,(PVOID)L"\\Registry\\Machine\\SOFTWARE\\Reactos",68);
+  Status=NtSetValueKey(hKey,&ValueName,0,REG_LINK,(PVOID)L"\\Registry\\Machine\\SOFTWARE\\ReactOS",68);
   dprintf("  NtSetValueKey() called (Status %lx)\n",Status);
   if (!NT_SUCCESS(Status))
     {