diff --git a/samples/training/basic/activity-lifecycle/AndroidManifest.xml b/samples/training/basic/ActivityLifecycle/AndroidManifest.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/AndroidManifest.xml
rename to samples/training/basic/ActivityLifecycle/AndroidManifest.xml
diff --git a/samples/training/basic/activity-lifecycle/ant.properties b/samples/training/basic/ActivityLifecycle/ant.properties
similarity index 100%
rename from samples/training/basic/activity-lifecycle/ant.properties
rename to samples/training/basic/ActivityLifecycle/ant.properties
diff --git a/samples/training/basic/activity-lifecycle/build.properties b/samples/training/basic/ActivityLifecycle/build.properties
similarity index 100%
rename from samples/training/basic/activity-lifecycle/build.properties
rename to samples/training/basic/ActivityLifecycle/build.properties
diff --git a/samples/training/basic/activity-lifecycle/build.xml b/samples/training/basic/ActivityLifecycle/build.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/build.xml
rename to samples/training/basic/ActivityLifecycle/build.xml
diff --git a/samples/training/basic/activity-lifecycle/default.properties b/samples/training/basic/ActivityLifecycle/default.properties
similarity index 100%
rename from samples/training/basic/activity-lifecycle/default.properties
rename to samples/training/basic/ActivityLifecycle/default.properties
diff --git a/samples/training/basic/activity-lifecycle/libs/android-support-v13.jar b/samples/training/basic/ActivityLifecycle/libs/android-support-v13.jar
similarity index 100%
rename from samples/training/basic/activity-lifecycle/libs/android-support-v13.jar
rename to samples/training/basic/ActivityLifecycle/libs/android-support-v13.jar
diff --git a/samples/training/basic/activity-lifecycle/local.properties b/samples/training/basic/ActivityLifecycle/local.properties
similarity index 100%
rename from samples/training/basic/activity-lifecycle/local.properties
rename to samples/training/basic/ActivityLifecycle/local.properties
diff --git a/samples/training/basic/activity-lifecycle/proguard.cfg b/samples/training/basic/ActivityLifecycle/proguard.cfg
similarity index 100%
rename from samples/training/basic/activity-lifecycle/proguard.cfg
rename to samples/training/basic/ActivityLifecycle/proguard.cfg
diff --git a/samples/training/basic/activity-lifecycle/project.properties b/samples/training/basic/ActivityLifecycle/project.properties
similarity index 100%
rename from samples/training/basic/activity-lifecycle/project.properties
rename to samples/training/basic/ActivityLifecycle/project.properties
diff --git a/samples/training/basic/activity-lifecycle/res/drawable-hdpi/ic_launcher.png b/samples/training/basic/ActivityLifecycle/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/drawable-hdpi/ic_launcher.png
rename to samples/training/basic/ActivityLifecycle/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/training/basic/activity-lifecycle/res/drawable-ldpi/ic_launcher.png b/samples/training/basic/ActivityLifecycle/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/drawable-ldpi/ic_launcher.png
rename to samples/training/basic/ActivityLifecycle/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/training/basic/activity-lifecycle/res/drawable-mdpi/ic_launcher.png b/samples/training/basic/ActivityLifecycle/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/drawable-mdpi/ic_launcher.png
rename to samples/training/basic/ActivityLifecycle/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/training/basic/activity-lifecycle/res/drawable-xhdpi/ic_launcher.png b/samples/training/basic/ActivityLifecycle/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/drawable-xhdpi/ic_launcher.png
rename to samples/training/basic/ActivityLifecycle/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/training/basic/activity-lifecycle/res/layout/activity_a.xml b/samples/training/basic/ActivityLifecycle/res/layout/activity_a.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/layout/activity_a.xml
rename to samples/training/basic/ActivityLifecycle/res/layout/activity_a.xml
diff --git a/samples/training/basic/activity-lifecycle/res/layout/activity_b.xml b/samples/training/basic/ActivityLifecycle/res/layout/activity_b.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/layout/activity_b.xml
rename to samples/training/basic/ActivityLifecycle/res/layout/activity_b.xml
diff --git a/samples/training/basic/activity-lifecycle/res/layout/activity_c.xml b/samples/training/basic/ActivityLifecycle/res/layout/activity_c.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/layout/activity_c.xml
rename to samples/training/basic/ActivityLifecycle/res/layout/activity_c.xml
diff --git a/samples/training/basic/activity-lifecycle/res/layout/activity_dialog.xml b/samples/training/basic/ActivityLifecycle/res/layout/activity_dialog.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/layout/activity_dialog.xml
rename to samples/training/basic/ActivityLifecycle/res/layout/activity_dialog.xml
diff --git a/samples/training/basic/activity-lifecycle/res/values/colors.xml b/samples/training/basic/ActivityLifecycle/res/values/colors.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/values/colors.xml
rename to samples/training/basic/ActivityLifecycle/res/values/colors.xml
diff --git a/samples/training/basic/activity-lifecycle/res/values/dimensions.xml b/samples/training/basic/ActivityLifecycle/res/values/dimensions.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/values/dimensions.xml
rename to samples/training/basic/ActivityLifecycle/res/values/dimensions.xml
diff --git a/samples/training/basic/activity-lifecycle/res/values/strings.xml b/samples/training/basic/ActivityLifecycle/res/values/strings.xml
similarity index 100%
rename from samples/training/basic/activity-lifecycle/res/values/strings.xml
rename to samples/training/basic/ActivityLifecycle/res/values/strings.xml
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityA.java b/samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityA.java
similarity index 100%
rename from samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityA.java
rename to samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityA.java
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityB.java b/samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityB.java
similarity index 100%
rename from samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityB.java
rename to samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityB.java
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityC.java b/samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityC.java
similarity index 100%
rename from samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/ActivityC.java
rename to samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/ActivityC.java
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/DialogActivity.java b/samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/DialogActivity.java
similarity index 100%
rename from samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/DialogActivity.java
rename to samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/DialogActivity.java
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/util/StatusTracker.java b/samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/util/StatusTracker.java
similarity index 100%
rename from samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/util/StatusTracker.java
rename to samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/util/StatusTracker.java
diff --git a/samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/util/Utils.java b/samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/util/Utils.java
similarity index 100%
rename from samples/training/basic/activity-lifecycle/src/com/example/android/lifecycle/util/Utils.java
rename to samples/training/basic/ActivityLifecycle/src/com/example/android/lifecycle/util/Utils.java