diff --git a/slides/intro.yml b/slides/intro-fullday.yml
similarity index 93%
rename from slides/intro.yml
rename to slides/intro-fullday.yml
index 65a9d24b..b349645d 100644
--- a/slides/intro.yml
+++ b/slides/intro-fullday.yml
@@ -1,6 +1,7 @@
 title: "Introduction to Docker and Containers"
 
 chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
 
 exclude:
 - self-paced
diff --git a/slides/kube.yml b/slides/kube-halfday.yml
similarity index 81%
rename from slides/kube.yml
rename to slides/kube-halfday.yml
index 88d4c4f7..c5cb887f 100644
--- a/slides/kube.yml
+++ b/slides/kube-halfday.yml
@@ -2,7 +2,8 @@ title: |
   Deploying and Scaling Microservices
   with Docker and Kubernetes
 
-chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20171026-prague)"
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
 
 exclude:
 - self-paced
diff --git a/slides/dockercon.yml b/slides/swarm-fullday.yml
similarity index 80%
rename from slides/dockercon.yml
rename to slides/swarm-fullday.yml
index 764857fd..fccae24a 100644
--- a/slides/dockercon.yml
+++ b/slides/swarm-fullday.yml
@@ -1,6 +1,9 @@
-title: "Swarm: from Zero to Hero (DC17EU)"
+title: |
+  Container Orchestration
+  with Docker and Swarm
 
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7ET1GY4Q)"
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
 
 exclude:
 - self-paced
diff --git a/slides/lisa.yml b/slides/swarm-halfday.yml
similarity index 80%
rename from slides/lisa.yml
rename to slides/swarm-halfday.yml
index 9d51ec7f..84c8986b 100644
--- a/slides/lisa.yml
+++ b/slides/swarm-halfday.yml
@@ -1,6 +1,9 @@
-title: "LISA17 T9: Build, Ship, and Run Microservices on a Docker Swarm Cluster"
+title: |
+  Container Orchestration
+  with Docker and Swarm
 
-chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20171031-sanfrancisco)"
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
 
 exclude:
 - self-paced
diff --git a/slides/selfpaced.yml b/slides/swarm-selfpaced.yml
similarity index 95%
rename from slides/selfpaced.yml
rename to slides/swarm-selfpaced.yml
index 9dffebd4..da35f049 100644
--- a/slides/selfpaced.yml
+++ b/slides/swarm-selfpaced.yml
@@ -1,7 +1,6 @@
 title: |
-  Docker
-  Orchestration
-  Workshop
+  Container Orchestration
+  with Docker and Swarm
 
 chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"