@@ -153,7 +153,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 cookie cutter [here](https://github.com/QuantStack/xtensor-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).
 
 This project is meant to help library authors get started with the xtensor python bindings.
 
 
@@ -4,10 +4,10 @@
 
    The full license is in the file LICENSE, distributed with this software.
 
-Getting started with xtensor-cookiecutter
-=========================================
+Getting started with xtensor-python-cookiecutter
+================================================
 
-`xtensor-cookiecutter`_ helps extension authors create Python extension modules making use of xtensor.
+`xtensor-python-cookiecutter`_ helps extension authors create Python extension modules making use of xtensor.
 
 It takes care of the initial work of generating a project skeleton with
 
@@ -32,9 +32,9 @@ After installing cookiecutter, use the xtensor_cookiecutter_:
 
 .. code::
 
-    cookiecutter https://github.com/QuantStack/xtensor-cookiecutter.git
+    cookiecutter https://github.com/QuantStack/xtensor-python-cookiecutter.git
 
-As xtensor-cookiecutter runs, you will be asked for basic information about
+As xtensor-python-cookiecutter runs, you will be asked for basic information about
 your custom extension project. You will be prompted for the following
 information:
 
@@ -50,5 +50,5 @@ 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_cookicutter: https://github.com/QuantStack/xtensor-cookiecutter
+.. _xtensor_cookicutter: https://github.com/QuantStack/xtensor-python-cookiecutter
 .. _cookiecutter: https://github.com/audreyr/cookiecutter
@@ -33,7 +33,7 @@ In addition to the basic accessors and iterators of ``xtensor`` containers, it a
 
 Besides ``xtensor-python`` provides an API to create *Universal functions* from simple scalar functions from your C++ code.
 
-Finally, a cookiecutter template project is provided. It takes care of the initial work of generating a project skeleton for a C++ extension based on ``xtensor-python`` containing a few examples, unit tests and HTML documentation. Find out more about the xtensor-cookiecutter_.
+Finally, a cookiecutter template project is provided. It takes care of the initial work of generating a project skeleton for a C++ extension based on ``xtensor-python`` containing a few examples, unit tests and HTML documentation. Find out more about the xtensor-python-cookiecutter_.
 
 ``xtensor`` and ``xtensor-python`` require a modern C++ compiler supporting C++14. The following C++ compilers are supported:
 
@@ -62,7 +62,7 @@ This software is licensed under the BSD-3-Clause license. See the LICENSE file f
    basic_usage
    array_tensor
    numpy_capi
-   cookie_cutter
+   cookiecutter
 
 .. toctree::
    :caption: API REFERENCE
@@ -80,4 +80,4 @@ This software is licensed under the BSD-3-Clause license. See the LICENSE file f
 .. _`numpy to xtensor cheat sheet`: http://xtensor.readthedocs.io/en/latest/numpy.html 
 .. _xtensor: https://github.com/QuantStack/xtensor
 .. _pybind11: https://github.com/pybind/pybind11 
-.. _xtensor-cookiecutter: https://github.com/QuantStack/xtensor-cookiecutter 
+.. _xtensor-python-cookiecutter: https://github.com/QuantStack/xtensor-python-cookiecutter