diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/.gitignore b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/.gitignore
similarity index 100%
rename from background/alarms/repeatingAlarm/repeatingAlarmSample/.gitignore
rename to background/alarms/RepeatingAlarm/RepeatingAlarmSample/.gitignore
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/README-singleview.txt b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/README-singleview.txt
similarity index 100%
rename from background/alarms/repeatingAlarm/repeatingAlarmSample/README-singleview.txt
rename to background/alarms/RepeatingAlarm/RepeatingAlarmSample/README-singleview.txt
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/build.gradle b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/build.gradle
new file mode 100644
index 0000000..69ba7dc
--- /dev/null
+++ b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/build.gradle
@@ -0,0 +1,58 @@
+
+
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.6.+'
+    }
+}
+
+apply plugin: 'android'
+
+dependencies {
+    // Add the support lib that is appropriate for SDK 4
+    compile "com.android.support:support-v4:18.0.+"
+}
+
+// The sample build uses multiple directories to
+// keep boilerplate and common code separate from
+// the main sample code.
+List<String> dirs = [
+    'main',     // main sample code; look here for the interesting stuff.
+    'common',   // components that are reused by multiple samples
+    'template'] // boilerplate code that is generated by the sample template process
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "18.0.1"
+
+    sourceSets {
+        main {
+            dirs.each { dir ->
+                java.srcDirs "src/${dir}/java"
+                res.srcDirs "src/${dir}/res"
+            }
+        }
+        instrumentTest.setRoot('tests')
+        instrumentTest.java.srcDirs = ['tests/src']
+    }
+}
+// BEGIN_EXCLUDE
+// Tasks below this line will be hidden from release output
+
+task preflight (dependsOn: parent.preflight) {
+    project.afterEvaluate {
+        // Inject a preflight task into each variant so we have a place to hook tasks
+        // that need to run before any of the android build tasks.
+        //
+        android.applicationVariants.each { variant ->
+            tasks.getByPath("prepare${variant.name.capitalize()}Dependencies").dependsOn preflight
+        }
+    }
+}
+
+// END_EXCLUDE
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/AndroidManifest.xml b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/AndroidManifest.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/AndroidManifest.xml
rename to background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/AndroidManifest.xml
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
similarity index 100%
rename from background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
rename to background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/repeatingAlarm/repeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/repeatingAlarm/build.gradle b/background/alarms/RepeatingAlarm/build.gradle
similarity index 100%
rename from background/alarms/repeatingAlarm/build.gradle
rename to background/alarms/RepeatingAlarm/build.gradle
diff --git a/background/alarms/repeatingAlarm/buildSrc/build.gradle b/background/alarms/RepeatingAlarm/buildSrc/build.gradle
similarity index 100%
rename from background/alarms/repeatingAlarm/buildSrc/build.gradle
rename to background/alarms/RepeatingAlarm/buildSrc/build.gradle
diff --git a/background/alarms/repeatingAlarm/gradle/wrapper/gradle-wrapper.jar b/background/alarms/RepeatingAlarm/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from background/alarms/repeatingAlarm/gradle/wrapper/gradle-wrapper.jar
rename to background/alarms/RepeatingAlarm/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/background/alarms/repeatingAlarm/gradle/wrapper/gradle-wrapper.properties b/background/alarms/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from background/alarms/repeatingAlarm/gradle/wrapper/gradle-wrapper.properties
rename to background/alarms/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
diff --git a/background/alarms/repeatingAlarm/gradlew b/background/alarms/RepeatingAlarm/gradlew
similarity index 100%
rename from background/alarms/repeatingAlarm/gradlew
rename to background/alarms/RepeatingAlarm/gradlew
diff --git a/background/alarms/repeatingAlarm/gradlew.bat b/background/alarms/RepeatingAlarm/gradlew.bat
similarity index 100%
rename from background/alarms/repeatingAlarm/gradlew.bat
rename to background/alarms/RepeatingAlarm/gradlew.bat
diff --git a/background/alarms/RepeatingAlarm/settings.gradle b/background/alarms/RepeatingAlarm/settings.gradle
new file mode 100644
index 0000000..0f14173
--- /dev/null
+++ b/background/alarms/RepeatingAlarm/settings.gradle
@@ -0,0 +1 @@
+include 'RepeatingAlarmSample'
diff --git a/background/alarms/repeatingAlarm/template-params.xml b/background/alarms/RepeatingAlarm/template-params.xml
similarity index 97%
rename from background/alarms/repeatingAlarm/template-params.xml
rename to background/alarms/RepeatingAlarm/template-params.xml
index b5a52bb..b013a53 100644
--- a/background/alarms/repeatingAlarm/template-params.xml
+++ b/background/alarms/RepeatingAlarm/template-params.xml
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 <sample>
-    <name>repeatingAlarm</name>
+    <name>RepeatingAlarm</name>
     <group>Background</group>
     <package>com.example.android.repeatingalarm</package>
 
