diff --git a/tools/cef_parser.py b/tools/cef_parser.py
index 0f5757398..0be989d82 100644
--- a/tools/cef_parser.py
+++ b/tools/cef_parser.py
@@ -1586,12 +1586,13 @@ class obj_argument:
       return 'CefString()'
     elif type == 'refptr_same' or type == 'refptr_diff' or \
          type == 'rawptr_same' or type == 'rawptr_diff':
-      return 'NULL'
+      if for_capi:
+        return 'NULL'
+      return 'nullptr'
     elif type == 'ownptr_same' or type == 'ownptr_diff':
       if for_capi:
         return 'NULL'
-      else:
-        return 'CefOwnPtr<' + self.type.get_ptr_type() + '>()'
+      return 'CefOwnPtr<' + self.type.get_ptr_type() + '>()'
 
     return ''
 
diff --git a/tools/make_cpptoc_impl.py b/tools/make_cpptoc_impl.py
index ec9d38320..305244be3 100644
--- a/tools/make_cpptoc_impl.py
+++ b/tools/make_cpptoc_impl.py
@@ -375,7 +375,7 @@ def make_cpptoc_function_impl_new(cls, name, func, defined_names, base_scoped):
                 '\n        *'+arg_name+' = '+assign+';'\
                 '\n      }'\
                 '\n    } else {'\
-                '\n      *'+arg_name+' = NULL;'\
+                '\n      *'+arg_name+' = nullptr;'\
                 '\n    }'\
                 '\n  }'
     elif arg_type == 'string_vec_byref':
@@ -643,13 +643,13 @@ def make_cpptoc_class_impl(header, clsname, impl):
              'template<> CefRawPtr<'+clsname+'> '+parent_sig+'::UnwrapDerivedRaw(CefWrapperType type, '+capiname+'* s) {\n' + \
              unwrapderived[1] + \
              '  NOTREACHED() << "Unexpected class type: " << type;\n'+ \
-             '  return NULL;\n'+ \
+             '  return nullptr;\n'+ \
              '}\n\n'
   else:
     const += 'template<> CefRefPtr<'+clsname+'> '+parent_sig+'::UnwrapDerived(CefWrapperType type, '+capiname+'* s) {\n' + \
              unwrapderived + \
              '  NOTREACHED() << "Unexpected class type: " << type;\n'+ \
-             '  return NULL;\n'+ \
+             '  return nullptr;\n'+ \
              '}\n\n'
 
   const += 'template<> CefWrapperType ' + parent_sig + '::kWrapperType = ' + get_wrapper_type_enum(
diff --git a/tools/make_ctocpp_impl.py b/tools/make_ctocpp_impl.py
index b5da14ff4..52dd9c52c 100644
--- a/tools/make_ctocpp_impl.py
+++ b/tools/make_ctocpp_impl.py
@@ -388,7 +388,7 @@ def make_ctocpp_function_impl_new(clsname, name, func, base_scoped):
                 '\n      '+arg_name+' = '+assign+';'\
                 '\n    }'\
                 '\n  } else {'\
-                '\n    '+arg_name+' = NULL;'\
+                '\n    '+arg_name+' = nullptr;'\
                 '\n  }'
     elif arg_type == 'string_vec_byref':
       result += comment+\
@@ -635,18 +635,18 @@ def make_ctocpp_class_impl(header, clsname, impl):
     const += 'template<> '+capiname+'* '+parent_sig+'::UnwrapDerivedOwn(CefWrapperType type, CefOwnPtr<'+clsname+'> c) {\n'+ \
              unwrapderived[0] + \
              '  NOTREACHED() << "Unexpected class type: " << type;\n'+ \
-             '  return NULL;\n'+ \
+             '  return nullptr;\n'+ \
              '}\n\n' + \
              'template<> '+capiname+'* '+parent_sig+'::UnwrapDerivedRaw(CefWrapperType type, CefRawPtr<'+clsname+'> c) {\n'+ \
              unwrapderived[1] + \
              '  NOTREACHED() << "Unexpected class type: " << type;\n'+ \
-             '  return NULL;\n'+ \
+             '  return nullptr;\n'+ \
              '}\n\n'
   else:
     const += 'template<> '+capiname+'* '+parent_sig+'::UnwrapDerived(CefWrapperType type, '+clsname+'* c) {\n'+ \
              unwrapderived + \
              '  NOTREACHED() << "Unexpected class type: " << type;\n'+ \
-             '  return NULL;\n'+ \
+             '  return nullptr;\n'+ \
              '}\n\n'
 
   const += 'template<> CefWrapperType ' + parent_sig + '::kWrapperType = ' + get_wrapper_type_enum(
diff --git a/tools/make_libcef_dll_dylib_impl.py b/tools/make_libcef_dll_dylib_impl.py
index 848acce18..14e36967f 100644
--- a/tools/make_libcef_dll_dylib_impl.py
+++ b/tools/make_libcef_dll_dylib_impl.py
@@ -125,7 +125,7 @@ def make_libcef_dll_dylib_impl(header):
 
 namespace {
 
-void* g_libcef_handle = NULL;
+void* g_libcef_handle = nullptr;
 
 void* libcef_get_ptr(const char* path, const char* name) {
   void* ptr = dlsym(g_libcef_handle, name);
@@ -179,7 +179,7 @@ int cef_unload_library() {
     if (!result) {
       fprintf(stderr, "dlclose: %s\\n", dlerror());
     }
-    g_libcef_handle = NULL;
+    g_libcef_handle = nullptr;
   }
   return result;
 }