diff --git a/.travis.yml b/.travis.yml
index 61a281d..ac3f6aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ before_script:
   - phpenv rehash
 
 script:
-  - phpunit --coverage-clover /home/travis/build/picklesphp/pickles/build/logs/clover.xml
+  - phpunit --coverage-clover /home/travis/build/joshtronic/pickles/build/logs/clover.xml
 
 after_success:
   - php vendor/bin/coveralls --config ../.coveralls.yml -v
diff --git a/composer.json b/composer.json
index dd8cc94..85105fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-    "name":        "picklesphp/pickles",
+    "name":        "joshtronic/pickles",
     "description": "Pickles is a PHP framework for building kick-ass services",
     "type":        "library",
     "keywords":    ["framework", "api", "soa", "oauth"],
-    "homepage":    "http://picklesphp.com",
+    "homepage":    "https://github.com/joshtronic/pickles",
     "license":     "MIT",
     "authors": [
         {
@@ -13,8 +13,8 @@
         }
     ],
     "support": {
-        "issues": "https://github.com/picklesphp/pickles/issues",
-        "source": "https://github.com/picklesphp/pickles"
+        "issues": "https://github.com/joshtronic/pickles/issues",
+        "source": "https://github.com/joshtronic/pickles"
     },
     "minimum-stability" : "dev",
     "require-dev": {
diff --git a/src/Browser.php b/src/Browser.php
index 18f46ae..8a767c1 100644
--- a/src/Browser.php
+++ b/src/Browser.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Cache.php b/src/Cache.php
index ecb1fe6..d7c6c72 100644
--- a/src/Cache.php
+++ b/src/Cache.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Config.php b/src/Config.php
index c32d87b..5ae4e79 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Convert.php b/src/Convert.php
index 87e3c81..b9caa97 100644
--- a/src/Convert.php
+++ b/src/Convert.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Database.php b/src/Database.php
index 24f269c..1379ec8 100644
--- a/src/Database.php
+++ b/src/Database.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  * @todo      Drop driver, hardcode drivers based on the type
  * @todo      More assumptions for the datasource variables
diff --git a/src/Distance.php b/src/Distance.php
index 11ff121..4bb841a 100644
--- a/src/Distance.php
+++ b/src/Distance.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/File.php b/src/File.php
index 4399b19..6f83c5d 100644
--- a/src/File.php
+++ b/src/File.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Model.php b/src/Model.php
index 83e4adb..037427e 100644
--- a/src/Model.php
+++ b/src/Model.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Number.php b/src/Number.php
index 59c9929..92e87ca 100644
--- a/src/Number.php
+++ b/src/Number.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Object.php b/src/Object.php
index 2ca484d..c7809b9 100644
--- a/src/Object.php
+++ b/src/Object.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Profiler.php b/src/Profiler.php
index 184c8d4..969961f 100644
--- a/src/Profiler.php
+++ b/src/Profiler.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Resource.php b/src/Resource.php
index 9857cb2..9473fbe 100644
--- a/src/Resource.php
+++ b/src/Resource.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Router.php b/src/Router.php
index c41baf7..96be948 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Sort.php b/src/Sort.php
index 5c2a4d9..6d37de6 100644
--- a/src/Sort.php
+++ b/src/Sort.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/String.php b/src/String.php
index a66d463..3b8dc8d 100644
--- a/src/String.php
+++ b/src/String.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */
 
diff --git a/src/Time.php b/src/Time.php
index a1a0bb9..4b538e0 100644
--- a/src/Time.php
+++ b/src/Time.php
@@ -8,7 +8,7 @@
  *
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
  * @package   Pickles
  */