diff --git a/README.md b/README.md
index 6fee99eb..2a2c59d9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ![](https://i.imgur.com/xeKD93p.png)
-[![Release 2.6](https://img.shields.io/badge/release-v2.6-green)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/billz/raspap-webgui/](https://img.shields.io/travis/com/billz/raspap-webgui/master) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/)
+[![Release 2.6](https://img.shields.io/badge/release-v2.6-green)](https://github.com/billz/raspap/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/billz/raspap/](https://img.shields.io/travis/com/billz/raspap/master) [![Crowdin](https://badges.crowdin.net/raspap/localized.svg)](https://crowdin.com/project/raspap) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/)
 
 RaspAP lets you quickly get a WiFi access point up and running to share the connectivity of many popular [Debian-based devices](#supported-operating-systems), including the Raspberry Pi. Our popular [Quick installer](#quick-installer) creates a known-good default configuration that "just works" on all current Raspberry Pis with onboard wireless. A responsive interface gives you control over the relevant services and networking options. Advanced DHCP settings, OpenVPN client support, SSL, security audits, themes and multilingual options are included.
 
@@ -173,7 +173,7 @@ Please [read this](https://docs.raspap.com/issues/) before reporting a bug.
 ### Code Contributors
 This project exists thanks to all the awesome people who [contribute](CONTRIBUTING.md) their time and expertise.
 
-<a href="https://github.com/billz/raspap-webgui/graphs/contributors"><img src="https://opencollective.com/raspap/contributors.svg?width=890&button=false" /></a>
+<a href="https://github.com/billz/raspap/graphs/contributors"><img src="https://opencollective.com/raspap/contributors.svg?width=890&button=false" /></a>
 
 ### Financial Contributors
 Become a [financial contributor](https://opencollective.com/raspap/contribute) and help us sustain our community. 
diff --git a/gulpfile.js b/gulpfile.js
index 5df9aaa2..9f3833e3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,7 +20,7 @@ const pkg = require('./package.json');
 const banner = ['/*!\n',
   ' * RaspAP - <%= pkg.title %> v<%= pkg.version %> (<%= pkg.homepage %>)\n',
   ' * Copyright 2013-' + (new Date()).getFullYear(), ' <%= pkg.author %>\n',
-  ' * Licensed under <%= pkg.license %> (https://github.com/raspap-webgui/<%= pkg.name %>/blob/master/LICENSE)\n',
+  ' * Licensed under <%= pkg.license %> (https://github.com/billz/raspap/<%= pkg.name %>/blob/master/LICENSE)\n',
   ' */\n',
   '\n'
 ].join('');
diff --git a/index.php b/index.php
index 60a44094..ca55c5ce 100755
--- a/index.php
+++ b/index.php
@@ -15,7 +15,7 @@
  * @author  Bill Zimmerman <billzimmerman@gmail.com>
  * @license GNU General Public License, version 3 (GPL-3.0)
  * @version 2.6
- * @link    https://github.com/billz/raspap-webgui/
+ * @link    https://github.com/billz/raspap/
  * @link    https://raspap.com/
  * @see     http://sirlagz.net/2013/02/08/raspap-webgui/
  *
diff --git a/package.json b/package.json
index 13f06c66..61f81579 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
     "title": "RaspAP WiFi Configuration Portal",
-    "name": "raspap-webgui",
-    "version": "2.5.0",
+    "name": "raspap",
+    "version": "2.6",
     "scripts": {
         "start": "node_modules/.bin/gulp watch"
     },
-    "description": "A simple, responsive web interface to control wifi and hostapd on the Raspberry Pi",
+    "description": "Simple AP setup & WiFi management for Debian-based devices",
     "keywords": [
         "raspberry-pi",
         "hostapd",
@@ -16,9 +16,9 @@
         "admin",
         "app"
     ],
-    "homepage": "https://github.com/billz/raspap-webgui",
+    "homepage": "https://github.com/billz/raspap",
     "bugs": {
-        "url": "https://github.com/billz/raspap-webgui/issues"
+        "url": "https://github.com/billz/raspap/issues"
     },
     "license": "GPL-3.0",
     "author": "RaspAP Developers",
@@ -27,7 +27,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/billz/raspap-webgui.git"
+        "url": "https://github.com/billz/raspap.git"
     },
     "publishConfig": {
         "registry": "https://npm.pkg.github.com/"