From d9776abea67dcbbfe67ab65fc0b1b589352963ab Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Mon, 5 Oct 2015 15:09:52 -0600
Subject: [PATCH] Rename Atom to AtomEnvironment

---
 src/{atom.coffee => atom-environment.coffee} | 2 +-
 src/initialize-application-window.coffee     | 4 ++--
 src/initialize-test-window.coffee            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{atom.coffee => atom-environment.coffee} (99%)

diff --git a/src/atom.coffee b/src/atom-environment.coffee
similarity index 99%
rename from src/atom.coffee
rename to src/atom-environment.coffee
index eed53dbf1..e613361f8 100644
--- a/src/atom.coffee
+++ b/src/atom-environment.coffee
@@ -40,7 +40,7 @@ TextEditorElement = require './text-editor-element'
 #
 # An instance of this class is always available as the `atom` global.
 module.exports =
-class Atom extends Model
+class AtomEnvironment extends Model
   @version: 1  # Increment this when the serialization format changes
 
   workspaceParentSelectorctor: 'body'
diff --git a/src/initialize-application-window.coffee b/src/initialize-application-window.coffee
index a10cc9dba..b10208bb1 100644
--- a/src/initialize-application-window.coffee
+++ b/src/initialize-application-window.coffee
@@ -14,8 +14,8 @@ process.env.NODE_PATH = exportsPath
 # Make React faster
 process.env.NODE_ENV ?= 'production' unless devMode
 
-Atom = require './atom'
-window.atom = new Atom
+AtomEnvironment = require './atom-environment'
+window.atom = new AtomEnvironment
 
 atom.displayWindow()
 atom.loadStateSync()
diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee
index ad854d89a..9e60fa372 100644
--- a/src/initialize-test-window.coffee
+++ b/src/initialize-test-window.coffee
@@ -6,8 +6,8 @@ try
   ipc = require 'ipc'
 
   require '../src/window'
-  Atom = require '../src/atom'
-  window.atom = new Atom
+  AtomEnvironment = require '../src/atom-environment'
+  window.atom = new AtomEnvironment
 
   # Show window synchronously so a focusout doesn't fire on input elements
   # that are focused in the very first spec run.