diff --git a/src/sys/cleanup.c b/src/sys/cleanup.c
index 2e5b7e45..1366e3ae 100644
--- a/src/sys/cleanup.c
+++ b/src/sys/cleanup.c
@@ -165,7 +165,7 @@ static VOID FspFsvolCleanupRequestFini(FSP_FSCTL_TRANSACT_REQ *Request, PVOID Co
         /* FileNode is Shared Full; reacquire as Exclusive Main for CcUnitializeCacheMap */
         FspFileNodeReleaseOwner(FileNode, Full, Request);
 
-        Success = DEBUGRANDTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Main);
+        Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Main);
         if (!Success)
         {
             /* oh, maaan! we now have to do delayed uninitialize! */
diff --git a/src/sys/create.c b/src/sys/create.c
index 4d441050..d2796fd5 100644
--- a/src/sys/create.c
+++ b/src/sys/create.c
@@ -425,7 +425,7 @@ NTSTATUS FspFsvolCreatePrepare(
         FileObject = FspIopRequestContext(Request, RequestFileObject);
 
         /* lock the FileNode for overwriting */
-        Success = DEBUGRANDTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Full);
+        Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Full);
         if (!Success)
         {
             FspIopRetryPrepareIrp(Irp, &Result);
@@ -698,7 +698,7 @@ static NTSTATUS FspFsvolCreateTryOpen(PIRP Irp, const FSP_FSCTL_TRANSACT_RSP *Re
     FSP_FSCTL_TRANSACT_REQ *Request = FspIrpRequest(Irp);
     BOOLEAN Success;
 
-    Success = DEBUGRANDTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Main);
+    Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Main);
     if (!Success)
     {
         /* repost the IRP to retry later */
diff --git a/src/sys/driver.h b/src/sys/driver.h
index 0bf8f9a5..8e6dbed1 100644
--- a/src/sys/driver.h
+++ b/src/sys/driver.h
@@ -71,13 +71,13 @@ extern __declspec(selectany) int fsp_bp = 1;
 #define DEBUGBREAK()                    do {} while (0,0)
 #endif
 
-/* DEBUGRANDTEST */
+/* DEBUGTEST */
 #if DBG
 extern __declspec(selectany) int fsp_dt = 1;
-#define DEBUGRANDTEST(Percent, Default) \
+#define DEBUGTEST(Percent, Default)     \
     (!fsp_dt || DebugRandom() <= (Percent) * 0x7fff / 100 ? (Default) : !(Default))
 #else
-#define DEBUGRANDTEST(Percent, Default) (Default)
+#define DEBUGTEST(Percent, Default)     (Default)
 #endif
 
 /* FSP_ENTER/FSP_LEAVE */
diff --git a/src/sys/fileinfo.c b/src/sys/fileinfo.c
index ef662165..c6407827 100644
--- a/src/sys/fileinfo.c
+++ b/src/sys/fileinfo.c
@@ -497,7 +497,7 @@ NTSTATUS FspFsvolQueryInformationComplete(
         FspFileNodeReleaseOwner(FileNode, Full, Request);
     }
 
-    Success = DEBUGRANDTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Main);
+    Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Main);
     if (!Success)
     {
         FspIopRetryCompleteIrp(Irp, Response, &Result);
diff --git a/src/sys/security.c b/src/sys/security.c
index 460ce6db..6fa9c2d3 100644
--- a/src/sys/security.c
+++ b/src/sys/security.c
@@ -135,7 +135,7 @@ NTSTATUS FspFsvolQuerySecurityComplete(
         FspFileNodeReleaseOwner(FileNode, Full, Request);
     }
 
-    Success = DEBUGRANDTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Main);
+    Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Main);
     if (!Success)
     {
         FspIopRetryCompleteIrp(Irp, Response, &Result);
diff --git a/src/sys/util.c b/src/sys/util.c
index 302a81d9..c850f679 100644
--- a/src/sys/util.c
+++ b/src/sys/util.c
@@ -78,7 +78,7 @@ PVOID FspAllocatePoolMustSucceed(POOL_TYPE PoolType, SIZE_T Size, ULONG Tag)
 
     for (ULONG i = 0, n = sizeof(Delays) / sizeof(Delays[0]);; i++)
     {
-        Result = DEBUGRANDTEST(95, TRUE) ? ExAllocatePoolWithTag(PoolType, Size, Tag) : 0;
+        Result = DEBUGTEST(95, TRUE) ? ExAllocatePoolWithTag(PoolType, Size, Tag) : 0;
         if (0 != Result)
             return Result;
 
@@ -96,7 +96,7 @@ PVOID FspAllocateIrpMustSucceed(CCHAR StackSize)
 
     for (ULONG i = 0, n = sizeof(Delays) / sizeof(Delays[0]);; i++)
     {
-        Result = DEBUGRANDTEST(95, TRUE) ? IoAllocateIrp(StackSize, FALSE) : 0;
+        Result = DEBUGTEST(95, TRUE) ? IoAllocateIrp(StackSize, FALSE) : 0;
         if (0 != Result)
             return Result;
 
diff --git a/src/sys/write.c b/src/sys/write.c
index 523365bc..d21fea7e 100644
--- a/src/sys/write.c
+++ b/src/sys/write.c
@@ -111,7 +111,7 @@ static NTSTATUS FspFsvolWriteCached(
     ASSERT(FileNode == FileDesc->FileNode);
 
     /* should we defer the write? */
-    Success = DEBUGRANDTEST(90, TRUE) && CcCanIWrite(FileObject, WriteLength, CanWait, Retrying);
+    Success = DEBUGTEST(90, TRUE) && CcCanIWrite(FileObject, WriteLength, CanWait, Retrying);
     if (!Success)
     {
         Result = FspWqCreateIrpWorkItem(Irp, FspFsvolWriteCached, 0);
@@ -127,7 +127,7 @@ static NTSTATUS FspFsvolWriteCached(
     }
 
     /* try to acquire the FileNode Main exclusive */
-    Success = DEBUGRANDTEST(90, TRUE) &&
+    Success = DEBUGTEST(90, TRUE) &&
         FspFileNodeTryAcquireExclusiveF(FileNode, FspFileNodeAcquireMain, CanWait);
     if (!Success)
         return FspWqRepostIrpWorkItem(Irp, FspFsvolWriteCached, 0);
@@ -320,7 +320,7 @@ NTSTATUS FspFsvolWritePrepare(
     PEPROCESS Process;
     BOOLEAN Success;
 
-    Success = DEBUGRANDTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Full);
+    Success = DEBUGTEST(90, TRUE) && FspFileNodeTryAcquireExclusive(FileNode, Full);
     if (!Success)
     {
         FspIopRetryPrepareIrp(Irp, &Result);