diff --git a/src/sys/driver.h b/src/sys/driver.h
index aeee17c4..667b8221 100644
--- a/src/sys/driver.h
+++ b/src/sys/driver.h
@@ -119,12 +119,12 @@
                 {                       \
                     /* this can only happen if the Ioq was stopped */\
                     ASSERT(FspIoqStopped(&FsvrtDeviceExtension->Ioq));\
-                    FspIopCompleteRequest(Irp, Result = STATUS_CANCELLED);\
+                    FspIopCompleteIrp(Irp, Result = STATUS_CANCELLED);\
                 }                       \
             }                           \
         }                               \
         else                            \
-            FspIopCompleteRequestEx(Irp, Result, fsp_device_release);\
+            FspIopCompleteIrpEx(Irp, Result, fsp_device_release);\
     );                                  \
     return Result
 #define FSP_ENTER_IOP(...)              \
@@ -148,7 +148,7 @@
             __VA_ARGS__,                \
             NtStatusSym(Result),        \
             (LONGLONG)Irp->IoStatus.Information);\
-        FspIopCompleteRequest(Irp, Result);\
+        FspIopCompleteIrp(Irp, Result);\
     )
 #define FSP_ENTER_BOOL(...)             \
     BOOLEAN Result = TRUE; FSP_ENTER_(__VA_ARGS__)
@@ -261,11 +261,11 @@ PIRP FspIoqEndProcessingIrp(FSP_IOQ *Ioq, UINT_PTR IrpHint);
 /* I/O processing */
 NTSTATUS FspIopCreateRequest(
     PIRP Irp, PUNICODE_STRING FileName, ULONG ExtraSize, FSP_FSCTL_TRANSACT_REQ **PRequest);
-VOID FspIopCompleteRequestEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceRelease);
+VOID FspIopCompleteIrpEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceRelease);
 static inline
-VOID FspIopCompleteRequest(PIRP Irp, NTSTATUS Result)
+VOID FspIopCompleteIrp(PIRP Irp, NTSTATUS Result)
 {
-    FspIopCompleteRequestEx(Irp, Result, TRUE);
+    FspIopCompleteIrpEx(Irp, Result, TRUE);
 }
 NTSTATUS FspIopDispatchPrepare(PIRP Irp, FSP_FSCTL_TRANSACT_REQ *Request);
 VOID FspIopDispatchComplete(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Response);
diff --git a/src/sys/fsctl.c b/src/sys/fsctl.c
index e0e156fd..6c429733 100644
--- a/src/sys/fsctl.c
+++ b/src/sys/fsctl.c
@@ -395,7 +395,7 @@ retry:
 
         Result = FspIopDispatchPrepare(PendingIrp, PendingIrpRequest);
         if (!NT_SUCCESS(Result))
-            FspIopCompleteRequest(PendingIrp, Result);
+            FspIopCompleteIrp(PendingIrp, Result);
         else
         {
             NextRequest = FspFsctlTransactProduceRequest(
@@ -415,7 +415,7 @@ retry:
                  * also cancel the PendingIrp we have in our hands.
                  */
                 ASSERT(FspIoqStopped(&FsvrtDeviceExtension->Ioq));
-                FspIopCompleteRequest(PendingIrp, STATUS_CANCELLED);
+                FspIopCompleteIrp(PendingIrp, STATUS_CANCELLED);
                 return STATUS_CANCELLED;
             }
 
diff --git a/src/sys/iop.c b/src/sys/iop.c
index f34250ae..02fe38e0 100644
--- a/src/sys/iop.c
+++ b/src/sys/iop.c
@@ -60,7 +60,7 @@ NTSTATUS FspIopCreateRequest(
     return STATUS_SUCCESS;
 }
 
-VOID FspIopCompleteRequestEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceRelease)
+VOID FspIopCompleteIrpEx(PIRP Irp, NTSTATUS Result, BOOLEAN DeviceRelease)
 {
     // !PAGED_CODE();
 
diff --git a/src/sys/ioq.c b/src/sys/ioq.c
index 598a396b..3a4cf318 100644
--- a/src/sys/ioq.c
+++ b/src/sys/ioq.c
@@ -100,7 +100,7 @@ static VOID FspIoqPendingReleaseLock(PIO_CSQ IoCsq, _IRQL_restores_ KIRQL Irql)
 
 static VOID FspIoqPendingCompleteCanceledIrp(PIO_CSQ IoCsq, PIRP Irp)
 {
-    FspIopCompleteRequest(Irp, STATUS_CANCELLED);
+    FspIopCompleteIrp(Irp, STATUS_CANCELLED);
 }
 
 static NTSTATUS FspIoqProcessInsertIrpEx(PIO_CSQ IoCsq, PIRP Irp, PVOID InsertContext)
@@ -151,7 +151,7 @@ static VOID FspIoqProcessReleaseLock(PIO_CSQ IoCsq, _IRQL_restores_ KIRQL Irql)
 
 static VOID FspIoqProcessCompleteCanceledIrp(PIO_CSQ IoCsq, PIRP Irp)
 {
-    FspIopCompleteRequest(Irp, STATUS_CANCELLED);
+    FspIopCompleteIrp(Irp, STATUS_CANCELLED);
 }
 
 VOID FspIoqInitialize(FSP_IOQ *Ioq)