diff --git a/slides/common/sampleapp.md b/slides/common/sampleapp.md
index 5d4da13d..423fdf71 100644
--- a/slides/common/sampleapp.md
+++ b/slides/common/sampleapp.md
@@ -1,16 +1,16 @@
 # Our sample application
 
 - Visit the GitHub repository with all the materials of this workshop:
-  <br/>https://github.com/jpetazzo/orchestration-workshop
+  <br/>https://github.com/jpetazzo/container.training
 
 - The application is in the [dockercoins](
-  https://github.com/jpetazzo/orchestration-workshop/tree/master/dockercoins)
+  https://github.com/jpetazzo/container.training/tree/master/dockercoins)
   subdirectory
 
 - Let's look at the general layout of the source code:
 
   there is a Compose file [docker-compose.yml](
-  https://github.com/jpetazzo/orchestration-workshop/blob/master/dockercoins/docker-compose.yml) ...
+  https://github.com/jpetazzo/container.training/blob/master/dockercoins/docker-compose.yml) ...
 
   ... and 4 other services, each in its own directory:
 
@@ -109,15 +109,15 @@ class: pic
 
 <!--
 ```bash
-if [ -d orchestration-workshop ]; then
-  mv orchestration-workshop orchestration-workshop.$$
+if [ -d container.training ]; then
+  mv container.training container.training.$$
 fi
 ```
 -->
 
 - Clone the repository on `node1`:
   ```bash
-  git clone git://github.com/jpetazzo/orchestration-workshop
+  git clone git://github.com/jpetazzo/container.training
   ```
 
 ]
@@ -134,7 +134,7 @@ Without further ado, let's start our application.
 
 - Go to the `dockercoins` directory, in the cloned repo:
   ```bash
-  cd ~/orchestration-workshop/dockercoins
+  cd ~/container.training/dockercoins
   ```
 
 - Use Compose to build and run all containers:
diff --git a/slides/intro/Container_Network_Model.md b/slides/intro/Container_Network_Model.md
index 486cf908..500a225e 100644
--- a/slides/intro/Container_Network_Model.md
+++ b/slides/intro/Container_Network_Model.md
@@ -486,7 +486,7 @@ Very short instructions:
 - `docker network create mynet --driver overlay`
 - `docker service create --network mynet myimage`
 
-See http://jpetazzo.github.io/orchestration-workshop for all the deets about clustering!
+See http://jpetazzo.github.io/container.training for all the deets about clustering!
 
 ---
 
diff --git a/slides/kube/intro-ks.md b/slides/kube/intro-ks.md
index 0241f037..99cabc3e 100644
--- a/slides/kube/intro-ks.md
+++ b/slides/kube/intro-ks.md
@@ -6,7 +6,7 @@
 
 - The content that you're viewing right now is in a public GitHub repository:
 
-  https://github.com/jpetazzo/orchestration-workshop
+  https://github.com/jpetazzo/container.training
 
 - Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ...
 
diff --git a/slides/kube/ourapponkube.md b/slides/kube/ourapponkube.md
index 89260b8f..f50d28e4 100644
--- a/slides/kube/ourapponkube.md
+++ b/slides/kube/ourapponkube.md
@@ -179,7 +179,7 @@ The curl command should now output:
 
 - Go to the `stacks` directory:
   ```bash
-  cd ~/orchestration-workshop/stacks
+  cd ~/container.training/stacks
   ```
 
 - Build and push the images:
diff --git a/slides/kube/rollout.md b/slides/kube/rollout.md
index 4d98fc03..8bfe69d5 100644
--- a/slides/kube/rollout.md
+++ b/slides/kube/rollout.md
@@ -51,7 +51,7 @@
 
 - Go to the `stack` directory:
   ```bash
-  cd ~/orchestration-workshop/stacks
+  cd ~/container.training/stacks
   ```
 
 - Edit `dockercoins/worker/worker.py`, update the `sleep` line to sleep 1 second
diff --git a/slides/swarm/encryptionatrest.md b/slides/swarm/encryptionatrest.md
index 4bda6e1b..a4fef388 100644
--- a/slides/swarm/encryptionatrest.md
+++ b/slides/swarm/encryptionatrest.md
@@ -49,7 +49,7 @@ This will display the unlock key. Copy-paste it somewhere safe.
 ]
 
 Note: if you are doing the workshop on your own, using nodes
