diff --git a/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml b/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
index 230f479a6..510e97ab6 100644
--- a/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
+++ b/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
@@ -24,7 +24,7 @@
                 android:configChanges="orientation|keyboardHidden">
             <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name"
-                    android:value="NativeActivity" />
+                    android:value="TeapotNativeActivity" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/ndk/platforms/android-17/samples/Teapot/jni/Android.mk b/ndk/platforms/android-17/samples/Teapot/jni/Android.mk
index 6db5a40b1..583743f97 100644
--- a/ndk/platforms/android-17/samples/Teapot/jni/Android.mk
+++ b/ndk/platforms/android-17/samples/Teapot/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := NativeActivity
+LOCAL_MODULE    := TeapotNativeActivity
 LOCAL_SRC_FILES := TeapotNativeActivity.cpp \
 TeapotRenderer.cpp \
 
diff --git a/ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp b/ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp
index 60eab991b..9efff811d 100644
--- a/ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp
+++ b/ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp
@@ -444,7 +444,7 @@ void android_main( android_app* state )
     state->onInputEvent = Engine::HandleInput;
 
 #ifdef USE_NDK_PROFILER
-    monstartup("libNativeActivity.so");
+    monstartup("libTeapotNativeActivity.so");
 #endif
 
     // Prepare to monitor accelerometer
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/AndroidManifest.xml b/ndk/platforms/android-18/samples/MoreTeapots/AndroidManifest.xml
index b5c0473c7..ae0bc3d63 100644
--- a/ndk/platforms/android-18/samples/MoreTeapots/AndroidManifest.xml
+++ b/ndk/platforms/android-18/samples/MoreTeapots/AndroidManifest.xml
@@ -24,7 +24,7 @@
                 android:configChanges="orientation|keyboardHidden">
             <!-- Tell NativeActivity the name of or .so -->
             <meta-data android:name="android.app.lib_name"
-                    android:value="NativeActivity" />
+                    android:value="MoreTeapotsNativeActivity" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/jni/Android.mk b/ndk/platforms/android-18/samples/MoreTeapots/jni/Android.mk
index b53ccb042..cb0faf7c8 100644
--- a/ndk/platforms/android-18/samples/MoreTeapots/jni/Android.mk
+++ b/ndk/platforms/android-18/samples/MoreTeapots/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := NativeActivity
+LOCAL_MODULE    := MoreTeapotsNativeActivity
 LOCAL_SRC_FILES := MoreTeapotsNativeActivity.cpp \
 MoreTeapotsRenderer.cpp \
 
@@ -16,4 +16,4 @@ include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/ndk_helper)
 $(call import-module,android/native_app_glue)
-$(call import-module,android/cpufeatures)
\ No newline at end of file
+$(call import-module,android/cpufeatures)
diff --git a/ndk/platforms/android-18/samples/MoreTeapots/jni/MoreTeapotsNativeActivity.cpp b/ndk/platforms/android-18/samples/MoreTeapots/jni/MoreTeapotsNativeActivity.cpp
index 71924fafa..d5f215adb 100644
--- a/ndk/platforms/android-18/samples/MoreTeapots/jni/MoreTeapotsNativeActivity.cpp
+++ b/ndk/platforms/android-18/samples/MoreTeapots/jni/MoreTeapotsNativeActivity.cpp
@@ -455,7 +455,7 @@ void android_main( android_app* state )
     state->onInputEvent = Engine::HandleInput;
 
 #ifdef USE_NDK_PROFILER
-    monstartup("libNativeActivity.so");
+    monstartup("libMoreTeapotsNativeActivity.so");
 #endif
 
     // Prepare to monitor accelerometer
diff --git a/ndk/sources/android/ndk_helper/GLContext.h b/ndk/sources/android/ndk_helper/GLContext.h
index bbdbd198c..cc0db463e 100644
--- a/ndk/sources/android/ndk_helper/GLContext.h
+++ b/ndk/sources/android/ndk_helper/GLContext.h
@@ -15,7 +15,7 @@
  */
 
 //--------------------------------------------------------------------------------
-// glContext.h
+// GLContext.h
 //--------------------------------------------------------------------------------
 #ifndef GLCONTEXT_H_
 #define GLCONTEXT_H_