@@ -21,7 +21,8 @@ const subSystemLabelsMap = new Map([
   [/^src\/timer_/, ['c++', 'timers']],
   [/^src\/(?:CNNICHashWhitelist|node_root_certs|tls_)/, ['c++', 'tls']],
   [/^src\/tty_/, ['c++', 'tty']],
-  [/^src\/node_url/, ['c++', 'url', 'dont-land-on-v4.x', 'dont-land-on-v6.x']],
+  [/^src\/node_url/, ['c++', 'url-whatwg',
+                      'dont-land-on-v4.x', 'dont-land-on-v6.x']],
   [/^src\/node_util/, ['c++', 'util']],
   [/^src\/(?:node_v8|v8abbr)/, ['c++', 'V8']],
   [/^src\/node_contextify/, ['c++', 'vm']],
@@ -62,7 +63,8 @@ const subSystemLabelsMap = new Map([
   [/^lib\/\w+\/v8_prof_/, 'tools'],
   [/^lib\/\w+\/socket_list/, 'net'],
   [/^lib\/\w+\/streams$/, 'stream'],
-  [/^lib\/internal\/url\.js$/, ['url', 'dont-land-on-v4.x', 'dont-land-on-v6.x']],
+  [/^lib\/internal\/url\.js$/, ['url-whatwg',
+                                'dont-land-on-v4.x', 'dont-land-on-v6.x']],
   // All other lib/ files map directly
   [/^lib\/_(\w+)_\w+\.js?$/, '$1'], // e.g. _(stream)_wrap
   [/^lib(\/internal)?\/(\w+)\.js?$/, '$2'], // other .js files
 
@@ -124,7 +124,7 @@ const srcCases = [
      'tls_wrap.cc',
      'tls_wrap.h'] ],
   [ 'tty', ['tty_wrap.cc', 'tty_wrap.h'] ],
-  [ ['url', 'dont-land-on-v4.x', 'dont-land-on-v6.x'],
+  [ ['url-whatwg', 'dont-land-on-v4.x', 'dont-land-on-v6.x'],
     ['node_url.cc', 'node_url.h'] ],
   [ 'util', ['node_util.cc'] ],
   [ 'V8', ['node_v8.cc', 'v8abbr.h'] ],
@@ -415,7 +415,7 @@ tap.test('label: dont-land-on labels for WHATWG URL', (t) => {
     'lib/internal/url.js'
   ])
 
-  t.same(labels, ['url', 'dont-land-on-v4.x', 'dont-land-on-v6.x'])
+  t.same(labels, ['url-whatwg', 'dont-land-on-v4.x', 'dont-land-on-v6.x'])
 
   t.end()
 })