diff --git a/Android.mk b/Android.mk
index e54db2d..eef4a02 100644
--- a/Android.mk
+++ b/Android.mk
@@ -199,7 +199,7 @@
 include \
     $(LOCAL_PATH)/boot_control/Android.mk \
     $(LOCAL_PATH)/minui/Android.mk \
-    $(LOCAL_PATH)/sample_updater/Android.mk \
     $(LOCAL_PATH)/tests/Android.mk \
     $(LOCAL_PATH)/tools/Android.mk \
     $(LOCAL_PATH)/updater/Android.mk \
+    $(LOCAL_PATH)/updater_sample/Android.mk \
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 878651c..1084291 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -7,5 +7,5 @@
 
 [Hook Scripts]
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
-                  -fw sample_updater/
+                  -fw updater_sample/
 
diff --git a/sample_updater/.gitignore b/updater_sample/.gitignore
similarity index 100%
rename from sample_updater/.gitignore
rename to updater_sample/.gitignore
diff --git a/sample_updater/Android.mk b/updater_sample/Android.mk
similarity index 100%
rename from sample_updater/Android.mk
rename to updater_sample/Android.mk
diff --git a/sample_updater/AndroidManifest.xml b/updater_sample/AndroidManifest.xml
similarity index 100%
rename from sample_updater/AndroidManifest.xml
rename to updater_sample/AndroidManifest.xml
diff --git a/sample_updater/README.md b/updater_sample/README.md
similarity index 94%
rename from sample_updater/README.md
rename to updater_sample/README.md
index 467ef5d..d9864b4 100644
--- a/sample_updater/README.md
+++ b/updater_sample/README.md
@@ -13,7 +13,7 @@
 
 The commands expected to be run from `$ANDROID_BUILD_TOP`.
 
-1. Compile the app `$ mmma bootable/recovery/sample_updater`.
+1. Compile the app `$ mmma bootable/recovery/updater_sample`.
 2. Install the app to the device using `$ adb install <APK_PATH>`.
 3. Add update config files.
 
@@ -45,7 +45,7 @@
 
 ## Running tests
 
-1. Build `$ mmma bootable/recovery/sample_updater/`
+1. Build `$ mmma bootable/recovery/updater_sample/`
 2. Install app
    `$ adb install $OUT/system/app/SystemUpdaterSample/SystemUpdaterSample.apk`
 3. Install tests
