url -> URI

src/main-process/atom-application.coffee

@@ -666,12 +666,12 @@ class AtomApplication
 
     windowInitializationScript ?= require.resolve('../initialize-application-window')
     if @lastFocusedWindow?
-      @lastFocusedWindow.sendUrlMessage url
+      @lastFocusedWindow.sendURIMessage url
     else
       windowDimensions = @getDimensionsForNewWindow()
       @lastFocusedWindow = new AtomWindow(this, @fileRecoveryService, {resourcePath, windowInitializationScript, devMode, safeMode, windowDimensions, env})
       @lastFocusedWindow.on 'window:loaded', =>
-        @lastFocusedWindow.sendUrlMessage url
+        @lastFocusedWindow.sendURIMessage url
 
   findPackageWithName: (packageName, devMode) ->
     _.find @getPackageManager(devMode).getAvailablePackageMetadata(), ({name}) -> name is packageName

src/main-process/atom-window.coffee

@@ -232,8 +232,8 @@ class AtomWindow
       unless @atomApplication.sendCommandToFirstResponder(command)
         @sendCommandToBrowserWindow(command, args...)
 
-  sendUrlMessage: (url) ->
-    @browserWindow.webContents.send 'url-message', url
+  sendURIMessage: (uri) ->
+    @browserWindow.webContents.send 'uri-message', uri
 
   sendCommandToBrowserWindow: (command, args...) ->
     action = if args[0]?.contextCommand then 'context-command' else 'command'

src/main-process/parse-command-line.js

@@ -58,15 +58,15 @@ module.exports = function parseCommandLine (processArgs) {
   options.string('user-data-dir')
   options.boolean('clear-window-state').describe('clear-window-state', 'Delete all Atom environment state.')
   options.boolean('enable-electron-logging').describe('enable-electron-logging', 'Enable low-level logging messages from Electron.')
-  options.boolean('url-handler')
+  options.boolean('uri-handler')
 
   let args = options.argv
 
-  // If --url-handler is set, then we parse NOTHING else
-  if (args.urlHandler) {
+  // If --uri-handler is set, then we parse NOTHING else
+  if (args.uriHandler) {
     args = {
-      urlHandler: true,
-      'url-handler': true,
+      uriHandler: true,
+      'uri-handler': true,
       _: args._.filter(str => str.startsWith('atom://')).slice(0, 1)
     }
   }