27 files changed, 5 insertions, 5 deletions

diff --git a/Android.mk b/Android.mk
index 55ec38799..4f85ce5dd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -211,7 +211,7 @@ include $(BUILD_EXECUTABLE)
 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 878651c8e..108429193 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -7,5 +7,5 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
 
 [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
index 487263f73..487263f73 100644
--- a/sample_updater/.gitignore
+++ b/updater_sample/.gitignore
diff --git a/sample_updater/Android.mk b/updater_sample/Android.mk
index 2786de44f..2786de44f 100644
--- a/sample_updater/Android.mk
+++ b/updater_sample/Android.mk
diff --git a/sample_updater/AndroidManifest.xml b/updater_sample/AndroidManifest.xml
index 5bbb21c84..5bbb21c84 100644
--- a/sample_updater/AndroidManifest.xml
+++ b/updater_sample/AndroidManifest.xml
diff --git a/sample_updater/README.md b/updater_sample/README.md
index 467ef5d4a..d9864b472 100644
--- a/sample_updater/README.md
+++ b/updater_sample/README.md
@@ -13,7 +13,7 @@ targets the latest android.
 
 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 @@ is located at `res/raw/sample.json`.
 
 ## 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
index 3cd772107..3cd772107 100644
--- a/sample_updater/res/layout/activity_main.xml
+++ b/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
index a2f590828..a2f590828 100644
--- a/sample_updater/res/mipmap-hdpi/ic_launcher.png
+++ b/updater_sample/res/mipmap-hdpi/ic_launcher.png
diff --git a/sample_updater/res/mipmap-hdpi/ic_launcher_round.png b/updater_sample/res/mipmap-hdpi/ic_launcher_round.png
index 1b5239980..1b5239980 100644
--- a/sample_updater/res/mipmap-hdpi/ic_launcher_round.png
+++ b/updater_sample/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/sample_updater/res/raw/sample.json b/updater_sample/res/raw/sample.json
index 03335cc97..03335cc97 100644
--- a/sample_updater/res/raw/sample.json
+++ b/updater_sample/res/raw/sample.json
diff --git a/sample_updater/res/values/strings.xml b/updater_sample/res/values/strings.xml
index 2b671ee5d..2b671ee5d 100644
--- a/sample_updater/res/values/strings.xml
+++ b/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
index 90c5637ea..90c5637ea 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/PayloadSpec.java
+++ b/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
index cbee18fcb..cbee18fcb 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/UpdateConfig.java
+++ b/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
index 72e1b2469..72e1b2469 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/ui/MainActivity.java
+++ b/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
index 1b91a1ac3..1b91a1ac3 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/updates/AbNonStreamingUpdate.java
+++ b/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
index 3988b5928..3988b5928 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/util/PackagePropertyFiles.java
+++ b/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
index 43c8d75e2..43c8d75e2 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/util/PayloadSpecs.java
+++ b/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
index 089f8b2f2..089f8b2f2 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/util/UpdateConfigs.java
+++ b/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
index e63da6298..e63da6298 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/util/UpdateEngineErrorCodes.java
+++ b/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
index 6203b201a..6203b201a 100644
--- a/sample_updater/src/com/example/android/systemupdatersample/util/UpdateEngineStatuses.java
+++ b/updater_sample/src/com/example/android/systemupdatersample/util/UpdateEngineStatuses.java
diff --git a/sample_updater/tests/Android.mk b/updater_sample/tests/Android.mk
index 1ec68b9f3..1ec68b9f3 100644
--- a/sample_updater/tests/Android.mk
+++ b/updater_sample/tests/Android.mk
diff --git a/sample_updater/tests/AndroidManifest.xml b/updater_sample/tests/AndroidManifest.xml
index 145576ccf..2392bb3af 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
index e0c39def1..e0c39def1 100644
--- a/sample_updater/tests/build.properties
+++ b/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
index 87153715e..87153715e 100644
--- a/sample_updater/tests/src/com/example/android/systemupdatersample/UpdateConfigTest.java
+++ b/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
index 01014168a..01014168a 100644
--- a/sample_updater/tests/src/com/example/android/systemupdatersample/ui/MainActivityTest.java
+++ b/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
index 6f06ca3e1..6f06ca3e1 100644
--- a/sample_updater/tests/src/com/example/android/systemupdatersample/util/PayloadSpecsTest.java
+++ b/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
index 4aa8c6453..4aa8c6453 100644
--- a/sample_updater/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java
+++ b/updater_sample/tests/src/com/example/android/systemupdatersample/util/UpdateConfigsTest.java