diff --git a/ACE/ace/Activation_Queue.cpp b/ACE/ace/Activation_Queue.cpp
index 628ae2e7a8ea7..a330f0b1eff7c 100644
--- a/ACE/ace/Activation_Queue.cpp
+++ b/ACE/ace/Activation_Queue.cpp
@@ -25,9 +25,7 @@ ACE_Activation_Queue::dump () const
   if (this->queue_)
     this->queue_->dump();
   else
-    //FUZZ: disable check_for_NULL
-    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(NULL)\n")));
-    //FUZZ: enable check_for_NULL
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(nullptr)\n")));
 
   ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_HAS_DUMP */
diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp
index f11b76b13a1c6..c7f737ff31428 100644
--- a/ACE/ace/Future.cpp
+++ b/ACE/ace/Future.cpp
@@ -37,11 +37,9 @@ ACE_Future_Rep<T>::dump () const
  (int) this->ref_count_));
   ACELIB_DEBUG ((LM_INFO,"value_:\n"));
   if (this->value_)
-    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n")));
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (non-nullptr)\n")));
   else
-    //FUZZ: disable check_for_NULL
-    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n")));
-    //FUZZ: enable check_for_NULL
+    ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (nullptr)\n")));
 
   ACELIB_DEBUG ((LM_INFO,"value_ready_:\n"));
   this->value_ready_.dump ();
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h
index 7136daf0854f3..dc1a974d0e8c1 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h
@@ -114,13 +114,11 @@ int http_start_response(Session *sn, Request *rq);
 
 char **http_hdrs2env(pblock *pb);
 
-//FUZZ: disable check_for_NULL
 /*
  * http_status sets status to the code n, with reason string r. If r is
- * NULL, the server will attempt to find one for the given status code.
+ * nullptr, the server will attempt to find one for the given status code.
  * If it finds none, it will give "Because I felt like it."
  */
-//FUZZ: enable check_for_NULL
 
 #define protocol_status http_status
 void http_status(Session *sn, Request *rq, int n, char *r);
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
index 09d13504754cd..8358372c93a24 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
@@ -29,13 +29,6 @@
 #define MAXHOSTNAMELEN 64
 #endif
 
-//FUZZ: disable check_for_NULL
-/* SunOS doesn't define NULL */
-#ifndef NULL
-#define NULL 0
-#endif
-//FUZZ: enable check_for_NULL
-
 /* encapsulation of minor UNIX/WIN NT differences */
 #ifdef WIN32
 #define NETREAD(sock, buf, len)         recv(sock, buf, len, 0)
diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp
index 54c3c0087634d..4bd487f31bf10 100644
--- a/ACE/tests/Network_Adapters_Test.cpp
+++ b/ACE/tests/Network_Adapters_Test.cpp
@@ -210,13 +210,11 @@ Echo_Handler::open (ACE_Reactor * const reactor,
                        ACE_TEXT ("reactor is already set.\n")),
                       -1);
 
-  //FUZZ: disable check_for_NULL
   if (!reactor)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%P|%t) Echo_Handler::open - failed: NULL ")
+                       ACE_TEXT ("(%P|%t) Echo_Handler::open - failed: nullptr ")
                        ACE_TEXT ("pointer to reactor provided.\n")),
                       -1);
-  //FUZZ: enable check_for_NULL
 
   this->reactor (reactor);
   this->reply_wait_ = reply_wait;
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index 3901b1ea1c47e..8dd441d15aa34 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -100,9 +100,7 @@ class FooImpl : public POA_Test::Foo
     ACE_DEBUG( (LM_INFO, ". in TestString\n"));
     if (0 == a)
     {
-      //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n"));
-      //FUZZ: enable check_for_NULL
+      ACE_DEBUG( (LM_INFO, "* Incorrect nullptr string given for parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( a ))
@@ -117,9 +115,7 @@ class FooImpl : public POA_Test::Foo
     }
     if (0 == c)
     {
-      //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n"));
-      //FUZZ: enable check_for_NULL
+      ACE_DEBUG( (LM_INFO, "* Incorrect nullptr string given for parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( c ))
@@ -187,9 +183,7 @@ class FooImpl : public POA_Test::Foo
     ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n"));
     if (0 == a.val.in())
     {
-      //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter a\n"));
-      //FUZZ: enable check_for_NULL
+      ACE_DEBUG( (LM_INFO, "* Incorrect nullptr string given for parameter a\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( a.val.in() ))
@@ -204,9 +198,7 @@ class FooImpl : public POA_Test::Foo
     }
     if (0 == c.val.in())
     {
-      //FUZZ: disable check_for_NULL
-      ACE_DEBUG( (LM_INFO, "* Incorrect NULL string given for parameter c\n"));
-      //FUZZ: enable check_for_NULL
+      ACE_DEBUG( (LM_INFO, "* Incorrect nullptr string given for parameter c\n"));
       throw CORBA::BAD_PARAM(0, CORBA::COMPLETED_NO);
     }
     if (1 != ACE_OS::strlen( c.val.in() ))
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index f664cef6d66f2..1ecfcce9ff7c8 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -49,11 +49,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (objref.in () == 0)
         {
-          //FUZZ: disable check_for_NULL
           ACE_ERROR_RETURN  ((LM_ERROR,
-                              "The received objref is NULL\n"),
+                              "The received objref is nullptr\n"),
                              -1);
-          //FUZZ: enable check_for_NULL
         }
 
       Simple_Server_var server =