diff --git a/README.md b/README.md
index 93582f5..55a3c17 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Create a new directory and require the project using composer:
 ```text
 $ mkdir mylisp
 $ cd mylisp
-$ composer require maddy83/madlisp
+$ composer require peklaiho/madlisp
 ```
 
 Use the `vendor/bin/madlisp` executable to start the interpreter. Start the REPL with the `-r` option:
@@ -48,4 +48,4 @@ The language seems stable at this point so I am releasing it as 1.0. Please repo
 
 ## License
 
-[MIT](https://bitbucket.org/maddy83/madlisp/src/master/LICENSE)
+MIT
diff --git a/composer.json b/composer.json
index 7e818d1..e2dd9c9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "maddy83/madlisp",
+    "name": "peklaiho/madlisp",
     "description": "Lisp interpreter for the MadLisp language.",
     "keywords": [
         "lisp"
@@ -14,7 +14,7 @@
         }
     ],
     "support": {
-        "source": "https://bitbucket.org/maddy83/madlisp/",
+        "source": "https://github.com/peklaiho/madlisp",
         "docs": "http://madlisp.com/"
     },
     "require": {