diff --git a/codesign b/codesign
index 09b352e61..cfd83c10b 100755
--- a/codesign
+++ b/codesign
@@ -28,8 +28,8 @@ if [ -d "$FRAMEWORKS_PATH/Squirrel.framework/Versions/A" ]; then
   codesign --deep -fs "$APP_KEY" --entitlements child.plist "$FRAMEWORKS_PATH/Squirrel.framework/Versions/A"
 fi
 
-codesign --deep -fs "$APP_KEY" --entitlements nodes.plist "$FRAMEWORKS_PATH/node/eth/eth"
-codesign --deep -fs "$APP_KEY" --entitlements nodes.plist "$FRAMEWORKS_PATH/node/geth/geth"
+codesign --deep -fs "$APP_KEY" --entitlements nodes.plist "$FRAMEWORKS_PATH/node/exp/exp"
+codesign --deep -fs "$APP_KEY" --entitlements nodes.plist "$FRAMEWORKS_PATH/node/gexp/gexp"
 
 
 codesign -fs "$APP_KEY" --entitlements parent.plist "$APP_PATH"
diff --git a/gulpfile.js b/gulpfile.js
index 95ccc33be..a50e2e809 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -270,7 +270,7 @@ gulp.task('change-files', ['create-binaries'], function() {
             ])
             .pipe(gulp.dest(destPath +'/exp')));
 
