Index: base/applications/osk/main.c
===================================================================
--- base/applications/osk/main.c	(revision 67149)
+++ base/applications/osk/main.c	(working copy)
@@ -145,7 +145,7 @@
  */
 int OSK_DlgTimer(void)
 {
-    /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */
+    /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */
     HWND hWndActiveWindow;
 
     hWndActiveWindow = GetForegroundWindow();
@@ -177,7 +177,7 @@
     BOOL bKeyUp;
     LONG WindowStyle;
 
-    /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */
+    /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */
     if (Globals.hActiveWnd)
     {
         MSG msg;
Index: base/applications/rapps/rapps/ac97forvirtualbox.txt
===================================================================
--- base/applications/rapps/rapps/ac97forvirtualbox.txt	(revision 67149)
+++ base/applications/rapps/rapps/ac97forvirtualbox.txt	(working copy)
@@ -24,7 +24,7 @@
 [Section.0410]
 Name = Driver AC97 per VirtualBox
 License = Sconosciuta
-Descrizione = Estrarre nella cartella "ReactOS" e poi riavviare ReactOs due volte.
+Descrizione = Estrarre nella cartella "ReactOS" e poi riavviare ReactOS due volte.
 
 [Section.0a]
 Name = Controlador AC'97 para VirtualBox
Index: base/setup/usetup/bootsup.c
===================================================================
--- base/setup/usetup/bootsup.c	(revision 67149)
+++ base/setup/usetup/bootsup.c	(working copy)
@@ -452,7 +452,7 @@
 }
 
 NTSTATUS
-CreateFreeLoaderIniForReactos(
+CreateFreeLoaderIniForReactOS(
     PWCHAR IniPath,
     PWCHAR ArcPath)
 {
@@ -2068,11 +2068,11 @@
             wcscpy(DstPath, SystemRootPath->Buffer);
             wcscat(DstPath, L"\\freeldr.ini");
 
-            Status = CreateFreeLoaderIniForReactos(DstPath,
+            Status = CreateFreeLoaderIniForReactOS(DstPath,
                                                    DestinationArcPath->Buffer);
             if (!NT_SUCCESS(Status))
             {
-                DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status);
+                DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status);
                 return Status;
             }
 
@@ -2267,11 +2267,11 @@
             wcscat(DstPath, L"\\freeldr.ini");
 
             DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath);
-            Status = CreateFreeLoaderIniForReactos(DstPath,
+            Status = CreateFreeLoaderIniForReactOS(DstPath,
                                                    DestinationArcPath->Buffer);
             if (!NT_SUCCESS(Status))
             {
-                DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status);
+                DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status);
                 return Status;
             }
 
@@ -2409,10 +2409,10 @@
     wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.ini");
 
     DPRINT("Create new 'freeldr.ini'\n");
-    Status = CreateFreeLoaderIniForReactos(DstPath, DestinationArcPath->Buffer);
+    Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("CreateFreeLoaderIniForReactos() failed (Status %lx)\n", Status);
+        DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status);
         return Status;
     }
 
Index: base/setup/usetup/bootsup.h
===================================================================
--- base/setup/usetup/bootsup.h	(revision 67149)
+++ base/setup/usetup/bootsup.h	(working copy)
@@ -32,7 +32,7 @@
     PWCHAR ArcPath);
 
 NTSTATUS