diff --git a/sample_updater/res/layout/activity_main.xml b/updater_sample/res/layout/activity_main.xml
similarity index 100%
rename from sample_updater/res/layout/activity_main.xml
rename to updater_sample/res/layout/activity_main.xml
diff --git a/sample_updater/res/mipmap-hdpi/ic_launcher.png b/updater_sample/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from sample_updater/res/mipmap-hdpi/ic_launcher.png
rename to updater_sample/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/sample_updater/res/mipmap-hdpi/ic_launcher_round.png b/updater_sample/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from sample_updater/res/mipmap-hdpi/ic_launcher_round.png
rename to updater_sample/res/mipmap-hdpi/ic_launcher_round.png
Binary files differ
diff --git a/sample_updater/res/raw/sample.json b/updater_sample/res/raw/sample.json
similarity index 100%
rename from sample_updater/res/raw/sample.json
rename to updater_sample/res/raw/sample.json
diff --git a/sample_updater/res/values/strings.xml b/updater_sample/res/values/strings.xml
similarity index 100%
rename from sample_updater/res/values/strings.xml
rename to updater_sample/res/values/strings.xml
diff --git a/sample_updater/src/com/example/android/systemupdatersample/PayloadSpec.java b/updater_sample/src/com/example/android/systemupdatersample/PayloadSpec.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/PayloadSpec.java
rename to updater_sample/src/com/example/android/systemupdatersample/PayloadSpec.java
diff --git a/sample_updater/src/com/example/android/systemupdatersample/UpdateConfig.java b/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/UpdateConfig.java
rename to updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java
diff --git a/sample_updater/src/com/example/android/systemupdatersample/ui/MainActivity.java b/updater_sample/src/com/example/android/systemupdatersample/ui/MainActivity.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/ui/MainActivity.java
rename to updater_sample/src/com/example/android/systemupdatersample/ui/MainActivity.java
diff --git a/sample_updater/src/com/example/android/systemupdatersample/updates/AbNonStreamingUpdate.java b/updater_sample/src/com/example/android/systemupdatersample/updates/AbNonStreamingUpdate.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/updates/AbNonStreamingUpdate.java
rename to updater_sample/src/com/example/android/systemupdatersample/updates/AbNonStreamingUpdate.java
diff --git a/sample_updater/src/com/example/android/systemupdatersample/util/PackagePropertyFiles.java b/updater_sample/src/com/example/android/systemupdatersample/util/PackagePropertyFiles.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/util/PackagePropertyFiles.java
rename to updater_sample/src/com/example/android/systemupdatersample/util/PackagePropertyFiles.java
diff --git a/sample_updater/src/com/example/android/systemupdatersample/util/PayloadSpecs.java b/updater_sample/src/com/example/android/systemupdatersample/util/PayloadSpecs.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/util/PayloadSpecs.java
rename to updater_sample/src/com/example/android/systemupdatersample/util/PayloadSpecs.java
diff --git a/sample_updater/src/com/example/android/systemupdatersample/util/UpdateConfigs.java b/updater_sample/src/com/example/android/systemupdatersample/util/UpdateConfigs.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/util/UpdateConfigs.java
rename to updater_sample/src/com/example/android/systemupdatersample/util/UpdateConfigs.java
diff --git a/sample_updater/src/com/example/android/systemupdatersample/util/UpdateEngineErrorCodes.java b/updater_sample/src/com/example/android/systemupdatersample/util/UpdateEngineErrorCodes.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/util/UpdateEngineErrorCodes.java
rename to updater_sample/src/com/example/android/systemupdatersample/util/UpdateEngineErrorCodes.java
diff --git a/sample_updater/src/com/example/android/systemupdatersample/util/UpdateEngineStatuses.java b/updater_sample/src/com/example/android/systemupdatersample/util/UpdateEngineStatuses.java
similarity index 100%
rename from sample_updater/src/com/example/android/systemupdatersample/util/UpdateEngineStatuses.java
rename to updater_sample/src/com/example/android/systemupdatersample/util/UpdateEngineStatuses.java
diff --git a/sample_updater/tests/Android.mk b/updater_sample/tests/Android.mk
similarity index 100%
rename from sample_updater/tests/Android.mk
rename to updater_sample/tests/Android.mk
diff --git a/sample_updater/tests/AndroidManifest.xml b/updater_sample/tests/AndroidManifest.xml
similarity index 94%
rename from sample_updater/tests/AndroidManifest.xml
rename to updater_sample/tests/AndroidManifest.xml
index 145576c..2392bb3 100644
--- a/sample_updater/tests/AndroidManifest.xml
+++ b/updater_sample/tests/AndroidManifest.xml
@@ -26,6 +26,6 @@
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
                      android:targetPackage="com.example.android.systemupdatersample"
-                     android:label="Tests for SampleUpdater."/>
+                     android:label="Tests for SystemUpdaterSample."/>
 
 </manifest>
diff --git a/sample_updater/tests/build.properties b/updater_sample/tests/build.properties
similarity index 100%
rename from sample_updater/tests/build.properties
rename to updater_sample/tests/build.properties
diff --git a/sample_updater/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java b/updater_sample/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java
similarity index 100%
rename from sample_updater/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java
rename to updater_sample/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java
diff --git a/sample_updater/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java b/updater_sample/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java
similarity index 100%
rename from sample_updater/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java
rename to updater_sample/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java
diff --git a/sample_updater/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java b/updater_sample/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java
similarity index 100%
rename from sample_updater/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java
rename to updater_sample/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java
diff --git a/sample_updater/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java b/updater_sample/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java
similarity index 100%
rename from sample_updater/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java
rename to updater_sample/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java