diff --git a/README.md b/README.md
index f74740d..4922ac0 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,12 @@ echo $result; // 4
 
 ### Authors
 
-Originally source code taken from https://github.com/droptable/php-shunting-yard, some changes from https://github.com/andig/php-shunting-yard, https://github.com/pmishev/php-shunting-yard and https://github.com/falahati/php-shunting-yard. 
+Originally source code taken from https://github.com/droptable/php-shunting-yard, some changes from:
+
+  - https://github.com/andig/php-shunting-yard
+  - https://github.com/pmishev/php-shunting-yard
+  - https://github.com/falahati/php-shunting-yard
+
 Test cases and refactoring for composer/packagist by https://github.com/sergej-kurakin/php-shunting-yard.
 
 ### Installation Via Composer
@@ -70,7 +75,7 @@ Define the following requirement in your composer.json file:
 ```json
 {
     "require": {
-        "falahati/php-shunting-yard": "dev-master"
+        "andig/php-shunting-yard": "dev-master"
     }
 }
 ```
diff --git a/composer.json b/composer.json
index 81c3a90..6ed2595 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-    "name": "falahati/php-shunting-yard",
+    "name": "andig/php-shunting-yard",
     "type": "library",
     "keywords": ["math","shunting yard", "equation"],
-    "homepage": "https://github.com/falahati/php-shunting-yard",
-    "description": "Refactored repack of https://github.com/pmishev/php-shunting-yard",
+    "homepage": "https://github.com/andig/php-shunting-yard",
+    "description": "Refactored repack of https://github.com/andig/php-shunting-yard",
     "license": "MIT",
     "autoload": {
         "psr-0": {