-CreateFreeLoaderIniForReactos(
+CreateFreeLoaderIniForReactOS(
     PWCHAR IniPath,
     PWCHAR ArcPath);
 
Index: dll/win32/iphlpapi/merge-notes.txt
===================================================================
--- dll/win32/iphlpapi/merge-notes.txt	(revision 67149)
+++ dll/win32/iphlpapi/merge-notes.txt	(working copy)
@@ -8,7 +8,7 @@
 GetNetworkParams --
      -- Make workable interface for _res
         -- Wine based on real _res
-	-- Reactos based on my enumerator funcs
+	-- ReactOS based on my enumerator funcs
 
 -- Done -- Prints route info on windows
 ROUTE PRINT:
Index: dll/win32/schannel/schannel_gnutls.c
===================================================================
--- dll/win32/schannel/schannel_gnutls.c	(revision 67149)
+++ dll/win32/schannel/schannel_gnutls.c	(working copy)
@@ -510,7 +510,7 @@
     wcscat(Path, L"\\");
     wcscat(Path, SONAME_LIBGNUTLS);
 */
-    static const WCHAR Path[] = L"C:\\Reactos\\system32\\gnutls\\libgnutls-28.dll";
+    static const WCHAR Path[] = L"C:\\ReactOS\\system32\\gnutls\\libgnutls-28.dll";
 
     libgnutls_handle = LoadLibraryExW(Path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
     if (!libgnutls_handle)
Index: dll/win32/setupapi/install.c
===================================================================
--- dll/win32/setupapi/install.c	(revision 67149)
+++ dll/win32/setupapi/install.c	(working copy)
@@ -1722,11 +1722,11 @@
     IN OUT LPWSTR *ServiceBinary)
 {
     LPWSTR Buffer;
-    WCHAR ReactosDir[MAX_PATH];
+    WCHAR ReactOSDir[MAX_PATH];
     DWORD RosDirLength, ServiceLength, Win32Length;
 
-    GetWindowsDirectoryW(ReactosDir, MAX_PATH);
-    RosDirLength = strlenW(ReactosDir);
+    GetWindowsDirectoryW(ReactOSDir, MAX_PATH);
+    RosDirLength = strlenW(ReactOSDir);
     ServiceLength = strlenW(*ServiceBinary);
 
     /* Check and fix two things:
@@ -1737,7 +1737,7 @@
     if (ServiceLength < RosDirLength)
         return;
 
-    if (!wcsnicmp(*ServiceBinary, ReactosDir, RosDirLength))
+    if (!wcsnicmp(*ServiceBinary, ReactOSDir, RosDirLength))
     {
         /* Yes, the first part is the C:\ReactOS\, just skip it */
         MoveMemory(*ServiceBinary, *ServiceBinary + RosDirLength + 1,
@@ -2212,7 +2212,7 @@
             if (RequiredSize) *RequiredSize = size;
             goto cleanup;
         }
-            
+
         if (DestinationInfFileNameSize != 0)
         {
             if (WideCharToMultiByte(CP_ACP, 0, DestinationInfFileNameW, -1,
Index: hal/halppc/generic/display.c
===================================================================
--- hal/halppc/generic/display.c	(revision 67149)
+++ hal/halppc/generic/display.c	(working copy)
@@ -82,7 +82,7 @@
  * Last but not least, HalDisplayString is used a lot more in ReactOS,
  * e.g. to print debug messages when the /DEBUGPORT=SCREEN boot option
  * is present.
- * 3 Components are involved in Reactos: HAL, BLUE.SYS and VIDEOPRT.SYS.
+ * 3 Components are involved in ReactOS: HAL, BLUE.SYS and VIDEOPRT.SYS.
  * As in NT, on boot HAL owns the display. When entering the text mode
  * command interpreter, BLUE.SYS kicks in. It will write directly to the
  * screen, more or less behind HALs back.
Index: include/reactos/subsys/win/winmsg.h
===================================================================
--- include/reactos/subsys/win/winmsg.h	(revision 67149)
+++ include/reactos/subsys/win/winmsg.h	(working copy)
@@ -93,7 +93,7 @@
     ULONG Reserved;
     union
     {
-        USER_EXIT_REACTOS ExitReactosRequest;
+        USER_EXIT_REACTOS ExitReactOSRequest;
         USER_END_TASK EndTaskRequest;
         USER_LOGON LogonRequest;
         USER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest;
Index: lib/sdk/crt/math/i386/pow_asm.s
===================================================================
--- lib/sdk/crt/math/i386/pow_asm.s	(revision 67149)
+++ lib/sdk/crt/math/i386/pow_asm.s	(working copy)
@@ -19,7 +19,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* Reactos modifications */
+/* ReactOS modifications */
 #include <asm.inc>
 
 #define ALIGNARG(log2) log2
Index: media/inf/acpi.inf
===================================================================
--- media/inf/acpi.inf	(revision 67149)
+++ media/inf/acpi.inf	(working copy)
@@ -54,7 +54,7 @@
 *PNP0C08.DeviceDesc = "ACPI Hardware"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 
 GenericMfg = "(Dispositivos del sistema estándar)"
 *PNP0C08.DeviceDesc = "Hardware ACPI"
Index: media/inf/audio.inf
===================================================================
--- media/inf/audio.inf	(revision 67149)
+++ media/inf/audio.inf	(working copy)
@@ -76,7 +76,7 @@
 AUDIOClassName = "Audio-, Video- und Gamecontroller"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 AUDIOClassName = "Dispositivos de sonido, vídeo y juegos"
 
 [Strings.0415]
Index: media/inf/battery.inf
===================================================================
--- media/inf/battery.inf	(revision 67149)
+++ media/inf/battery.inf	(working copy)
@@ -80,7 +80,7 @@
 ACPI\ACPI0003.DeviceDesc = "Netzteil"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 BatteryClassName = "Baterías"
 
 GenericMfg = "(Baterías genéricas)"
Index: media/inf/bda.inf
===================================================================
--- media/inf/bda.inf	(revision 67149)
+++ media/inf/bda.inf	(working copy)
@@ -192,7 +192,7 @@
 Pin.Name.NABTS="NABTS"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 
 [Strings.0415]
 ReactOS = "Ekipa ReactOS"
Index: media/inf/bth.inf
===================================================================
--- media/inf/bth.inf	(revision 67149)
+++ media/inf/bth.inf	(working copy)
@@ -61,7 +61,7 @@
 BluetoothClassName="Bluetooth vysílače"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 BTUSB.DeviceDesc="Radio Bluetooth USB genérica"
 BluetoothClassName="Radios Bluetooth"
 
Index: media/inf/c_image.inf
===================================================================
--- media/inf/c_image.inf	(revision 67149)
+++ media/inf/c_image.inf	(working copy)
@@ -28,7 +28,7 @@
 ImageClassName = "Image"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 ImageClassName = "Imagen"
 
 [Strings.0415]
Index: media/inf/cdrom.inf
===================================================================
--- media/inf/cdrom.inf	(revision 67149)
+++ media/inf/cdrom.inf	(working copy)
@@ -69,7 +69,7 @@
 CDROMClassName = "Οδηγοί DVD/CD-ROM"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 CDROMClassName = "Unidades de DVD/CD-ROM"
 GenCdRom.DeviceDesc = "Unidad CD-ROM"
 GenericMfg = "(Unidades de DVD/CD-ROM genéricas)"
Index: media/inf/cpu.inf
===================================================================
--- media/inf/cpu.inf	(revision 67149)
+++ media/inf/cpu.inf	(working copy)
@@ -202,7 +202,7 @@
 Standard = "Πρότυπος επεξεργαστής"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 Processor.DeviceDesc = "Procesador"
 IntelProcessor.DeviceDesc = "Procesador Intel"
 AMDProcessor.DeviceDesc = "Procesador AMD"
Index: media/inf/disk.inf
===================================================================
--- media/inf/disk.inf	(revision 67149)
+++ media/inf/disk.inf	(working copy)
@@ -67,7 +67,7 @@
 Disk.ServiceDesc = "Ovladač disku"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 GenericMfg = "(Unidades de disco genéricas)"
 DiskClassName = "Unidades de disco"
 Disk.DeviceDesc = "Unidad de disco"
Index: media/inf/display.inf
===================================================================
--- media/inf/display.inf	(revision 67149)
+++ media/inf/display.inf	(working copy)
@@ -92,7 +92,7 @@
 VGA.DeviceDesc = "VGA-συμβατή κάρτα γραφικών"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 DisplayClassName = "Adaptadores de pantalla"
 
 StdMfg = "(Adaptador de pantalla estándar)"
Index: media/inf/fdc.inf
===================================================================
--- media/inf/fdc.inf	(revision 67149)
+++ media/inf/fdc.inf	(working copy)
@@ -83,7 +83,7 @@
 *PNP0700.DeviceDesc = "Γενικός ελεγκτής δισκέτας"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 FDCClassName = "Controladores de disquete"
 
 GenericMfg = "(Controlador estándar de disquetes)"
Index: media/inf/flpydisk.inf
===================================================================
--- media/inf/flpydisk.inf	(revision 67149)
+++ media/inf/flpydisk.inf	(working copy)
@@ -72,7 +72,7 @@
 Floppy.DeviceDesc = "Obecná disketová jednotka"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 
 FloppyClassName = "Disqueteras"
 GenericMfg = "(Disqueteras genéricas)"
Index: media/inf/hal.inf
===================================================================
--- media/inf/hal.inf	(revision 67149)
+++ media/inf/hal.inf	(working copy)
@@ -53,7 +53,7 @@
 e_isa_up.DeviceDesc = "Standardní jednoprocesorové PC"
 
 [Strings.0a]
-ReactOS = "Equipo de Reactos"
+ReactOS = "Equipo de ReactOS"
 ComputerClassName = "Equipo"
 
 GenericMfg = "(Equipos genéricos)"
Index: media/inf/hdc.inf
===================================================================
--- media/inf/hdc.inf	(revision 67149)
+++ media/inf/hdc.inf	(working copy)
@@ -1023,7 +1023,7 @@
 PCI\CC_0106.DeviceDesc  = "Generischer Serial ATA Controller"
 
 [Strings.0a]
-ReactOS                 = "Equipo de Reactos"
+ReactOS                 = "Equipo de ReactOS"
 HDCClassName            = "Controladores IDE ATA/ATAPI genéricos"
 GenericMfg              = "(Controladores de disco duro genéricos)"
 
Index: media/inf/kscaptur.inf
===================================================================
--- media/inf/kscaptur.inf	(revision 67149)
+++ media/inf/kscaptur.inf	(working copy)
@@ -38,13 +38,13 @@
 tsbyuv.dll
 
 [VfWWDM]
-HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Description",,"Reactos WDM Image Capture"
-HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"FriendlyName",,"Reactos WDM Image Capture"
+HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Description",,"ReactOS WDM Image Capture"
+HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"FriendlyName",,"ReactOS WDM Image Capture"
 HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Driver",,"vfwwdm.drv"
 
 [VfWWDM.NT]
-HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Description",,"Reactos WDM Image Capture (Win32)"
-HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"FriendlyName",,"Reactos WDM Image Capture (Win32)"
+HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Description",,"ReactOS WDM Image Capture (Win32)"
+HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"FriendlyName",,"ReactOS WDM Image Capture (Win32)"
 HKLM,%MediaResourcesMSVideo%\MSVideo.VFWWDM,"Driver",,"vfwwdm32.dll"
 
 [VfWWDM.AddReg.NT]
@@ -55,7 +55,7 @@
 system.ini,drivers,,"MSVideo.VfWWDM=vfwwdm.drv"
 
 [VfWWDM32.DelFile]
-vfwwdm32.dll 
+vfwwdm32.dll
 
 [VfWWDM.Files]
 vfwwdm.drv
Index: win32ss/include/ntgdityp.h
===================================================================
--- win32ss/include/ntgdityp.h	(revision 67149)
+++ win32ss/include/ntgdityp.h	(working copy)
@@ -110,7 +110,7 @@
     XFORM_FORMAT_LTOL = 0x20,
     XFORM_NO_TRANSLATION = 0x40,
 
-    /* Reactos specific */
+    /* ReactOS specific */
     XFORM_INTEGER = 0x1000,
 };
 
Index: win32ss/user/ntuser/simplecall.c
===================================================================
--- win32ss/user/ntuser/simplecall.c	(revision 67149)
+++ win32ss/user/ntuser/simplecall.c	(working copy)
@@ -109,7 +109,7 @@
          RETURN(0);
       }
 
-      /* this is a Reactos only case and is needed for gui-on-demand */
+      /* this is a ReactOS only case and is needed for gui-on-demand */
       case NOPARAM_ROUTINE_ISCONSOLEMODE:
           RETURN( ScreenDeviceContext == NULL );
 
Index: win32ss/user/user32/misc/exit.c
===================================================================
--- win32ss/user/user32/misc/exit.c	(revision 67149)
+++ win32ss/user/user32/misc/exit.c	(working copy)
@@ -1,4 +1,4 @@
-/* 
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/exit.c
@@ -98,7 +98,7 @@
     MSG msg;
 
     USER_API_MESSAGE ApiMessage;
-    PUSER_EXIT_REACTOS ExitReactosRequest = &ApiMessage.Data.ExitReactosRequest;
+    PUSER_EXIT_REACTOS ExitReactOSRequest = &ApiMessage.Data.ExitReactOSRequest;
 
     /*
      * 1- FIXME: Call NtUserCallOneParam(uFlags, ONEPARAM_ROUTINE_PREPAREFORLOGOFF);
@@ -110,24 +110,24 @@
      *    We can shutdown synchronously or asynchronously.
      */
 
-    // ExitReactosRequest->LastError = ERROR_SUCCESS;
-    ExitReactosRequest->Flags = uFlags;
+    // ExitReactOSRequest->LastError = ERROR_SUCCESS;
+    ExitReactOSRequest->Flags = uFlags;
 
     CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                         NULL,
                         CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpExitWindowsEx),
-                        sizeof(*ExitReactosRequest));
+                        sizeof(*ExitReactOSRequest));
 
     /* Set the last error accordingly */
     if (NT_SUCCESS(ApiMessage.Status) || ApiMessage.Status == STATUS_CANT_WAIT)
     {
-        if (ExitReactosRequest->LastError != ERROR_SUCCESS)
-            UserSetLastError(ExitReactosRequest->LastError);
+        if (ExitReactOSRequest->LastError != ERROR_SUCCESS)
+            UserSetLastError(ExitReactOSRequest->LastError);
     }
     else
     {
         UserSetLastNTError(ApiMessage.Status);
-        ExitReactosRequest->Success = FALSE;
+        ExitReactOSRequest->Success = FALSE;
     }
 
     /*
@@ -136,7 +136,7 @@
      * return the real state of the operation now.
      */
     if (NT_SUCCESS(ApiMessage.Status))
-        return ExitReactosRequest->Success;
+        return ExitReactOSRequest->Success;
 
     /*
      * In case something failed: we have a non-success status and:
Index: win32ss/user/winsrv/usersrv/shutdown.c
===================================================================
--- win32ss/user/winsrv/usersrv/shutdown.c	(revision 67149)
+++ win32ss/user/winsrv/usersrv/shutdown.c	(working copy)
@@ -629,7 +629,7 @@
 }
 
 static NTSTATUS FASTCALL
-UserExitReactos(PCSR_THREAD CsrThread, UINT Flags)
+UserExitReactOS(PCSR_THREAD CsrThread, UINT Flags)
 {
     NTSTATUS Status;
     LUID CallerLuid;
@@ -805,11 +805,11 @@
 CSR_API(SrvExitWindowsEx)
 {
     NTSTATUS Status;
-    PUSER_EXIT_REACTOS ExitReactosRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest;
+    PUSER_EXIT_REACTOS ExitReactOSRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactOSRequest;
 
-    Status = UserExitReactos(CsrGetClientThread(), ExitReactosRequest->Flags);
-    ExitReactosRequest->Success   = NT_SUCCESS(Status);
-    ExitReactosRequest->LastError = GetLastError();
+    Status = UserExitReactOS(CsrGetClientThread(), ExitReactOSRequest->Flags);
+    ExitReactOSRequest->Success   = NT_SUCCESS(Status);
+    ExitReactOSRequest->LastError = GetLastError();
 
     return Status;
 }