diff --git a/.idea/.name b/.idea/.name
index 22410297..41d36e7b 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-keepass-webapp
\ No newline at end of file
+keeweb
\ No newline at end of file
diff --git a/.idea/libraries/keepass_webapp_node_modules.xml b/.idea/libraries/keeweb_node_modules.xml
similarity index 82%
rename from .idea/libraries/keepass_webapp_node_modules.xml
rename to .idea/libraries/keeweb_node_modules.xml
index 1e7eac8f..fc735590 100644
--- a/.idea/libraries/keepass_webapp_node_modules.xml
+++ b/.idea/libraries/keeweb_node_modules.xml
@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="keepass-webapp node_modules" type="javaScript">
+  <library name="keeweb node_modules" type="javaScript">
     <properties>
       <option name="frameworkName" value="node_modules" />
       <sourceFilesUrls>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3e6652b3..20c6fb26 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/keepass-webapp.iml" filepath="$PROJECT_DIR$/keepass-webapp.iml" />
+      <module fileurl="file://$PROJECT_DIR$/keeweb.iml" filepath="$PROJECT_DIR$/keeweb.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index a82ab361..045ffeed 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -154,7 +154,7 @@ module.exports = function(grunt) {
                 },
                 plugins: [
                     new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.js'),
-                    new webpack.BannerPlugin('keepass-webapp v' + pkg.version + ', (c) 2015 ' + pkg.author +
+                    new webpack.BannerPlugin('keeweb v' + pkg.version + ', (c) 2015 ' + pkg.author +
                         ', opensource.org/licenses/' + pkg.license),
                     new webpack.optimize.OccurenceOrderPlugin(),
                     new webpack.ProvidePlugin({ _: 'underscore', $: 'jquery' }),
diff --git a/README.md b/README.md
index ede3633d..42716e71 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This webapp can read KeePass databases. It doesn't require any server or additional resources.
 
-![screenshot](https://antelle.github.io/keepass-webapp/screenshot.png)
+![screenshot](https://antelle.github.io/keeweb/screenshot.png)
 
 # Status
 
diff --git a/bower.json b/bower.json
index f53f8dea..387ceef7 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "keepass-webapp",
+  "name": "keeweb",
   "version": "0.0.1",
   "authors": [
     "Antelle <dmitryvit@gmail.com>"
@@ -13,7 +13,7 @@
     "keepass"
   ],
   "license": "MIT",
-  "homepage": "https://github.com/antelle/keepass-webapp",
+  "homepage": "https://github.com/antelle/keeweb",
   "ignore": [
     "**/.*",
     "node_modules",
diff --git a/keepass-webapp.iml b/keeweb.iml
similarity index 86%
rename from keepass-webapp.iml
rename to keeweb.iml
index ce62f903..785b6491 100644
--- a/keepass-webapp.iml
+++ b/keeweb.iml
@@ -10,6 +10,6 @@
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="keepass-webapp node_modules" level="project" />
+    <orderEntry type="library" name="keeweb node_modules" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/package.json b/package.json
index b877d530..ff9b1892 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "keepass-webapp",
+  "name": "keeweb",
   "version": "1.0.0",
   "description": "KeePass web app",
   "main": "Gulpfile.js",
-  "repository": "https://github.com/antelle/keepass-webapp",
+  "repository": "https://github.com/antelle/keeweb",
   "dependencies": {},
   "devDependencies": {
     "base64-loader": "^1.0.0",