diff --git a/xtldr2/config.c b/xtldr2/config.c
index 22c8de4..b3f845a 100644
--- a/xtldr2/config.c
+++ b/xtldr2/config.c
@@ -55,13 +55,13 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
     SIZE_T Length;
 
     /* Tokenize provided options */
-    Argument = RtlWideStringTokenize(Options, L" ", &LastArg);
+    Argument = RtlTokenizeWideString(Options, L" ", &LastArg);
 
     /* Iterate over all arguments passed to boot loader */
     while(Argument != NULL)
     {
         /* Check all provided parameters */
-        if(RtlWideStringCompare(Argument, L"DEFAULT=", 8) == 0)
+        if(RtlCompareWideString(Argument, L"DEFAULT=", 8) == 0)
         {
             /* Skip to the argument value and calculate argument length */
             Argument += 8;
@@ -72,7 +72,7 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
             RtlCopyMemory(BlpConfiguration.Default, Argument, (Length * sizeof(WCHAR)) - 1);
             BlpConfiguration.Default[Length] = '\0';
         }
-        else if(RtlWideStringCompare(Argument, L"DEBUG=", 6) == 0)
+        else if(RtlCompareWideString(Argument, L"DEBUG=", 6) == 0)
         {
             /* Skip to the argument value */
             Argument += 6;
@@ -87,12 +87,12 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
                 BlpConfiguration.Debug[Length] = '\0';
             }
         }
-        else if(RtlWideStringCompare(Argument, L"SHELL", 5) == 0)
+        else if(RtlCompareWideString(Argument, L"SHELL", 5) == 0)
         {
             /* Force shell mode */
             BlpConfiguration.Shell = TRUE;
         }
-        else if(RtlWideStringCompare(Argument, L"TIMEOUT=", 8) == 0)
+        else if(RtlCompareWideString(Argument, L"TIMEOUT=", 8) == 0)
         {
             /* Skip to the argument value */
             Argument += 8;
@@ -108,7 +108,7 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
                 Argument++;
             }
         }
-        else if(RtlWideStringCompare(Argument, L"TUNE=", 5) == 0)
+        else if(RtlCompareWideString(Argument, L"TUNE=", 5) == 0)
         {
             /* Skip to the argument value */
             Argument += 5;
@@ -121,6 +121,6 @@ BlpUpdateGlobalConfiguration(IN PWCHAR Options)
         }
 
         /* Take next argument */
-        Argument = RtlWideStringTokenize(NULL, L" ", &LastArg);
+        Argument = RtlTokenizeWideString(NULL, L" ", &LastArg);
     }
 }
diff --git a/xtldr2/console.c b/xtldr2/console.c
index c0911c9..08f2341 100644
--- a/xtldr2/console.c
+++ b/xtldr2/console.c
@@ -79,7 +79,7 @@ BlConsolePrint(IN PUINT16 Format,
     BlpStringPrint(BlpConsolePrintChar, Format, Arguments);
 
     /* Print to serial console only if not running under OVMF */
-    if(RtlWideStringCompare(EfiSystemTable->FirmwareVendor, L"EDK II", 6) != 0)
+    if(RtlCompareWideString(EfiSystemTable->FirmwareVendor, L"EDK II", 6) != 0)
     {
         /* Check if debugging enabled and if EFI serial port is fully initialized */
         if(DEBUG && (BlpSerialPort.Flags & COMPORT_FLAG_INIT))
diff --git a/xtldr2/debug.c b/xtldr2/debug.c
index 3a4b689..87b4a08 100644
--- a/xtldr2/debug.c
+++ b/xtldr2/debug.c
@@ -78,13 +78,13 @@ BlpInitializeDebugConsole()
     if(BlpConfiguration.Debug)
     {
         /* Find all debug ports */
-        DebugPort = RtlWideStringTokenize(BlpConfiguration.Debug, L";", &LastPort);
+        DebugPort = RtlTokenizeWideString(BlpConfiguration.Debug, L";", &LastPort);
 
         /* Iterate over all debug ports */
         while(DebugPort != NULL)
         {
             /* Check what port is set for debugging */
-            if(RtlWideStringCompare(DebugPort, L"COM", 3) == 0)
+            if(RtlCompareWideString(DebugPort, L"COM", 3) == 0)
             {
                 /* Read COM port number */
                 DebugPort += 3;
@@ -97,7 +97,7 @@ BlpInitializeDebugConsole()
                 }
 
                 /* Check if custom COM port address supplied */
-                if(PortNumber == 0 && RtlWideStringCompare(DebugPort, L":0x", 3) == 0)
+                if(PortNumber == 0 && RtlCompareWideString(DebugPort, L":0x", 3) == 0)
                 {
                     /* COM port address provided */
                     DebugPort += 3;
@@ -140,7 +140,7 @@ BlpInitializeDebugConsole()
                 /* Enable debug port */
                 BlpConfiguration.DebugPort |= XTBL_DEBUGPORT_SERIAL;
             }
-            else if(RtlWideStringCompare(DebugPort, L"SCREEN", 5) == 0)
+            else if(RtlCompareWideString(DebugPort, L"SCREEN", 5) == 0)
             {
                 /* Enable debug port */
                 BlpConfiguration.DebugPort |= XTBL_DEBUGPORT_SCREEN;
@@ -153,7 +153,7 @@ BlpInitializeDebugConsole()
             }
 
             /* Take next debug port */
-            DebugPort = RtlWideStringTokenize(NULL, L";", &LastPort);
+            DebugPort = RtlTokenizeWideString(NULL, L";", &LastPort);
         }
     }