diff --git a/src/atom.coffee b/src/atom.coffee
index 3cc30c31e..760831b95 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -28,7 +28,7 @@ WindowEventHandler = require './window-event-handler'
 #  * `atom.menu`        - A {MenuManager} instance
 #  * `atom.workspaceView`    - A {WorkspaceView} instance
 #  * `atom.packages`    - A {PackageManager} instance
-#  * `atom.pasteboard`  - A {Pasteboard} instance
+#  * `atom.clipboard`   - A {Clipboard} instance
 #  * `atom.project`     - A {Project} instance
 #  * `atom.syntax`      - A {Syntax} instance
 #  * `atom.themes`      - A {ThemeManager} instance
@@ -134,7 +134,7 @@ class Atom extends Model
     Config = require './config'
     Keymap = require './keymap'
     PackageManager = require './package-manager'
-    Pasteboard = require './pasteboard'
+    Clipboard = require './clipboard'
     Syntax = require './syntax'
     ThemeManager = require './theme-manager'
     ContextMenuManager = require './context-menu-manager'
@@ -148,7 +148,11 @@ class Atom extends Model
     @themes = new ThemeManager({packageManager: @packages, configDirPath, resourcePath})
     @contextMenu = new ContextMenuManager(devMode)
     @menu = new MenuManager({resourcePath})
-    @pasteboard = new Pasteboard()
+    @clipboard = new Clipboard()
+
+    # TODO Remove once packages have been updated
+    @pasteboard = @clipboard
+
     @syntax = @deserializers.deserialize(@state.syntax) ? new Syntax()
 
     @subscribe @packages, 'activated', => @watchThemes()
diff --git a/src/pasteboard.coffee b/src/clipboard.coffee
similarity index 91%
rename from src/pasteboard.coffee
rename to src/clipboard.coffee
index 4b019ae78..152edb7c9 100644
--- a/src/pasteboard.coffee
+++ b/src/clipboard.coffee
@@ -3,9 +3,9 @@ crypto = require 'crypto'
 
 # Public: Represents the clipboard used for copying and pasting in Atom.
 #
-# A pasteboard instance is always available under the `atom.pasteboard` global.
+# A clipboard instance is always available under the `atom.clipboard` global.
 module.exports =
-class Pasteboard
+class Clipboard
   metadata: null
   signatureForMetadata: null