diff --git a/reactos/drivers/dd/ide/ide.c b/reactos/drivers/dd/ide/ide.c
index 69945a163c1..f02e57f216e 100644
--- a/reactos/drivers/dd/ide/ide.c
+++ b/reactos/drivers/dd/ide/ide.c
@@ -1,4 +1,4 @@
-/* $Id: ide.c,v 1.60 2004/02/10 16:22:55 navaraf Exp $
+/* $Id: ide.c,v 1.61 2004/05/07 05:12:10 royce Exp $
  *
  *  IDE.C - IDE Disk driver 
  *     written by Rex Jolliff
@@ -1576,7 +1576,7 @@ STDCALL IDEStartIo(IN PDEVICE_OBJECT DeviceObject,
     default:
       Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
       Irp->IoStatus.Information = 0;
-      KeBugCheck((ULONG)Irp);
+      KEBUGCHECK((ULONG)Irp);
       IoCompleteRequest(Irp, IO_NO_INCREMENT);
       IoStartNextPacket(DeviceObject, FALSE);
       break;
diff --git a/reactos/lib/kjs/ksrc/compat.c b/reactos/lib/kjs/ksrc/compat.c
index 5245fbd80d9..52b71d76aa0 100644
--- a/reactos/lib/kjs/ksrc/compat.c
+++ b/reactos/lib/kjs/ksrc/compat.c
@@ -4,7 +4,7 @@
 #include "jsconfig.h"
 
 void __kernel_abort() {
-  KeBugCheck(0);
+  KEBUGCHECK(0);
 }
 
 void _assert( const char *expr, const char *file, int line ) {
diff --git a/reactos/lib/kjs/ksrc/js.c b/reactos/lib/kjs/ksrc/js.c
index 4fc2e5603b3..38a802f3fb4 100644
--- a/reactos/lib/kjs/ksrc/js.c
+++ b/reactos/lib/kjs/ksrc/js.c
@@ -24,7 +24,7 @@
 
 /*
  * $Source: /cygdrive/c/RCVS/CVS/ReactOS/reactos/lib/kjs/ksrc/js.c,v $
- * $Id: js.c,v 1.1 2004/01/10 20:38:17 arty Exp $
+ * $Id: js.c,v 1.2 2004/05/07 05:12:10 royce Exp $
  */
 
 #include "js.h"
@@ -226,7 +226,7 @@ js_create_interp (JSInterpOptions *options, PKJS kjs)
 			     options->stacktrace_on_error,
 			     s_stdin, s_stdout, s_stderr);
   if (interp->vm == NULL)
-    KeBugCheck(0);
+    KEBUGCHECK(0);
 
   /* Set some options. */
   interp->vm->warn_undef = options->warn_undef;
@@ -253,17 +253,17 @@ js_create_interp (JSInterpOptions *options, PKJS kjs)
       /* Define compiler to the virtual machine. */
       bc = js_bc_read_data (js_compiler_bytecode, js_compiler_bytecode_len);
       if (bc == NULL)
-	KeBugCheck(0);
+	KEBUGCHECK(0);
 
       result = js_vm_execute (interp->vm, bc);
       js_bc_free (bc);
       if (!result)
-	KeBugCheck(0);
+	KEBUGCHECK(0);
     }
 
   /* Initialize our extensions. */
   if (!js_define_module (interp, js_core_globals))
-    KeBugCheck(0);
+    KEBUGCHECK(0);
 
   /* Ok, we'r done. */
   return interp;
diff --git a/reactos/ntoskrnl/inbv/inbv.c b/reactos/ntoskrnl/inbv/inbv.c
index f3ef7983de6..0333d5d4fbd 100755
--- a/reactos/ntoskrnl/inbv/inbv.c
+++ b/reactos/ntoskrnl/inbv/inbv.c
@@ -1,4 +1,4 @@
-/* $Id: inbv.c,v 1.6 2004/01/20 21:08:40 navaraf Exp $
+/* $Id: inbv.c,v 1.7 2004/05/07 05:12:10 royce Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -121,7 +121,7 @@ InbvEnableBootDriver(IN BOOLEAN Enable)
 				     sizeof(BootVidFunctionTable));
       if (!NT_SUCCESS(Status))
 	{
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       BootVidDriverInstalled = TRUE;
       CHECKPOINT;
@@ -140,7 +140,7 @@ InbvEnableBootDriver(IN BOOLEAN Enable)
 				     0);
       if (!NT_SUCCESS(Status))
 	{
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       BootVidDriverInstalled = FALSE;
       /* Notify the hal we have released the display. */
diff --git a/reactos/ntoskrnl/ke/catch.c b/reactos/ntoskrnl/ke/catch.c
index 2007b72f59b..f0c274790f7 100644
--- a/reactos/ntoskrnl/ke/catch.c
+++ b/reactos/ntoskrnl/ke/catch.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: catch.c,v 1.41 2004/03/13 18:21:57 dwelch Exp $
+/* $Id: catch.c,v 1.42 2004/05/07 05:12:10 royce Exp $
  *
  * PROJECT:              ReactOS kernel
  * FILE:                 ntoskrnl/ke/catch.c
@@ -169,7 +169,7 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
 	    {
 	      DPRINT("ExceptionRecord->ExceptionAddress = 0x%x\n",
 		     ExceptionRecord->ExceptionAddress );
-              KeBugCheckWithTf(KMODE_EXCEPTION_NOT_HANDLED, 0, 0, 0, 0, Tf);	      
+              KEBUGCHECKWITHTF(KMODE_EXCEPTION_NOT_HANDLED, 0, 0, 0, 0, Tf);	      
 	    }
 	}
     }