diff --git a/velocity-training/README.md b/kubcon-training/README.md
similarity index 100%
rename from velocity-training/README.md
rename to kubcon-training/README.md
diff --git a/velocity-training/docker/README.md b/kubcon-training/docker/README.md
similarity index 100%
rename from velocity-training/docker/README.md
rename to kubcon-training/docker/README.md
diff --git a/velocity-training/img/dcos-dashboard.png b/kubcon-training/img/dcos-dashboard.png
similarity index 100%
rename from velocity-training/img/dcos-dashboard.png
rename to kubcon-training/img/dcos-dashboard.png
diff --git a/velocity-training/img/marathon-ui.png b/kubcon-training/img/marathon-ui.png
similarity index 100%
rename from velocity-training/img/marathon-ui.png
rename to kubcon-training/img/marathon-ui.png
diff --git a/velocity-training/img/piat-hybrid-example.png b/kubcon-training/img/piat-hybrid-example.png
similarity index 100%
rename from velocity-training/img/piat-hybrid-example.png
rename to kubcon-training/img/piat-hybrid-example.png
diff --git a/velocity-training/kubernetes/README.md b/kubcon-training/kubernetes/README.md
similarity index 100%
rename from velocity-training/kubernetes/README.md
rename to kubcon-training/kubernetes/README.md
diff --git a/velocity-training/kubernetes/k8s-webserver-pod.json b/kubcon-training/kubernetes/k8s-webserver-pod.json
similarity index 100%
rename from velocity-training/kubernetes/k8s-webserver-pod.json
rename to kubcon-training/kubernetes/k8s-webserver-pod.json
diff --git a/velocity-training/kubernetes/k8s-webserver-service.json b/kubcon-training/kubernetes/k8s-webserver-service.json
similarity index 100%
rename from velocity-training/kubernetes/k8s-webserver-service.json
rename to kubcon-training/kubernetes/k8s-webserver-service.json
diff --git a/velocity-training/mesos-marathon/README.md b/kubcon-training/mesos-marathon/README.md
similarity index 100%
rename from velocity-training/mesos-marathon/README.md
rename to kubcon-training/mesos-marathon/README.md
diff --git a/velocity-training/mesos-marathon/cadvisor/README.md b/kubcon-training/mesos-marathon/cadvisor/README.md
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/README.md
rename to kubcon-training/mesos-marathon/cadvisor/README.md
diff --git a/velocity-training/mesos-marathon/cadvisor/cadvisor-screenshot.png b/kubcon-training/mesos-marathon/cadvisor/cadvisor-screenshot.png
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/cadvisor-screenshot.png
rename to kubcon-training/mesos-marathon/cadvisor/cadvisor-screenshot.png
diff --git a/velocity-training/mesos-marathon/cadvisor/grafana-screenshot_0.png b/kubcon-training/mesos-marathon/cadvisor/grafana-screenshot_0.png
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/grafana-screenshot_0.png
rename to kubcon-training/mesos-marathon/cadvisor/grafana-screenshot_0.png
diff --git a/velocity-training/mesos-marathon/cadvisor/grafana-screenshot_1.png b/kubcon-training/mesos-marathon/cadvisor/grafana-screenshot_1.png
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/grafana-screenshot_1.png
rename to kubcon-training/mesos-marathon/cadvisor/grafana-screenshot_1.png
diff --git a/velocity-training/mesos-marathon/cadvisor/influxdb-screenshot_0.png b/kubcon-training/mesos-marathon/cadvisor/influxdb-screenshot_0.png
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/influxdb-screenshot_0.png
rename to kubcon-training/mesos-marathon/cadvisor/influxdb-screenshot_0.png
diff --git a/velocity-training/mesos-marathon/cadvisor/influxdb-screenshot_1.png b/kubcon-training/mesos-marathon/cadvisor/influxdb-screenshot_1.png
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/influxdb-screenshot_1.png
rename to kubcon-training/mesos-marathon/cadvisor/influxdb-screenshot_1.png
diff --git a/velocity-training/mesos-marathon/cadvisor/marathon-cadvisor-influxdb.json b/kubcon-training/mesos-marathon/cadvisor/marathon-cadvisor-influxdb.json
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/marathon-cadvisor-influxdb.json
rename to kubcon-training/mesos-marathon/cadvisor/marathon-cadvisor-influxdb.json
diff --git a/velocity-training/mesos-marathon/cadvisor/marathon-cadvisor.json b/kubcon-training/mesos-marathon/cadvisor/marathon-cadvisor.json
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/marathon-cadvisor.json
rename to kubcon-training/mesos-marathon/cadvisor/marathon-cadvisor.json
diff --git a/velocity-training/mesos-marathon/cadvisor/marathon-grafana.json b/kubcon-training/mesos-marathon/cadvisor/marathon-grafana.json
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/marathon-grafana.json
rename to kubcon-training/mesos-marathon/cadvisor/marathon-grafana.json
diff --git a/velocity-training/mesos-marathon/cadvisor/marathon-influxdb.json b/kubcon-training/mesos-marathon/cadvisor/marathon-influxdb.json
similarity index 100%
rename from velocity-training/mesos-marathon/cadvisor/marathon-influxdb.json
rename to kubcon-training/mesos-marathon/cadvisor/marathon-influxdb.json
diff --git a/velocity-training/mesos-marathon/gen.sh b/kubcon-training/mesos-marathon/gen.sh
similarity index 100%
rename from velocity-training/mesos-marathon/gen.sh
rename to kubcon-training/mesos-marathon/gen.sh
diff --git a/velocity-training/mesos-marathon/marathon-hello-world.json b/kubcon-training/mesos-marathon/marathon-hello-world.json
similarity index 100%
rename from velocity-training/mesos-marathon/marathon-hello-world.json
rename to kubcon-training/mesos-marathon/marathon-hello-world.json
diff --git a/velocity-training/mesos-marathon/marathon-peek.json b/kubcon-training/mesos-marathon/marathon-peek.json
similarity index 100%
rename from velocity-training/mesos-marathon/marathon-peek.json
rename to kubcon-training/mesos-marathon/marathon-peek.json
diff --git a/velocity-training/mesos-marathon/marathon-private-registry.json b/kubcon-training/mesos-marathon/marathon-private-registry.json
similarity index 100%
rename from velocity-training/mesos-marathon/marathon-private-registry.json
rename to kubcon-training/mesos-marathon/marathon-private-registry.json
diff --git a/velocity-training/piat/README.md b/kubcon-training/piat/README.md
similarity index 100%
rename from velocity-training/piat/README.md
rename to kubcon-training/piat/README.md
diff --git a/velocity-training/piat/k8s-webserver-pod.json b/kubcon-training/piat/k8s-webserver-pod.json
similarity index 100%
rename from velocity-training/piat/k8s-webserver-pod.json
rename to kubcon-training/piat/k8s-webserver-pod.json
diff --git a/velocity-training/piat/k8s-webserver-service.json b/kubcon-training/piat/k8s-webserver-service.json
similarity index 100%
rename from velocity-training/piat/k8s-webserver-service.json
rename to kubcon-training/piat/k8s-webserver-service.json
diff --git a/velocity-training/piat/marathon-gen.json b/kubcon-training/piat/marathon-gen.json
similarity index 100%
rename from velocity-training/piat/marathon-gen.json
rename to kubcon-training/piat/marathon-gen.json