diff --git a/PUBLISHING.md b/PUBLISHING.md
index 7b09fc7f..61edfc61 100644
--- a/PUBLISHING.md
+++ b/PUBLISHING.md
@@ -1,7 +1,7 @@
-Publishing Resin Etcher
-=======================
+Publishing Etcher
+=================
 
-This is a small guide to package and publish Resin Etcher to all supported operating systems.
+This is a small guide to package and publish Etcher to all supported operating systems.
 
 Packaging
 ---------
@@ -14,7 +14,7 @@ Make sure you install npm dependencies with `--force` since there might be optio
 npm install --force
 ```
 
-Run the following command to package Resin Etcher
+Run the following command to package Etcher
 
 ```sh
 make installer-osx
diff --git a/lib/browser/app.js b/lib/browser/app.js
index e74106ff..6b2021ed 100644
--- a/lib/browser/app.js
+++ b/lib/browser/app.js
@@ -15,7 +15,7 @@
  */
 
 /**
- * @module ResinEtcher
+ * @module Etcher
  */
 
 'use strict';
@@ -33,15 +33,15 @@ require('./browser/modules/drive-scanner');
 require('./browser/modules/image-writer');
 require('./browser/modules/path');
 
-const app = angular.module('ResinEtcher', [
+const app = angular.module('Etcher', [
   'ui.bootstrap',
   'TrackJS',
 
-  // Resin Etcher modules
-  'ResinEtcher.path',
-  'ResinEtcher.selection-state',
-  'ResinEtcher.drive-scanner',
-  'ResinEtcher.image-writer'
+  // Etcher modules
+  'Etcher.path',
+  'Etcher.selection-state',
+  'Etcher.drive-scanner',
+  'Etcher.image-writer'
 ]);
 
 app.controller('AppController', function($q, $log, DriveScannerService, SelectionStateService, ImageWriterService) {
diff --git a/lib/browser/modules/drive-scanner.js b/lib/browser/modules/drive-scanner.js
index 437bdf07..da5f7811 100644
--- a/lib/browser/modules/drive-scanner.js
+++ b/lib/browser/modules/drive-scanner.js
@@ -17,7 +17,7 @@
 'use strict';
 
 /**
- * @module ResinEtcher.drive-scanner
+ * @module Etcher.drive-scanner
  */
 
 const angular = require('angular');
@@ -35,7 +35,7 @@ if (window.mocha) {
   var dialog = electron.remote.require('./src/dialog');
 }
 
-const driveScanner = angular.module('ResinEtcher.drive-scanner', []);
+const driveScanner = angular.module('Etcher.drive-scanner', []);
 
 driveScanner.service('DriveScannerService', function($q, $interval, $timeout) {
   let self = this;
diff --git a/lib/browser/modules/image-writer.js b/lib/browser/modules/image-writer.js
index 9416bb94..efecc2d5 100644
--- a/lib/browser/modules/image-writer.js
+++ b/lib/browser/modules/image-writer.js
@@ -17,7 +17,7 @@
 'use strict';
 
 /**
- * @module ResinEtcher.image-writer
+ * @module Etcher.image-writer
  */
 
 const angular = require('angular');
@@ -29,7 +29,7 @@ if (window.mocha) {
   var writer = electron.remote.require('./src/writer');
 }
 
-const imageWriter = angular.module('ResinEtcher.image-writer', []);
+const imageWriter = angular.module('Etcher.image-writer', []);
 
 imageWriter.service('ImageWriterService', function($q, $timeout) {
   let self = this;
diff --git a/lib/browser/modules/path.js b/lib/browser/modules/path.js
index 2450e92e..4337aa00 100644
--- a/lib/browser/modules/path.js
+++ b/lib/browser/modules/path.js
@@ -17,13 +17,13 @@
 'use strict';
 
 /**
- * @module ResinEtcher.path
+ * @module Etcher.path
  */
 
 const angular = require('angular');
 const path = require('path');
 
-const pathModule = angular.module('ResinEtcher.path', []);
+const pathModule = angular.module('Etcher.path', []);
 
 pathModule.filter('basename', function() {
 
diff --git a/lib/browser/modules/selection-state.js b/lib/browser/modules/selection-state.js
index 80c5b524..c62290c2 100644
--- a/lib/browser/modules/selection-state.js
+++ b/lib/browser/modules/selection-state.js
@@ -17,12 +17,12 @@
 'use strict';
 
 /**
- * @module ResinEtcher.selection-state
+ * @module Etcher.selection-state
  */
 
 const _ = require('lodash');
 const angular = require('angular');
-const selectionState = angular.module('ResinEtcher.selection-state', []);
+const selectionState = angular.module('Etcher.selection-state', []);
 
 selectionState.service('SelectionStateService', function() {
   let self = this;
diff --git a/lib/elevate.js b/lib/elevate.js
index 017f9f7d..bb09d542 100644
--- a/lib/elevate.js
+++ b/lib/elevate.js
@@ -40,7 +40,7 @@ exports.require = function(app, callback) {
         app.dock.hide();
 
         sudoPrompt.exec(process.argv.join(' '), {
-          name: 'Resin Etcher'
+          name: 'Etcher'
         }, function(error) {
           if (error) {
             electron.dialog.showErrorBox('Elevation Error', error.message);
diff --git a/lib/index.html b/lib/index.html
index 73e173ef..2eebd04e 100644
--- a/lib/index.html
+++ b/lib/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Resin Etcher</title>
+    <title>Etcher</title>
     <link rel="stylesheet" type="text/css" href="../node_modules/flexboxgrid/dist/flexboxgrid.css">
     <link rel="stylesheet" type="text/css" href="../build/css/main.css">
     <link rel="stylesheet" type="text/css" href="css/desktop.css">
@@ -17,7 +17,7 @@
     <script src="../node_modules/trackjs/tracker.js" data-token="032448bc3d9e4cffb1e9b43d29d6c142"></script>
     <script src="./browser/app.js"></script>
   </head>
-  <body ng-app="ResinEtcher" ng-controller="AppController as app" style="display: none">
+  <body ng-app="Etcher" ng-controller="AppController as app" style="display: none">
     <div class="content row middle-xs space-horizontal-large">
       <div class="col-xs">
         <div class="row around-xs space-bottom-huge" ng-hide="app.state.progress == 100 && !app.writer.isBurning()">
diff --git a/tests/browser/modules/drive-scanner.spec.js b/tests/browser/modules/drive-scanner.spec.js
index 0a204155..ce797f42 100644
--- a/tests/browser/modules/drive-scanner.spec.js
+++ b/tests/browser/modules/drive-scanner.spec.js
@@ -7,7 +7,7 @@ require('../../../lib/browser/modules/drive-scanner');
 
 describe('Browser: DriveScanner', function() {
 
-  beforeEach(angular.mock.module('ResinEtcher.drive-scanner'));
+  beforeEach(angular.mock.module('Etcher.drive-scanner'));
 
   describe('DriveScannerService', function() {
 
diff --git a/tests/browser/modules/image-writer.spec.js b/tests/browser/modules/image-writer.spec.js
index 31546e73..3bcf4bb2 100644
--- a/tests/browser/modules/image-writer.spec.js
+++ b/tests/browser/modules/image-writer.spec.js
@@ -7,7 +7,7 @@ require('../../../lib/browser/modules/image-writer');
 
 describe('Browser: ImageWriter', function() {
 
-  beforeEach(angular.mock.module('ResinEtcher.image-writer'));
+  beforeEach(angular.mock.module('Etcher.image-writer'));
 
   describe('ImageWriterService', function() {
 
diff --git a/tests/browser/modules/path.spec.js b/tests/browser/modules/path.spec.js
index 0eeb467c..1664cb18 100644
--- a/tests/browser/modules/path.spec.js
+++ b/tests/browser/modules/path.spec.js
@@ -8,7 +8,7 @@ require('../../../lib/browser/modules/path');
 
 describe('Browser: Path', function() {
 
-  beforeEach(angular.mock.module('ResinEtcher.path'));
+  beforeEach(angular.mock.module('Etcher.path'));
 
   describe('BasenameFilter', function() {
 
diff --git a/tests/browser/modules/selection-state.spec.js b/tests/browser/modules/selection-state.spec.js
index abdacfe5..0e0588b5 100644
--- a/tests/browser/modules/selection-state.spec.js
+++ b/tests/browser/modules/selection-state.spec.js
@@ -7,7 +7,7 @@ require('../../../lib/browser/modules/selection-state');
 
 describe('Browser: SelectionState', function() {
 
-  beforeEach(angular.mock.module('ResinEtcher.selection-state'));
+  beforeEach(angular.mock.module('Etcher.selection-state'));
 
   describe('SelectionStateService', function() {