diff --git a/spec/config-spec.js b/spec/config-spec.js
index 34fddc79..048f360b 100644
--- a/spec/config-spec.js
+++ b/spec/config-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { configDefaults } from '../src/lib/atom-xterm-config'
+import { configDefaults } from '../src/lib/config'
 
 import os from 'os'
 import path from 'path'
diff --git a/spec/delete-profile-element-spec.js b/spec/delete-profile-element-spec.js
index 4b0401e8..45a4dd12 100644
--- a/spec/delete-profile-element-spec.js
+++ b/spec/delete-profile-element-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermDeleteProfileElement } from '../src/lib/atom-xterm-delete-profile-element'
+import { AtomXtermDeleteProfileElement } from '../src/lib/delete-profile-element'
 
 describe('AtomXtermDeleteProfileElement', () => {
 	this.model = null
diff --git a/spec/delete-profile-model-spec.js b/spec/delete-profile-model-spec.js
index 7e011caf..78003e29 100644
--- a/spec/delete-profile-model-spec.js
+++ b/spec/delete-profile-model-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermDeleteProfileModel } from '../src/lib/atom-xterm-delete-profile-model'
+import { AtomXtermDeleteProfileModel } from '../src/lib/delete-profile-model'
 
 describe('AtomXtermDeleteProfileModel', () => {
 	this.atomXtermProfileMenuElement = null
diff --git a/spec/element-spec.js b/spec/element-spec.js
index 88809d50..acf19ad9 100644
--- a/spec/element-spec.js
+++ b/spec/element-spec.js
@@ -20,9 +20,9 @@
 import * as nodePty from 'node-pty-prebuilt-multiarch'
 import { shell } from 'electron'
 
-import { configDefaults } from '../src/lib/atom-xterm-config'
-import { AtomXtermElement } from '../src/lib/atom-xterm-element'
-import { AtomXtermModel } from '../src/lib/atom-xterm-model'
+import { configDefaults } from '../src/lib/config'
+import { AtomXtermElement } from '../src/lib/element'
+import { AtomXtermModel } from '../src/lib/model'
 
 import path from 'path'
 
diff --git a/spec/model-spec.js b/spec/model-spec.js
index 02680654..91df46bf 100644
--- a/spec/model-spec.js
+++ b/spec/model-spec.js
@@ -19,9 +19,9 @@
 
 import { Emitter } from 'atom'
 
-import { configDefaults } from '../src/lib/atom-xterm-config'
-import { AtomXtermModel, isAtomXtermModel, currentItemIsAtomXtermModel } from '../src/lib/atom-xterm-model'
-import { AtomXtermProfilesSingleton } from '../src/lib/atom-xterm-profiles'
+import { configDefaults } from '../src/lib/config'
+import { AtomXtermModel, isAtomXtermModel, currentItemIsAtomXtermModel } from '../src/lib/model'
+import { AtomXtermProfilesSingleton } from '../src/lib/profiles'
 
 import fs from 'fs-extra'
 import path from 'path'
diff --git a/spec/overwrite-profile-element-spec.js b/spec/overwrite-profile-element-spec.js
index d268ad5b..18ab1b0e 100644
--- a/spec/overwrite-profile-element-spec.js
+++ b/spec/overwrite-profile-element-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermOverwriteProfileElement } from '../src/lib/atom-xterm-overwrite-profile-element'
+import { AtomXtermOverwriteProfileElement } from '../src/lib/overwrite-profile-element'
 
 describe('AtomXtermOverwriteProfileElement', () => {
 	this.model = null
diff --git a/spec/overwrite-profile-model-spec.js b/spec/overwrite-profile-model-spec.js
index 705ffd0f..884ada86 100644
--- a/spec/overwrite-profile-model-spec.js
+++ b/spec/overwrite-profile-model-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermOverwriteProfileModel } from '../src/lib/atom-xterm-overwrite-profile-model'
+import { AtomXtermOverwriteProfileModel } from '../src/lib/overwrite-profile-model'
 
 describe('AtomXtermOverwriteProfileModel', () => {
 	this.atomXtermSaveProfileModel = null
diff --git a/spec/profile-menu-element-spec.js b/spec/profile-menu-element-spec.js
index 6b884b2b..25b2c4e0 100644
--- a/spec/profile-menu-element-spec.js
+++ b/spec/profile-menu-element-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermProfileMenuElement } from '../src/lib/atom-xterm-profile-menu-element'
+import { AtomXtermProfileMenuElement } from '../src/lib/profile-menu-element'
 
 describe('AtomXtermProfileMenuElement', () => {
 	this.element = null
diff --git a/spec/profile-menu-model-spec.js b/spec/profile-menu-model-spec.js
index 6aefec9b..5f4946c8 100644
--- a/spec/profile-menu-model-spec.js
+++ b/spec/profile-menu-model-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermProfileMenuModel } from '../src/lib/atom-xterm-profile-menu-model'
+import { AtomXtermProfileMenuModel } from '../src/lib/profile-menu-model'
 
 describe('AtomXtermProfileMenuModel', () => {
 	this.atomXtermModel = null
diff --git a/spec/profiles-spec.js b/spec/profiles-spec.js
index b7e1fba0..e15b9d59 100644
--- a/spec/profiles-spec.js
+++ b/spec/profiles-spec.js
@@ -19,8 +19,8 @@
 
 import { CompositeDisposable } from 'atom'
 
-import { configDefaults } from '../src/lib/atom-xterm-config'
-import { AtomXtermProfilesSingleton } from '../src/lib/atom-xterm-profiles'
+import { configDefaults } from '../src/lib/config'
+import { AtomXtermProfilesSingleton } from '../src/lib/profiles'
 
 import path from 'path'
 
diff --git a/spec/save-profile-element-spec.js b/spec/save-profile-element-spec.js
index d88c906f..d73744a8 100644
--- a/spec/save-profile-element-spec.js
+++ b/spec/save-profile-element-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermSaveProfileElement } from '../src/lib/atom-xterm-save-profile-element'
+import { AtomXtermSaveProfileElement } from '../src/lib/save-profile-element'
 
 describe('AtomXtermSaveProfileElement', () => {
 	this.model = null
diff --git a/spec/save-profile-model-spec.js b/spec/save-profile-model-spec.js
index 3bcaa916..74d7f723 100644
--- a/spec/save-profile-model-spec.js
+++ b/spec/save-profile-model-spec.js
@@ -17,8 +17,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermSaveProfileModel } from '../src/lib/atom-xterm-save-profile-model'
-import * as atomXtermModelModule from '../src/lib/atom-xterm-model'
+import { AtomXtermSaveProfileModel } from '../src/lib/save-profile-model'
+import * as atomXtermModelModule from '../src/lib/model'
 
 describe('AtomXtermSaveProfileModel', () => {
 	this.atomXtermProfileMenuElement = null
diff --git a/spec/utils-spec.js b/spec/utils-spec.js
index 175ff2c4..3819303a 100644
--- a/spec/utils-spec.js
+++ b/spec/utils-spec.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import * as utils from '../src/lib/atom-xterm-utils'
+import * as utils from '../src/lib/utils'
 
 describe('Utilities', () => {
 	it('clearDiv()', () => {
diff --git a/src/lib/delete-profile-element.js b/src/lib/delete-profile-element.js
index 9b7f00b8..c505d95a 100644
--- a/src/lib/delete-profile-element.js
+++ b/src/lib/delete-profile-element.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { clearDiv, createHorizontalLine } from './atom-xterm-utils'
+import { clearDiv, createHorizontalLine } from './utils'
 
 class AtomXtermDeleteProfileElementImpl extends HTMLElement {
 	initialize (model) {
diff --git a/src/lib/delete-profile-model.js b/src/lib/delete-profile-model.js
index c0aba732..e075fddd 100644
--- a/src/lib/delete-profile-model.js
+++ b/src/lib/delete-profile-model.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermProfilesSingleton } from './atom-xterm-profiles'
+import { AtomXtermProfilesSingleton } from './profiles'
 
 class AtomXtermDeleteProfileModel {
 	constructor (atomXtermProfileMenuElement) {
diff --git a/src/lib/element.js b/src/lib/element.js
index c34e577f..34c854de 100644
--- a/src/lib/element.js
+++ b/src/lib/element.js
@@ -25,10 +25,10 @@ import { WebLinksAddon } from 'xterm-addon-web-links'
 import { WebglAddon } from 'xterm-addon-webgl'
 import { shell } from 'electron'
 
-import { configDefaults, COLORS } from './atom-xterm-config'
-import { AtomXtermProfileMenuElement } from './atom-xterm-profile-menu-element'
-import { AtomXtermProfileMenuModel } from './atom-xterm-profile-menu-model'
-import { AtomXtermProfilesSingleton } from './atom-xterm-profiles'
+import { configDefaults, COLORS } from './config'
+import { AtomXtermProfileMenuElement } from './profile-menu-element'
+import { AtomXtermProfileMenuModel } from './profile-menu-model'
+import { AtomXtermProfilesSingleton } from './profiles'
 
 import fs from 'fs-extra'
 
diff --git a/src/lib/model.js b/src/lib/model.js
index 97d306d2..86cb40d8 100644
--- a/src/lib/model.js
+++ b/src/lib/model.js
@@ -19,7 +19,7 @@
 
 import { Emitter } from 'atom'
 
-import { AtomXtermProfilesSingleton } from './atom-xterm-profiles'
+import { AtomXtermProfilesSingleton } from './profiles'
 
 import fs from 'fs-extra'
 import path from 'path'
diff --git a/src/lib/overwrite-profile-element.js b/src/lib/overwrite-profile-element.js
index 610255b9..5cc52454 100644
--- a/src/lib/overwrite-profile-element.js
+++ b/src/lib/overwrite-profile-element.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { clearDiv, createHorizontalLine } from './atom-xterm-utils'
+import { clearDiv, createHorizontalLine } from './utils'
 
 class AtomXtermOverwriteProfileElementImpl extends HTMLElement {
 	initialize (model) {
diff --git a/src/lib/overwrite-profile-model.js b/src/lib/overwrite-profile-model.js
index 5500dda4..628a7d3a 100644
--- a/src/lib/overwrite-profile-model.js
+++ b/src/lib/overwrite-profile-model.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { AtomXtermProfilesSingleton } from './atom-xterm-profiles'
+import { AtomXtermProfilesSingleton } from './profiles'
 
 class AtomXtermOverwriteProfileModel {
 	constructor (atomXtermSaveProfileModel) {
diff --git a/src/lib/profile-menu-element.js b/src/lib/profile-menu-element.js
index 177e0a1a..3bc99492 100644
--- a/src/lib/profile-menu-element.js
+++ b/src/lib/profile-menu-element.js
@@ -19,11 +19,11 @@
 
 import { CompositeDisposable, TextEditor } from 'atom'
 
-import { AtomXtermProfilesSingleton } from './atom-xterm-profiles'
-import { AtomXtermDeleteProfileModel } from './atom-xterm-delete-profile-model'
-import { AtomXtermSaveProfileModel } from './atom-xterm-save-profile-model'
-import { createHorizontalLine } from './atom-xterm-utils'
-import { config, COLORS } from './atom-xterm-config.js'
+import { AtomXtermProfilesSingleton } from './profiles'
+import { AtomXtermDeleteProfileModel } from './delete-profile-model'
+import { AtomXtermSaveProfileModel } from './save-profile-model'
+import { createHorizontalLine } from './utils'
+import { config, COLORS } from './config.js'
 
 class AtomXtermProfileMenuElementImpl extends HTMLElement {
 	async initialize (model) {
diff --git a/src/lib/profiles.js b/src/lib/profiles.js
index be0868d2..d2081c5a 100644
--- a/src/lib/profiles.js
+++ b/src/lib/profiles.js
@@ -19,7 +19,7 @@
 
 import { Emitter } from 'atom'
 
-import { configDefaults, COLORS } from './atom-xterm-config'
+import { configDefaults, COLORS } from './config'
 
 import fs from 'fs-extra'
 import path from 'path'
diff --git a/src/lib/save-profile-element.js b/src/lib/save-profile-element.js
index 30255017..a35d5a1c 100644
--- a/src/lib/save-profile-element.js
+++ b/src/lib/save-profile-element.js
@@ -17,7 +17,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { clearDiv } from './atom-xterm-utils'
+import { clearDiv } from './utils'
 
 class AtomXtermSaveProfileElementImpl extends HTMLElement {
 	initialize (model) {
diff --git a/src/lib/save-profile-model.js b/src/lib/save-profile-model.js
index 49ecefa9..de3f2d3d 100644
--- a/src/lib/save-profile-model.js
+++ b/src/lib/save-profile-model.js
@@ -19,9 +19,9 @@
 
 import { TextEditor } from 'atom'
 
-import { AtomXtermProfilesSingleton } from './atom-xterm-profiles'
-import { AtomXtermOverwriteProfileModel } from './atom-xterm-overwrite-profile-model'
-import { currentItemIsAtomXtermModel } from './atom-xterm-model'
+import { AtomXtermProfilesSingleton } from './profiles'
+import { AtomXtermOverwriteProfileModel } from './overwrite-profile-model'
+import { currentItemIsAtomXtermModel } from './model'
 
 class AtomXtermSaveProfileModel {
 	constructor (atomXtermProfileMenuElement) {
diff --git a/src/lib/x-terminal.js b/src/lib/x-terminal.js
index 515aa6e0..8518ec13 100644
--- a/src/lib/x-terminal.js
+++ b/src/lib/x-terminal.js
@@ -22,18 +22,18 @@ import '../styles/atom-xterm.sass'
 
 import { CompositeDisposable } from 'atom'
 
-import { COLORS } from './atom-xterm-config'
-import { AtomXtermElement } from './atom-xterm-element'
-import { AtomXtermModel, isAtomXtermModel } from './atom-xterm-model'
-import { ATOM_XTERM_BASE_URI, AtomXtermProfilesSingleton } from './atom-xterm-profiles'
-import { AtomXtermProfileMenuElement } from './atom-xterm-profile-menu-element'
-import { AtomXtermProfileMenuModel } from './atom-xterm-profile-menu-model'
-import { AtomXtermDeleteProfileElement } from './atom-xterm-delete-profile-element'
-import { AtomXtermDeleteProfileModel } from './atom-xterm-delete-profile-model'
-import { AtomXtermOverwriteProfileElement } from './atom-xterm-overwrite-profile-element'
-import { AtomXtermOverwriteProfileModel } from './atom-xterm-overwrite-profile-model'
-import { AtomXtermSaveProfileElement } from './atom-xterm-save-profile-element'
-import { AtomXtermSaveProfileModel } from './atom-xterm-save-profile-model'
+import { COLORS } from './config'
+import { AtomXtermElement } from './element'
+import { AtomXtermModel, isAtomXtermModel } from './model'
+import { ATOM_XTERM_BASE_URI, AtomXtermProfilesSingleton } from './profiles'
+import { AtomXtermProfileMenuElement } from './profile-menu-element'
+import { AtomXtermProfileMenuModel } from './profile-menu-model'
+import { AtomXtermDeleteProfileElement } from './delete-profile-element'
+import { AtomXtermDeleteProfileModel } from './delete-profile-model'
+import { AtomXtermOverwriteProfileElement } from './overwrite-profile-element'
+import { AtomXtermOverwriteProfileModel } from './overwrite-profile-model'
+import { AtomXtermSaveProfileElement } from './save-profile-element'
+import { AtomXtermSaveProfileModel } from './save-profile-model'
 
 import { URL } from 'whatwg-url'
 
@@ -433,7 +433,7 @@ class AtomXtermSingleton {
 	}
 }
 
-export { config } from './atom-xterm-config'
+export { config } from './config'
 
 export function activate (state) {
 	return AtomXtermSingleton.instance.activate(state)