diff --git a/background/alarms/repeatingAlarm/Scheduler/AndroidManifest.xml b/background/alarms/Scheduler/AndroidManifest.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/AndroidManifest.xml
rename to background/alarms/Scheduler/AndroidManifest.xml
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/drawable-hdpi/ic_launcher.png b/background/alarms/Scheduler/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/drawable-hdpi/ic_launcher.png
rename to background/alarms/Scheduler/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/drawable-mdpi/ic_launcher.png b/background/alarms/Scheduler/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/drawable-mdpi/ic_launcher.png
rename to background/alarms/Scheduler/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/drawable-xhdpi/ic_launcher.png b/background/alarms/Scheduler/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/drawable-xhdpi/ic_launcher.png
rename to background/alarms/Scheduler/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/drawable-xxhdpi/ic_launcher.png b/background/alarms/Scheduler/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/drawable-xxhdpi/ic_launcher.png
rename to background/alarms/Scheduler/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/layout/activity_main.xml b/background/alarms/Scheduler/res/layout/activity_main.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/layout/activity_main.xml
rename to background/alarms/Scheduler/res/layout/activity_main.xml
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/menu/main.xml b/background/alarms/Scheduler/res/menu/main.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/menu/main.xml
rename to background/alarms/Scheduler/res/menu/main.xml
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/values-sw600dp/styles.xml b/background/alarms/Scheduler/res/values-sw600dp/styles.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/values-sw600dp/styles.xml
rename to background/alarms/Scheduler/res/values-sw600dp/styles.xml
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/values-v11/styles.xml b/background/alarms/Scheduler/res/values-v11/styles.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/values-v11/styles.xml
rename to background/alarms/Scheduler/res/values-v11/styles.xml
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/values/dimens.xml b/background/alarms/Scheduler/res/values/dimens.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/values/dimens.xml
rename to background/alarms/Scheduler/res/values/dimens.xml
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/values/strings.xml b/background/alarms/Scheduler/res/values/strings.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/values/strings.xml
rename to background/alarms/Scheduler/res/values/strings.xml
diff --git a/background/alarms/repeatingAlarm/Scheduler/res/values/styles.xml b/background/alarms/Scheduler/res/values/styles.xml
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/res/values/styles.xml
rename to background/alarms/Scheduler/res/values/styles.xml
diff --git a/background/alarms/repeatingAlarm/Scheduler/src/com/example/android/scheduler/MainActivity.java b/background/alarms/Scheduler/src/com/example/android/scheduler/MainActivity.java
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/src/com/example/android/scheduler/MainActivity.java
rename to background/alarms/Scheduler/src/com/example/android/scheduler/MainActivity.java
diff --git a/background/alarms/repeatingAlarm/Scheduler/src/com/example/android/scheduler/SampleAlarmReceiver.java b/background/alarms/Scheduler/src/com/example/android/scheduler/SampleAlarmReceiver.java
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/src/com/example/android/scheduler/SampleAlarmReceiver.java
rename to background/alarms/Scheduler/src/com/example/android/scheduler/SampleAlarmReceiver.java
diff --git a/background/alarms/repeatingAlarm/Scheduler/src/com/example/android/scheduler/SampleBootReceiver.java b/background/alarms/Scheduler/src/com/example/android/scheduler/SampleBootReceiver.java
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/src/com/example/android/scheduler/SampleBootReceiver.java
rename to background/alarms/Scheduler/src/com/example/android/scheduler/SampleBootReceiver.java
diff --git a/background/alarms/repeatingAlarm/Scheduler/src/com/example/android/scheduler/SampleSchedulingService.java b/background/alarms/Scheduler/src/com/example/android/scheduler/SampleSchedulingService.java
similarity index 100%
rename from background/alarms/repeatingAlarm/Scheduler/src/com/example/android/scheduler/SampleSchedulingService.java
rename to background/alarms/Scheduler/src/com/example/android/scheduler/SampleSchedulingService.java
diff --git a/background/alarms/repeatingAlarm/settings.gradle b/background/alarms/repeatingAlarm/settings.gradle
deleted file mode 100644
index 73a49e8..0000000
--- a/background/alarms/repeatingAlarm/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include 'repeatingAlarmSample'
diff --git a/build.gradle b/build.gradle
index d42baf8..1d2ce63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@
 "ui/window/BasicImmersiveMode",
 "ui/window/AdvancedImmersiveMode",
 "ui/window/ImmersiveMode",
-"background/alarms/repeatingAlarm"
+"background/alarms/RepeatingAlarm"
 ]
 
 List<String> taskNames = [