diff --git a/README.md b/README.md
index 3706017f..c207a0e7 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# Mapital [![Build Status](https://travis-ci.org/mapital/editor.svg?branch=master)](https://travis-ci.org/mapital/editor) ![License](https://img.shields.io/badge/license-MIT-blue.svg)
+# Maputnik [![Build Status](https://travis-ci.org/maputnik/editor.svg?branch=master)](https://travis-ci.org/maputnik/editor) ![License](https://img.shields.io/badge/license-MIT-blue.svg)
 
-<img width="200" align="right" alt="Mapital" src="mapital.png" />
+<img width="200" align="right" alt="Maputnik" src="maputnik.png" />
 
 A free and open visual editor for the [Mapbox GL styles](https://www.mapbox.com/mapbox-gl-style-spec/)
-targeted at developers and map designers. Creating your own custom map is easy with **Mapital**.
+targeted at developers and map designers. Creating your own custom map is easy with **Maputnik**.
 
-*Mapital is an early prototype and is under development*.
+*Maputnik is an early prototype and is under development*.
 
 ## Reasons for building a Mapbox GL Style Editor
 
@@ -45,7 +45,7 @@ This is why I think we should rally behind and build our own style editor for th
 
 ## Develop
 
-Mapital is written in ES6 and is using [React](https://github.com/facebook/react), [Immutable.js](https://facebook.github.io/immutable-js/) and [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/).
+Maputnik is written in ES6 and is using [React](https://github.com/facebook/react), [Immutable.js](https://facebook.github.io/immutable-js/) and [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/).
 
 Install the deps, start the dev server and open the web browser on `http://localhost:8888/`.
 
@@ -73,7 +73,7 @@ npm run lint
 
 ## License
 
-Mapital is [licensed under MIT](LICENSE) and is Copyright (c) Lukas Martinelli and contributors.
+Maputnik is [licensed under MIT](LICENSE) and is Copyright (c) Lukas Martinelli and contributors.
 
 **Disclaimer** This project is not affiliated with Mapbox or Mapbox Studio. It is a free independent style editor for the
 open source technology in the Mapbox GL ecosystem.
diff --git a/mapital.png b/maputnik.png
similarity index 100%
rename from mapital.png
rename to maputnik.png
diff --git a/package.json b/package.json
index 49bf3009..f499b37a 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "mapital",
+  "name": "maputnik",
   "version": "0.0.1",
   "description": "A MapboxGL visual style editor",
   "main": "''",
@@ -11,11 +11,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/lukasmartinelli/mapolo"
+    "url": "https://github.com/maputnik/editor"
   },
   "author": "Lukas Martinelli",
   "license": "MIT",
-  "homepage": "https://github.com/lukasmartinelli/mapolo#readme",
+  "homepage": "https://github.com/maputnik/editor#readme",
   "dependencies": {
     "file-saver": "^1.3.2",
     "immutable": "^3.8.1",
diff --git a/src/about.jsx b/src/about.jsx
index 196254a1..83d2fb4c 100644
--- a/src/about.jsx
+++ b/src/about.jsx
@@ -28,12 +28,12 @@ export class About extends React.Component {
 				</NavItem>
 			</Toolbar>
 			<Container>
-				<h3>Mapital – Visual Map Editor for Mapbox GL</h3>
+				<h3>Maputnik – Visual Map Editor for Mapbox GL</h3>
 			  <p>
-					A free and open visual editor for the Mapbox GL styles targeted at developers and map designers. Creating your own custom map is easy with Mapital.
+					A free and open visual editor for the Mapbox GL styles targeted at developers and map designers. Creating your own custom map is easy with Maputnik.
 				</p>
 				<p>
-				  The source code is openly licensed and available on <a href="https://github.com/mapital/editor">github</a>.
+				  The source code is openly licensed and available on <a href="https://github.com/maputnik/editor">GitHub</a>.
 				</p>
 			</Container>
     </div>
diff --git a/src/layers/editor.jsx b/src/layers/editor.jsx
index bae0c2cf..4b795978 100644
--- a/src/layers/editor.jsx
+++ b/src/layers/editor.jsx
@@ -136,7 +136,7 @@ export class LayerEditor extends React.Component {
 				borderRight: 0,
 				borderStyle: "solid",
 				borderColor: theme.borderColor,
-				borderLeftColor: this.props.layer.getIn(['metadata', 'mapital:color'])
+				borderLeftColor: this.props.layer.getIn(['metadata', 'maputnik:color'])
 			}}>
 			<Toolbar onClick={this.toggleLayer.bind(this)}>
 				<NavItem style={{fontWeight: 400}}>
diff --git a/src/style.js b/src/style.js
index 23870009..b781fdcf 100644
--- a/src/style.js
+++ b/src/style.js
@@ -62,8 +62,8 @@ export function colorizeLayers(layers) {
 		if(!layer.metadata) {
 			layer.metadata = {}
 		}
-		if(!"mapital:color" in layer.metadata) {
-			layer.metadata["mapital:color"] = randomColor()
+		if(!"maputnik:color" in layer.metadata) {
+			layer.metadata["maputnik:color"] = randomColor()
 		}
 	  return layer
 	})
diff --git a/src/stylestore.js b/src/stylestore.js
index 9eeb161b..e6c16679 100644
--- a/src/stylestore.js
+++ b/src/stylestore.js
@@ -2,10 +2,10 @@ import { colorizeLayers } from './style.js'
 import Immutable from 'immutable'
 import style from './style.js'
 
-const storagePrefix = "mapital"
+const storagePrefix = "maputnik"
 const storageKeys = {
-	latest: [storagePrefix, 'latest_style'].join(''),
-	accessToken: [storagePrefix, 'access_token'].join('')
+	latest: [storagePrefix, 'latest_style'].join(':'),
+	accessToken: [storagePrefix, 'access_token'].join(':')
 }
 
 // Empty style is always used if no style could be restored or fetched
diff --git a/webpack.production.config.js b/webpack.production.config.js
index b0facb7c..a183d907 100644
--- a/webpack.production.config.js
+++ b/webpack.production.config.js
@@ -90,7 +90,7 @@ module.exports = {
 		}),
 		new HtmlWebpackPlugin({
 			template: './src/template.html',
-			title: 'Mapital'
+			title: 'Maputnik'
 		}),
 		new webpack.optimize.DedupePlugin()
 	]