diff --git a/build/sdk.atree b/build/sdk.atree
index 35ca61acf..8742b6aa6 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -154,7 +154,7 @@ development/samples/source.properties        samples/${PLATFORM_NAME}/source.pro
 development/samples/AccessibilityService       samples/${PLATFORM_NAME}/AccessibilityService
 development/samples/AccelerometerPlay          samples/${PLATFORM_NAME}/AccelerometerPlay
 development/samples/ActionBarCompat            samples/${PLATFORM_NAME}/ActionBarCompat
-development/samples/AndroidBeam                samples/${PLATFORM_NAME}/AndroidBeam
+development/samples/AndroidBeamDemo            samples/${PLATFORM_NAME}/AndroidBeamDemo
 development/samples/ApiDemos                   samples/${PLATFORM_NAME}/ApiDemos
 development/samples/BackupRestore              samples/${PLATFORM_NAME}/BackupRestore
 development/samples/BasicGLSurfaceView         samples/${PLATFORM_NAME}/BasicGLSurfaceView
diff --git a/samples/AndroidBeam/res/drawable-hdpi/icon.png b/samples/AndroidBeam/res/drawable-hdpi/icon.png
deleted file mode 100644
index 8074c4c57..000000000
Binary files a/samples/AndroidBeam/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/samples/AndroidBeam/res/drawable-ldpi/icon.png b/samples/AndroidBeam/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584ec..000000000
Binary files a/samples/AndroidBeam/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/samples/AndroidBeam/res/drawable-mdpi/icon.png b/samples/AndroidBeam/res/drawable-mdpi/icon.png
deleted file mode 100644
index a07c69fa5..000000000
Binary files a/samples/AndroidBeam/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/samples/AndroidBeam/AndroidManifest.xml b/samples/AndroidBeamDemo/AndroidManifest.xml
similarity index 100%
rename from samples/AndroidBeam/AndroidManifest.xml
rename to samples/AndroidBeamDemo/AndroidManifest.xml
diff --git a/samples/AndroidBeam/_index.html b/samples/AndroidBeamDemo/_index.html
similarity index 66%
rename from samples/AndroidBeam/_index.html
rename to samples/AndroidBeamDemo/_index.html
index ad4e71a8f..9fe80b08a 100755
--- a/samples/AndroidBeam/_index.html
+++ b/samples/AndroidBeamDemo/_index.html
@@ -1,3 +1,3 @@
-<p>The Beam application demonstrates how to use the Android Beam feature introduced in API level 14. This
+<p>Android Beam Demo shows how to use the Android Beam feature introduced in API level 14. This
 application beams a simple message from one device to another when they are in close enough proximity. This
 application must be installed on two devices that have NFC capabilities, running Android 4.0 or later.</p>
diff --git a/samples/AndroidBeamDemo/drawable-hdpi/ic_launcher.png b/samples/AndroidBeamDemo/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..c96fa9e05
Binary files /dev/null and b/samples/AndroidBeamDemo/drawable-hdpi/ic_launcher.png differ
diff --git a/samples/AndroidBeamDemo/drawable-ldpi/ic_launcher.png b/samples/AndroidBeamDemo/drawable-ldpi/ic_launcher.png
new file mode 100644
index 000000000..ab4d45e78
Binary files /dev/null and b/samples/AndroidBeamDemo/drawable-ldpi/ic_launcher.png differ
diff --git a/samples/AndroidBeamDemo/drawable-mdpi/ic_launcher.png b/samples/AndroidBeamDemo/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..e9ce6eb68
Binary files /dev/null and b/samples/AndroidBeamDemo/drawable-mdpi/ic_launcher.png differ
diff --git a/samples/AndroidBeamDemo/drawable-xhdpi/ic_launcher.png b/samples/AndroidBeamDemo/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..cd225d768
Binary files /dev/null and b/samples/AndroidBeamDemo/drawable-xhdpi/ic_launcher.png differ
diff --git a/samples/AndroidBeam/res/layout/main.xml b/samples/AndroidBeamDemo/res/layout/main.xml
similarity index 100%
rename from samples/AndroidBeam/res/layout/main.xml
rename to samples/AndroidBeamDemo/res/layout/main.xml
diff --git a/samples/AndroidBeam/res/values/strings.xml b/samples/AndroidBeamDemo/res/values/strings.xml
similarity index 100%
rename from samples/AndroidBeam/res/values/strings.xml
rename to samples/AndroidBeamDemo/res/values/strings.xml
diff --git a/samples/AndroidBeam/src/com/example/android/beam/Beam.java b/samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java
similarity index 100%
rename from samples/AndroidBeam/src/com/example/android/beam/Beam.java
rename to samples/AndroidBeamDemo/src/com/example/android/beam/Beam.java