-that you [provisioned yourself](https://github.com/jpetazzo/orchestration-workshop/tree/master/prepare-machine) or with [Play-With-Docker](http://play-with-docker.com/), you might have to use a different method to restart the Engine.
+that you [provisioned yourself](https://github.com/jpetazzo/container.training/tree/master/prepare-machine) or with [Play-With-Docker](http://play-with-docker.com/), you might have to use a different method to restart the Engine.
 
 ---
 
diff --git a/slides/swarm/healthchecks.md b/slides/swarm/healthchecks.md
index dbdd6a57..fe430f11 100644
--- a/slides/swarm/healthchecks.md
+++ b/slides/swarm/healthchecks.md
@@ -114,7 +114,7 @@ We will use the following Compose file (`stacks/dockercoins+healthcheck.yml`):
 
 - Go to the `stacks` directory:
   ```bash
-  cd ~/orchestration-workshop/stacks
+  cd ~/container.training/stacks
   ```
 
 - Deploy the updated stack:
diff --git a/slides/swarm/intro.md b/slides/swarm/intro.md
index b2f206ba..78c32a1e 100644
--- a/slides/swarm/intro.md
+++ b/slides/swarm/intro.md
@@ -37,5 +37,5 @@ class: self-paced
 - If you are doing this on your own:
   <br/>you can use
   [Play-With-Docker](http://www.play-with-docker.com/) and
-  read [these instructions](https://github.com/jpetazzo/orchestration-workshop#using-play-with-docker) for extra
+  read [these instructions](https://github.com/jpetazzo/container.training#using-play-with-docker) for extra
   details
diff --git a/slides/swarm/logging.md b/slides/swarm/logging.md
index 0748b853..8b0f1318 100644
--- a/slides/swarm/logging.md
+++ b/slides/swarm/logging.md
@@ -113,14 +113,14 @@ class: elk-manual
 
 - We could author a custom image bundling this configuration
 
-- We can also pass the [configuration](https://github.com/jpetazzo/orchestration-workshop/blob/master/elk/logstash.conf) on the command line
+- We can also pass the [configuration](https://github.com/jpetazzo/container.training/blob/master/elk/logstash.conf) on the command line
 
 .exercise[
 
 - Create the Logstash service:
   ```bash
     docker service create --network logging --name logstash -p 12201:12201/udp \
-           logstash:2.4 -e "$(cat ~/orchestration-workshop/elk/logstash.conf)"
+           logstash:2.4 -e "$(cat ~/container.training/elk/logstash.conf)"
   ```
 
 ]
@@ -195,7 +195,7 @@ class: elk-auto
 Note: the *build* and *push* steps are not strictly necessary, but they don't hurt!
 
 Let's have a look at the [Compose file](
-https://github.com/jpetazzo/orchestration-workshop/blob/master/stacks/elk.yml).
+https://github.com/jpetazzo/container.training/blob/master/stacks/elk.yml).
 
 ---
 
diff --git a/slides/swarm/machine.md b/slides/swarm/machine.md
index 967629dd..f94fddfc 100644
--- a/slides/swarm/machine.md
+++ b/slides/swarm/machine.md
@@ -169,7 +169,7 @@ class: in-person
 This should tell us that we are talking to `node3`.
 
 Note: it can be useful to use a [custom shell prompt](
-https://github.com/jpetazzo/orchestration-workshop/blob/master/prepare-vms/scripts/postprep.rc#L68)
+https://github.com/jpetazzo/container.training/blob/master/prepare-vms/scripts/postprep.rc#L68)
 reflecting the `DOCKER_HOST` variable.
 
 ---
diff --git a/slides/swarm/metrics.md b/slides/swarm/metrics.md
index 708036dc..85168acb 100644
--- a/slides/swarm/metrics.md
+++ b/slides/swarm/metrics.md
@@ -306,7 +306,7 @@ class: snap
 - Create a task using the manifest:
 
   ```bash
-  cd ~/orchestration-workshop/snap
+  cd ~/container.training/snap
   snapctl task create -t psutil-file.yml
   ```
 
@@ -715,7 +715,7 @@ class: snap
 - Load a task manifest file collecting a couple of metrics on all containers,
   <br/>and sending them to InfluxDB:
   ```bash
-  cd ~/orchestration-workshop/snap
+  cd ~/container.training/snap
   snapctl task create -t docker-influxdb.json
   ```
 
@@ -1101,7 +1101,7 @@ class: prom-manual
 
 - Build the image using the provided Dockerfile:
   ```bash
-  docker build -t 127.0.0.1:5000/prometheus ~/orchestration-workshop/prom
+  docker build -t 127.0.0.1:5000/prometheus ~/container.training/prom
   ```
 
 - Push the image to our local registry:
@@ -1143,7 +1143,7 @@ class: prom-auto
 
 - Make sure we are in the stacks directory:
   ```bash
-  cd ~/orchestration-workshop/stacks
+  cd ~/container.training/stacks
   ```
 
 - Build, ship, and run the Prometheus stack:
diff --git a/slides/swarm/operatingswarm.md b/slides/swarm/operatingswarm.md
index 8c81c921..9f3d76f1 100644
--- a/slides/swarm/operatingswarm.md
+++ b/slides/swarm/operatingswarm.md
@@ -47,8 +47,8 @@ TOKEN=$(docker swarm join-token -q manager)
 for N in $(seq 2 5); do
   DOCKER_HOST=tcp://node$N:2375 docker swarm join --token $TOKEN node1:2377
 done
-git clone git://github.com/jpetazzo/orchestration-workshop
-cd orchestration-workshop/stacks
+git clone git://github.com/jpetazzo/container.training
+cd container.training/stacks
 docker stack deploy --compose-file registry.yml registry
 docker-compose -f dockercoins.yml build
 docker-compose -f dockercoins.yml push
diff --git a/slides/swarm/ourapponswarm.md b/slides/swarm/ourapponswarm.md
index cfe7343c..a78ea5d1 100644
--- a/slides/swarm/ourapponswarm.md
+++ b/slides/swarm/ourapponswarm.md
@@ -240,7 +240,7 @@ class: manual-btp
 - Set `REGISTRY` and `TAG` environment variables to use our local registry
 - And run this little for loop:
   ```bash
-    cd ~/orchestration-workshop/dockercoins
+    cd ~/container.training/dockercoins
     REGISTRY=127.0.0.1:5000 TAG=v1
     for SERVICE in hasher rng webui worker; do
       docker tag dockercoins_$SERVICE $REGISTRY/$SERVICE:$TAG
@@ -549,7 +549,7 @@ What did we change to make it compatible with Swarm mode?
 
 - Go to the app directory:
   ```bash
-  cd ~/orchestration-workshop/dockercoins
+  cd ~/container.training/dockercoins
   ```
 
 - See modifications in the code:
@@ -693,7 +693,7 @@ services:
 
 - Go to the `stacks` directory:
   ```bash
-  cd ~/orchestration-workshop/stacks
+  cd ~/container.training/stacks
   ```
 
 - Check `registry.yml`:
diff --git a/slides/swarm/prereqs.md b/slides/swarm/prereqs.md
index a4252357..b3c99a5d 100644
--- a/slides/swarm/prereqs.md
+++ b/slides/swarm/prereqs.md
@@ -83,12 +83,12 @@ class: in-person
 - If you are doing (or re-doing) this on your own, you can:
 
   - create your own cluster (local or cloud VMs) with Docker Machine
-    ([instructions](https://github.com/jpetazzo/orchestration-workshop/tree/master/prepare-machine))
+    ([instructions](https://github.com/jpetazzo/container.training/tree/master/prepare-machine))
 
-  - use [Play-With-Docker](http://play-with-docker.com) ([instructions](https://github.com/jpetazzo/orchestration-workshop#using-play-with-docker))
+  - use [Play-With-Docker](http://play-with-docker.com) ([instructions](https://github.com/jpetazzo/container.training#using-play-with-docker))
 
   - create a bunch of clusters for you and your friends
-    ([instructions](https://github.com/jpetazzo/orchestration-workshop/tree/master/prepare-vms))
+    ([instructions](https://github.com/jpetazzo/container.training/tree/master/prepare-vms))
 
 ---
 
@@ -146,7 +146,7 @@ done
 
   - exposing TCP services requires something like
     [ngrok](https://ngrok.com/)
-    or [supergrok](https://github.com/jpetazzo/orchestration-workshop#using-play-with-docker)
+    or [supergrok](https://github.com/jpetazzo/container.training#using-play-with-docker)
 
 <!--