diff --git a/Protocols/AppleKeyFeeder/AppleKeyFeeder.c b/Protocols/AppleKeyFeeder/AppleKeyFeeder.c
index 316041fc0..1568b20d9 100644
--- a/Protocols/AppleKeyFeeder/AppleKeyFeeder.c
+++ b/Protocols/AppleKeyFeeder/AppleKeyFeeder.c
@@ -29,7 +29,7 @@
 //  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
 // in package DSC file
 
-#ifdef CLOVER_DEBUG
+#ifdef JIEF_DEBUG
 #define DBG_APPLEKEYFEEDER 2
 #endif
 
diff --git a/Protocols/AppleKeyFeeder/AppleKeyMapUtils.c b/Protocols/AppleKeyFeeder/AppleKeyMapUtils.c
index 2a7dd6756..a95c8e5d1 100644
--- a/Protocols/AppleKeyFeeder/AppleKeyMapUtils.c
+++ b/Protocols/AppleKeyFeeder/AppleKeyMapUtils.c
@@ -25,7 +25,7 @@
 //  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
 // in package DSC file
 
-#ifdef CLOVER_DEBUG
+#ifdef JIEF_DEBUG
 #define DBG_APPLEKEYFEEDER 2
 #endif
 
diff --git a/Protocols/AppleKeyFeeder/SimpleTextExProxy.c b/Protocols/AppleKeyFeeder/SimpleTextExProxy.c
index 61b61b31a..fb1c27416 100644
--- a/Protocols/AppleKeyFeeder/SimpleTextExProxy.c
+++ b/Protocols/AppleKeyFeeder/SimpleTextExProxy.c
@@ -27,7 +27,7 @@
 //  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
 // in package DSC file
 
-#ifdef CLOVER_DEBUG
+#ifdef JIEF_DEBUG
 #define DBG_APPLEKEYFEEDER 0
 #endif
 
diff --git a/Protocols/AppleKeyFeeder/SimpleTextProxy.c b/Protocols/AppleKeyFeeder/SimpleTextProxy.c
index 26ece21c4..75fdb8c42 100644
--- a/Protocols/AppleKeyFeeder/SimpleTextProxy.c
+++ b/Protocols/AppleKeyFeeder/SimpleTextProxy.c
@@ -28,7 +28,7 @@
 //  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xFFFFFFFF
 // in package DSC file
 
-#ifdef CLOVER_DEBUG
+#ifdef JIEF_DEBUG
 #define DBG_APPLEKEYFEEDER 2
 #endif
 
diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp
index 0a1163edd..cf2593046 100644
--- a/rEFIt_UEFI/refit/main.cpp
+++ b/rEFIt_UEFI/refit/main.cpp
@@ -165,7 +165,7 @@ static EFI_STATUS LoadEFIImageList(IN EFI_DEVICE_PATH **DevicePaths,
     if (NewImageHandle != NULL) {
       *NewImageHandle = ChildImageHandle;
     }
-#ifdef CLOVER_DEBUG
+#ifdef JIEF_DEBUG
     EFI_LOADED_IMAGE_PROTOCOL* loadedBootImage = NULL;
     if (!EFI_ERROR(Status = gBS->HandleProtocol(ChildImageHandle, &gEfiLoadedImageProtocolGuid, (void**)(&loadedBootImage)))) {
         DBG("%S : Image base = 0x%lx", ImageTitle, loadedBootImage->ImageBase); // Jief : Do not change this, it's used by grep to feed the debugger
@@ -2072,7 +2072,7 @@ RefitMain (IN EFI_HANDLE           ImageHandle,
 
 
   construct_globals_objects(); // do this after SelfLoadedImage is initialized
-#ifdef DEBUG_CLOVER
+#ifdef JIEF_DEBUG
 DBG("g_str = %s\n", g_str.data());
 DBG("g_str2 = %s\n", g_str2.data());
 extern XStringW global_str1;