-        // copy geth node binaries
+        // copy gexp node binaries
         streams.push(gulp.src([
             './nodes/gexp/'+ os + '/*'
             ])
diff --git a/interface/client/templates/popupWindows/sendTransactionConfirmation.js b/interface/client/templates/popupWindows/sendTransactionConfirmation.js
index 9f43e9350..3d2b8cb2c 100644
--- a/interface/client/templates/popupWindows/sendTransactionConfirmation.js
+++ b/interface/client/templates/popupWindows/sendTransactionConfirmation.js
@@ -118,7 +118,7 @@ Template['popupWindows_sendTransactionConfirmation'].helpers({
             return ExpTools.formatBalance(new BigNumber(gas, 10).times(new BigNumber(this.gasPrice, 10)), '0,0.0[0000000] unit', 'expanse');
     },
     /**
-    Calculates the provided gas amount in ether
+    Calculates the provided gas amount in expanse
 
     @method (providedGas)
     */
@@ -163,7 +163,7 @@ Template['popupWindows_sendTransactionConfirmation'].helpers({
 
 Template['popupWindows_sendTransactionConfirmation'].events({
     /**
-    Gets the new provided gas in ether amount and calculates the resulting providedGas
+    Gets the new provided gas in expanse amount and calculates the resulting providedGas
 
     @event change .provided-gas, input .provided-gas
     */
diff --git a/main.js b/main.js
index 0ec4322cf..76fe483ab 100644
--- a/main.js
+++ b/main.js
@@ -167,7 +167,7 @@ app.on('before-quit', function(event){
     if(!killedSockets)
         event.preventDefault();
 
-    // CLEAR open IPC sockets to geth
+    // CLEAR open IPC sockets to gexp
     _.each(global.sockets, function(socket){
         if(socket) {
             log.info('Closing socket', socket.id);
@@ -204,7 +204,7 @@ app.on('before-quit', function(event){
 // }
 
 var appStartWindow;
-var nodeType = 'geth';
+var nodeType = 'gexp';
 var logFunction = function(data) {
     data = data.toString().replace(/[\r\n]+/,'');
     log.trace('NODE LOG:', data);
@@ -346,7 +346,7 @@ app.on('ready', function() {
     appStartWindow.webContents.on('did-finish-load', function() {
 
 
-        // START GETH
+        // START gexp
         const checkNodeSync = require('./modules/checkNodeSync.js');
         const net = require('net');
         const socket = new net.Socket();
@@ -363,7 +363,7 @@ app.on('ready', function() {
         socket.on('error', function(e){
             log.debug('Gexp connection REFUSED', count);
 
-            // if no geth is running, try starting your own
+            // if no gexp is running, try starting your own
             if(count === 0) {
                 count++;
 
@@ -489,7 +489,7 @@ app.on('ready', function() {
                     var geth = !!global.nodes.geth;
 
                     ethereumNodes.stopNodes(function(){
-                        ethereumNodes.startNode(geth ? 'geth' : 'eth', testnet, function(){
+                        ethereumNodes.startNode(geth ? 'gexp' : 'exp', testnet, function(){
                             log.info('Changed to ', (testnet ? 'testnet' : 'mainnet'));
                             appMenu();
                         });
diff --git a/modules/ethereumNodes.js b/modules/ethereumNodes.js
index ca63811ae..fa5004de1 100644
--- a/modules/ethereumNodes.js
+++ b/modules/ethereumNodes.js
@@ -23,7 +23,7 @@ module.exports = {
 
         var node = global.nodes.geth || global.nodes.eth;
 
-        // kill running geth
+        // kill running gexp
         if(node) {
             node.stderr.removeAllListeners('data');
             node.stdout.removeAllListeners('data');
@@ -58,7 +58,7 @@ module.exports = {
     Starts a node of type
 
     @method startNode
-    @param {String} type the node e.g. "geth" or "eth"
+    @param {String} type the node e.g. "gexp" or "exp"
     @param {Boolean} testnet
     @param {Function} callback will be called after successfull start
     */
@@ -70,7 +70,7 @@ module.exports = {
 
         log.info('Start node from '+ binPath);
 
-        if(type === 'eth') {
+        if(type === 'exp') {
 
             var modalWindow = popupWindow.show('unlockMasterPassword', {width: 400, height: 220, alwaysOnTop: true}, null, null, true);
             modalWindow.on('closed', function() {
@@ -175,11 +175,11 @@ module.exports = {
 
             // START TESTNET
             if(testnet) {
-                args = (type === 'geth') ? ['--testnet', '--fast'] : ['--morden', '--unsafe-transactions'];
+                args = (type === 'gexp') ? ['--testnet', '--fast'] : ['--morden', '--unsafe-transactions'];
 
             // START MAINNET
             } else {
-                args = (type === 'geth') ? ['--fast', '--cache','512'] : ['--unsafe-transactions', '--master', pw];
+                args = (type === 'gexp') ? ['--fast', '--cache','512'] : ['--unsafe-transactions', '--master', pw];
                 pw = null;
             }
 
@@ -196,9 +196,9 @@ module.exports = {
                     if(popupCallback) {
                         popupCallback('noBinary');
 
-                        // set default to geth, to prevent beeing unable to start the wallet
-                        if(type === 'eth')
-                            _this._writeNodeToFile('geth', testnet);
+                        // set default to gexp, to prevent beeing unable to start the wallet
+                        if(type === 'exp')
+                            _this._writeNodeToFile('gexp', testnet);
                     }
                 }
             });
@@ -207,13 +207,13 @@ module.exports = {
             global.nodes[type].once('exit',function(){
 
                 // If is eth then the password was typed wrong
-                if(!cbCalled && type === 'eth') {
+                if(!cbCalled && type === 'exp') {
 
                     if(popupCallback)
                         popupCallback('passwordWrong');
 
-                    // set default to geth, to prevent beeing unable to start the wallet
-                    _this._writeNodeToFile('geth', testnet);
+                    // set default to gexp, to prevent beeing unable to start the wallet
+                    _this._writeNodeToFile('gexp', testnet);
 
                     log.warn('Password wrong '+ type +' node!');
                 }
@@ -224,8 +224,8 @@ module.exports = {
 
                 if(!cbCalled && _.isFunction(callback)){
 
-                    // (eth) prevent starting, when "Ethereum (++)" didn't appear yet (necessary for the master pw unlock)
-                    if(type === 'eth' && data.toString().indexOf('Ethereum (++)') === -1)
+                    // (exp) prevent starting, when "Expanse (++)" didn't appear yet (necessary for the master pw unlock)
+                    if(type === 'exp' && data.toString().indexOf('Expanse (++)') === -1)
                         return;
                     else if(popupCallback)
                         popupCallback(null);
@@ -237,15 +237,15 @@ module.exports = {
             global.nodes[type].stderr.pipe(logFile);
             global.nodes[type].stderr.on('data', function(data) {
 
-                // dont react on stderr when eth++
-                if(type === 'eth')
+                // dont react on stderr when exp++
+                if(type === 'exp')
                     return;
 
                 // console.log('stderr ', data.toString());
                 if(!cbCalled && _.isFunction(callback)) {
 
-                    // (geth) prevent starying until IPC service is started
-                    if(type === 'geth' && data.toString().indexOf('IPC service started') === -1)
+                    // (gexp) prevent starying until IPC service is started
+                    if(type === 'gexp' && data.toString().indexOf('IPC service started') === -1)
                         return;
 
                     callCb(null);
diff --git a/modules/ipc/ipcProviderBackend.js b/modules/ipc/ipcProviderBackend.js
index e6608e435..c868d22b8 100644
--- a/modules/ipc/ipcProviderBackend.js
+++ b/modules/ipc/ipcProviderBackend.js
@@ -1,5 +1,5 @@
 /**
-The IPC provider backend filter and tunnel all incoming request to the IPC geth bridge.
+The IPC provider backend filter and tunnel all incoming request to the IPC gexp bridge.
 
 @module ipcProviderBackend
 */
diff --git a/modules/ipc/ipcProviderWrapper.js b/modules/ipc/ipcProviderWrapper.js
index d5503ae42..8922e7912 100644
--- a/modules/ipc/ipcProviderWrapper.js
+++ b/modules/ipc/ipcProviderWrapper.js
@@ -25,7 +25,7 @@ ipcProviderWrapper = {
     writable: false,
 
     /**
-    Connects the IPC on the backend to the geth node
+    Connects the IPC on the backend to the gexp node
 
     Note: web3.isConnected will always return true, as otherwise race conditions can occour,
     letting it look like youre not connected via IPC.
diff --git a/modules/ipcCommunicator.js b/modules/ipcCommunicator.js
index cb0308ee9..2c19b0a12 100644
--- a/modules/ipcCommunicator.js
+++ b/modules/ipcCommunicator.js
@@ -88,11 +88,11 @@ ipc.on('backendAction_importPresaleFile', function(e, path, pw) {
     var error = false;
 
     // start import process
-    var nodeProcess = spawn(getNodePath('geth'), ['wallet', 'import', path]);
+    var nodeProcess = spawn(getNodePath('gexp'), ['wallet', 'import', path]);
 
     nodeProcess.once('error',function(){
         error = true;
-        e.sender.send('uiAction_importedPresaleFile', 'Couldn\'t start the "geth wallet import <file.json>" process.');
+        e.sender.send('uiAction_importedPresaleFile', 'Couldn\'t start the "gexp wallet import <file.json>" process.');
     });
     nodeProcess.stdout.on('data', function(data) {
         var data = data.toString();
diff --git a/modules/menuItems.js b/modules/menuItems.js
index 643a5574b..334624634 100644
--- a/modules/menuItems.js
+++ b/modules/menuItems.js
@@ -90,7 +90,7 @@ var menuTempl = function(webviews) {
                                 else
                                     path += '/.web3/keys';
                             
-                            // geth
+                            // gexp
                             } else {
                                 if(process.platform === 'darwin')
                                     path += '/Library/Expanse/keystore';
@@ -265,7 +265,7 @@ var menuTempl = function(webviews) {
                 click: function(){
                     ethereumNodes.stopNodes(function(){
                         popupWindow.loadingWindow.show();
-                        ethereumNodes.startNode('geth', false, function(){
+                        ethereumNodes.startNode('gexp', false, function(){
                             popupWindow.loadingWindow.hide();
                             global.mainWindow.loadURL(global.interfaceAppUrl);
                             createMenu(webviews);
@@ -274,14 +274,14 @@ var menuTempl = function(webviews) {
                 }
               },
               {
-                label: 'Eth 1.2.4 (C++) [experimental!]',
+                label: 'Exp 1.2.4 (C++) [experimental!]',
                 checked: !!global.nodes.eth,
                 enabled: !!((global.nodes.geth || global.nodes.eth) && !global.nodes.eth),
                 type: 'checkbox',
                 click: function(){
                     ethereumNodes.stopNodes(function(){
                         popupWindow.loadingWindow.show();
-                        ethereumNodes.startNode('eth', false, function(){
+                        ethereumNodes.startNode('exp', false, function(){
                             popupWindow.loadingWindow.hide();
                             global.mainWindow.loadURL(global.interfaceAppUrl);
                             createMenu(webviews);
@@ -307,7 +307,7 @@ var menuTempl = function(webviews) {
 
                 ethereumNodes.stopNodes(function(){
                     popupWindow.loadingWindow.show();
-                    ethereumNodes.startNode(geth ? 'geth' : 'eth', false, function(){
+                    ethereumNodes.startNode(geth ? 'gexp' : 'exp', false, function(){
                         popupWindow.loadingWindow.hide();
                         global.mainWindow.loadURL(global.interfaceAppUrl);
                         createMenu(webviews);
@@ -326,7 +326,7 @@ var menuTempl = function(webviews) {
 
                 ethereumNodes.stopNodes(function(){
                     popupWindow.loadingWindow.show();
-                    ethereumNodes.startNode(geth ? 'geth' : 'eth', true, function(){
+                    ethereumNodes.startNode(geth ? 'gexp' : 'exp', true, function(){
                         popupWindow.loadingWindow.hide();
                         global.mainWindow.loadURL(global.interfaceAppUrl);
                         createMenu(webviews);