diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 75fbdca..49489cb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 Contributions are welcome, and greatly appreciated! Every little bit helps, and credit will always be given.
 
 If you need support, want to report/fix a bug, ask for/implement features, you can check the
-[Issues page](https://github.com/whitemech/pddl/issues)
-or [submit a Pull request](https://github.com/whitemech/pddl/pulls).
+[Issues page](https://github.com/AI-Planning/pddl/issues)
+or [submit a Pull request](https://github.com/AI-Planning/pddl/pulls).
 
 For other kinds of feedback, you can contact one of the [authors](./authors.md) by email.
diff --git a/mkdocs.yml b/mkdocs.yml
index d4c0a66..354e11a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,7 +1,7 @@
 site_name: pddl
-repo_name: 'whitemech/pddl'
-repo_url: https://github.com/whitemech/pddl
-site_url: https://whitemech.github.io/pddl
+repo_name: 'AI-Planning/pddl'
+repo_url: https://github.com/AI-Planning/pddl
+site_url: https://ai-planning.github.io/pddl
 
 nav:
     - Home: index.md
diff --git a/pddl/__version__.py b/pddl/__version__.py
index 751eb27..f74942c 100644
--- a/pddl/__version__.py
+++ b/pddl/__version__.py
@@ -15,7 +15,7 @@
 
 __title__ = "pddl"
 __description__ = "PDDL parser"
-__url__ = "https://github.com/whitemech/pddl.git"
+__url__ = "https://github.com/AI-Planning/pddl.git"
 __version__ = "0.1.0"
 __author__ = "Marco Favorito, Francesco Fuggitti"
 __author_email__ = "favorito@diag.uniroma1.it, fuggitti@diag.uniroma1.it"