diff --git a/reactos/drivers/filesystems/npfs_new/secursup.c b/reactos/drivers/filesystems/npfs_new/secursup.c
index f3ef1f1c4ce..d5718f10717 100644
--- a/reactos/drivers/filesystems/npfs_new/secursup.c
+++ b/reactos/drivers/filesystems/npfs_new/secursup.c
@@ -48,7 +48,7 @@ NpFreeClientSecurityContext(IN PSECURITY_CLIENT_CONTEXT ClientContext)
     ClientToken = ClientContext->ClientToken;
     if ((TokenType == TokenPrimary) || (ClientToken))
     {
-        ObfDereferenceObject(ClientToken);
+        ObDereferenceObject(ClientToken);
     }
     ExFreePool(ClientContext);
 }
diff --git a/reactos/drivers/filesystems/npfs_new/strucsup.c b/reactos/drivers/filesystems/npfs_new/strucsup.c
index f8d83d0d654..2c251d9a7f1 100644
--- a/reactos/drivers/filesystems/npfs_new/strucsup.c
+++ b/reactos/drivers/filesystems/npfs_new/strucsup.c
@@ -56,7 +56,7 @@ NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table,
 {
     if (!Buffer) return FALSE;
 
-    ObfDereferenceObject(((PNP_EVENT_BUFFER)Buffer)->Event);
+    ObDereferenceObject(((PNP_EVENT_BUFFER)Buffer)->Event);
     return RtlDeleteElementGenericTable(Table, Buffer);
 }
 
diff --git a/reactos/drivers/filesystems/npfs_new/waitsup.c b/reactos/drivers/filesystems/npfs_new/waitsup.c
index ac3af7992b1..0aedd6d7ff9 100644
--- a/reactos/drivers/filesystems/npfs_new/waitsup.c
+++ b/reactos/drivers/filesystems/npfs_new/waitsup.c
@@ -28,7 +28,7 @@ NpCancelWaitQueueIrp(IN PDEVICE_OBJECT DeviceObject,
 
     WaitQueue = (PNP_WAIT_QUEUE)Irp->Tail.Overlay.DriverContext[0];
 
-    OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock);
+    KeAcquireSpinLock(&WaitQueue->WaitLock, &OldIrql);
 
     WaitEntry = (PNP_WAIT_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[1];
     if (WaitEntry)
@@ -41,7 +41,7 @@ NpCancelWaitQueueIrp(IN PDEVICE_OBJECT DeviceObject,
         }
     }
 
-    KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql);
+    KeReleaseSpinLock(&WaitQueue->WaitLock, OldIrql);
 
     if (WaitEntry)
     {
@@ -65,7 +65,7 @@ NpTimerDispatch(IN PKDPC Dpc,
     KIRQL OldIrql;
     PNP_WAIT_QUEUE_ENTRY WaitEntry = Context;
 
-    OldIrql = KfAcquireSpinLock(&WaitEntry->WaitQueue->WaitLock);
+    KeAcquireSpinLock(&WaitEntry->WaitQueue->WaitLock, &OldIrql);
 
     Irp = WaitEntry->Irp;
     if (Irp)
@@ -79,7 +79,7 @@ NpTimerDispatch(IN PKDPC Dpc,
         }
     }
 
-    KfReleaseSpinLock(&WaitEntry->WaitQueue->WaitLock, OldIrql);
+    KeReleaseSpinLock(&WaitEntry->WaitQueue->WaitLock, OldIrql);
 
     if (Irp)
     {
@@ -125,7 +125,7 @@ NpCancelWaiter(IN PNP_WAIT_QUEUE WaitQueue,
     RtlInitEmptyUnicodeString(&DestinationString, Buffer, PipeName->Length);
     RtlUpcaseUnicodeString(&DestinationString, PipeName, FALSE);
 
-    OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock);
+    KeAcquireSpinLock(&WaitQueue->WaitLock, &OldIrql);
 
     for (NextEntry = WaitQueue->WaitList.Flink;
          NextEntry != &WaitQueue->WaitList;
@@ -187,7 +187,7 @@ CancelWait:
         }
     }
 
-    KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql);
+    KeReleaseSpinLock(&WaitQueue->WaitLock, OldIrql);
 
     ExFreePool(DestinationString.Buffer);
 
@@ -261,7 +261,7 @@ NpAddWaiter(IN PNP_WAIT_QUEUE WaitQueue,
     Irp->Tail.Overlay.DriverContext[0] = WaitQueue;
     Irp->Tail.Overlay.DriverContext[1] = WaitEntry;
 
-    OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock);
+    KeAcquireSpinLock(&WaitQueue->WaitLock, &OldIrql);
 
     IoSetCancelRoutine(Irp, NpCancelWaitQueueIrp);
 
@@ -284,7 +284,7 @@ NpAddWaiter(IN PNP_WAIT_QUEUE WaitQueue,
 
     }
 
-    KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql);
+    KeReleaseSpinLock(&WaitQueue->WaitLock, OldIrql);
     if (WaitEntry) ExFreePool(WaitEntry);
 
     return Status;