diff --git a/.travis.yml b/.travis.yml
index 1c110e725c9623b2dff8e95d875b9512b4d47494..f0f5c4c59f8bca5f163737e84474ca37cdacbc9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,11 +25,11 @@ deploy:
   - provider: releases
     api_key: $GH_TOKEN
     draft: true
-    name: Parity Wallet
+    name: Parity UI v0.1.0
     file:
-      - ./dist/parity-wallet_0.1.0_amd64.deb
-      - ./dist/parity-wallet_0.1.0_amd64.snap
-      - ./dist/parity-wallet-0.1.0-x86_64.AppImage
+      - ./dist/parity-ui_0.1.0_amd64.deb
+      - ./dist/parity-ui_0.1.0_amd64.snap
+      - ./dist/parity-ui-0.1.0-x86_64.AppImage
     skip_cleanup: true
     on:
       condition: $TRAVIS_OS_NAME = linux
@@ -37,10 +37,10 @@ deploy:
   - provider: releases
     api_key: $GH_TOKEN
     draft: true
-    name: Parity Wallet
+    name: Parity UI v0.1.0
     file:
-      - "./dist/Parity Wallet Setup 0.1.0.exe"
-      - "./dist/Parity Wallet-0.1.0.dmg"
+      - "./dist/Parity UI Setup 0.1.0.exe"
+      - "./dist/Parity UI-0.1.0.dmg"
     skip_cleanup: true
     on:
       condition: $TRAVIS_OS_NAME = osx
diff --git a/README.md b/README.md
index b2af6a0e4aee77c8202ab213a9971bd77dfaa86c..514304b3abb2523a556845ebfea34e0e8060612a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Parity Wallet
+# Parity UI
 
-The Electron app of Parity Wallet user interface.
+The Electron app for Parity UI.
 
 ## Development
 
diff --git a/package-lock.json b/package-lock.json
index 12906dbc2e38220526a622dae86f5fcaecb1a1ca..59aeaf2679f20cef738ebe3d3ed3a5c0a3b575bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "parity-wallet",
+  "name": "parity-ui",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
diff --git a/package.electron.json b/package.electron.json
index 937e376e60cf0a41e90486acaa9bb7664a2914ee..5d50e0197e87d49fffeb67ca3954c072f1276dce 100644
--- a/package.electron.json
+++ b/package.electron.json
@@ -1,5 +1,5 @@
 {
-  "appId": "com.parity.wallet",
+  "appId": "com.parity.ui",
   "directories": {
     "buildResources": "./"
   },
@@ -15,7 +15,7 @@
     "category": "public.app-category.productivity",
     "icon": "./assets/icon/small-white-512x512.png"
   },
-  "productName": "Parity Wallet",
+  "productName": "Parity UI",
   "win": {
     "icon": "./assets/icon/small-white-512x512.png"
   }
diff --git a/package.json b/package.json
index 385520e6d0fca2ea7e456e12390d6a8950d6702f..1cd39c9fd94a7fbdde7f3aa5b38673acda587efa 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "parity-wallet",
+  "name": "parity-ui",
   "version": "0.1.0",
   "main": ".build/electron.js",
   "jsnext:main": ".build/electron.js",
diff --git a/src/index.electron.js b/src/index.electron.js
index 0d9be070d5642f43a7aa05f05f57e530f1414274..ca8d3b173da831cc2ca9988c0f7c518622557406 100644
--- a/src/index.electron.js
+++ b/src/index.electron.js
@@ -24,6 +24,7 @@ const pick = require('lodash/pick');
 const { spawn } = require('child_process');
 const url = require('url');
 
+let parity; // Will hold the parity process (if spawned by node)
 const parityInstallLocation = require('./util/parityInstallLocation');
 
 const { app, BrowserWindow, ipcMain, Menu, session, shell } = electron;
@@ -62,7 +63,7 @@ function createWindow () {
   ipcMain.on('asynchronous-message', (event, arg) => {
     // Run an instance of parity if we receive the `run-parity` message
     if (arg === 'run-parity') {
-      spawn(global.parityInstallLocation);
+      parity = spawn(global.parityInstallLocation);
     }
   });
 
@@ -163,20 +164,26 @@ function createWindow () {
     callback({ requestHeaders: details.requestHeaders });
   });
 
-  mainWindow.on('closed', function () {
+  mainWindow.on('closed', () => {
     mainWindow = null;
   });
 }
 
 app.on('ready', createWindow);
 
-app.on('window-all-closed', function () {
+app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
     app.quit();
   }
 });
 
-app.on('activate', function () {
+app.on('will-quit', () => {
+  if (parity) {
+    parity.kill();
+  }
+});
+
+app.on('activate', () => {
   if (mainWindow === null) {
     createWindow();
   }
diff --git a/webpack/app.js b/webpack/app.js
index ea554a4a5163d9cc256e50c8c1150315903c92ae..f2ed26b654852174c38c7120aed4902bd9aa3877 100644
--- a/webpack/app.js
+++ b/webpack/app.js
@@ -174,7 +174,7 @@ module.exports = {
         plugins,
 
         new HtmlWebpackPlugin({
-          title: 'Parity Wallet',
+          title: 'Parity UI',
           filename: 'index.html',
           template: './index.parity.ejs',
           favicon: FAVICON,