@@ -5,7 +5,7 @@
 [![Documentation](http://readthedocs.org/projects/xtensor-python/badge/?version=latest)](https://xtensor-python.readthedocs.io/en/latest/?badge=latest)
 [![Join the Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/QuantStack/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Python bindings for the [xtensor](https://github.com/QuantStack/xtensor) C++ multi-dimensional array library.
+Python bindings for the [xtensor](https://github.com/xtensor-stack/xtensor) C++ multi-dimensional array library.
 
  - `xtensor` is a C++ library for multi-dimensional arrays enabling numpy-style broadcasting and lazy computing.
  - `xtensor-python` enables inplace use of numpy arrays in C++ with all the benefits from `xtensor`
@@ -145,7 +145,7 @@ This will pull the dependencies to xtensor-python, that is `pybind11` and `xtens
 
 ## Project cookiecutter
 
-A template for a project making use of `xtensor-python` is available in the form of a cookiecutter [here](https://github.com/QuantStack/xtensor-python-cookiecutter).
+A template for a project making use of `xtensor-python` is available in the form of a cookiecutter [here](https://github.com/xtensor-stack/xtensor-python-cookiecutter).
 
 This project is meant to help library authors get started with the xtensor python bindings.
 
 
@@ -32,7 +32,7 @@ After installing cookiecutter, use the `xtensor-python-cookiecutter`_:
 
 .. code::
 
-    cookiecutter https://github.com/QuantStack/xtensor-python-cookiecutter.git
+    cookiecutter https://github.com/xtensor-stack/xtensor-python-cookiecutter.git
 
 As xtensor-python-cookiecutter runs, you will be asked for basic information about
 your custom extension project. You will be prompted for the following
@@ -50,6 +50,6 @@ This will produce a directory containing all the required content for a minimal
 project making use of xtensor with all the required boilerplate for package management,
 together with a few basic examples.
 
-.. _xtensor-python-cookiecutter: https://github.com/QuantStack/xtensor-python-cookiecutter
+.. _xtensor-python-cookiecutter: https://github.com/xtensor-stack/xtensor-python-cookiecutter
 
 .. _cookiecutter: https://github.com/audreyr/cookiecutter
@@ -80,6 +80,6 @@ This software is licensed under the BSD-3-Clause license. See the LICENSE file f
 .. _NumPy: http://www.numpy.org
 .. _`Buffer Protocol`: https://docs.python.org/3/c-api/buffer.html
 .. _`numpy to xtensor cheat sheet`: http://xtensor.readthedocs.io/en/latest/numpy.html 
-.. _xtensor: https://github.com/QuantStack/xtensor
+.. _xtensor: https://github.com/xtensor-stack/xtensor
 .. _pybind11: https://github.com/pybind/pybind11 
-.. _xtensor-python-cookiecutter: https://github.com/QuantStack/xtensor-python-cookiecutter 
+.. _xtensor-python-cookiecutter: https://github.com/xtensor-stack/xtensor-python-cookiecutter