diff --git a/src/video_engine/main/test/android_test/Android.mk b/src/video_engine/main/test/android_test/Android.mk
index 4f6553467..25adf0c38 100644
--- a/src/video_engine/main/test/android_test/Android.mk
+++ b/src/video_engine/main/test/android_test/Android.mk
@@ -13,7 +13,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_SRC_FILES := \
-    src/org/webrtc/videoengineapp/ViEAndroidDemo.java \
+    src/org/webrtc/videoengineapp/WebRTCDemo.java \
     src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java \
     src/org/webrtc/videoengineapp/IViEAndroidCallback.java \
     src/org/webrtc/videoengine/CaptureCapabilityAndroid.java \
diff --git a/src/video_engine/main/test/android_test/AndroidManifest.xml b/src/video_engine/main/test/android_test/AndroidManifest.xml
index 08a9c4d9c..2b11ba413 100644
--- a/src/video_engine/main/test/android_test/AndroidManifest.xml
+++ b/src/video_engine/main/test/android_test/AndroidManifest.xml
@@ -4,7 +4,7 @@
     <application android:icon="@drawable/logo"
 		 android:label="@string/app_name"
 		 android:debuggable="true">
-        <activity android:name=".ViEAndroidDemo"
+        <activity android:name=".WebRTCDemo"
                   android:label="@string/app_name" 
                   android:configChanges="keyboardHidden|orientation"                  
                   >
diff --git a/src/video_engine/main/test/android_test/build.xml b/src/video_engine/main/test/android_test/build.xml
index 9afa94757..476b98fcd 100644
--- a/src/video_engine/main/test/android_test/build.xml
+++ b/src/video_engine/main/test/android_test/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ViEAndroidDemo" default="help">
+<project name="WebRTCDemo" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/src/video_engine/main/test/android_test/res/values/strings.xml b/src/video_engine/main/test/android_test/res/values/strings.xml
index 6597bec29..1ebe8f03b 100644
--- a/src/video_engine/main/test/android_test/res/values/strings.xml
+++ b/src/video_engine/main/test/android_test/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>   
-    <string name="app_name">ViEDemo</string>
+    <string name="app_name">WebRTC</string>
     <string name="error">Error</string>
     <string name="errorCamera">Camera Error</string>
 <string name="codectype_prompt">Choose a codec type</string>
diff --git a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidDemo.java b/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java
similarity index 99%
rename from src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidDemo.java
rename to src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java
index 1213f28e3..d0f1c618e 100644
--- a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidDemo.java
+++ b/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java
@@ -50,7 +50,7 @@ import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.TabHost.TabSpec;
 import android.view.OrientationEventListener;
 
-public class ViEAndroidDemo extends TabActivity implements IViEAndroidCallback,
+public class WebRTCDemo extends TabActivity implements IViEAndroidCallback,
                                                 View.OnClickListener,
                                                 OnItemSelectedListener {
     private ViEAndroidJavaAPI ViEAndroidAPI = null;
@@ -552,7 +552,7 @@ public class ViEAndroidDemo extends TabActivity implements IViEAndroidCallback,
     private void SetupVoE() {
         // Create VoiceEngine
         // Error logging is done in native API wrapper
-        ViEAndroidAPI.VoE_Create(this);
+        ViEAndroidAPI.VoE_Create();
 
         // Initialize
         if (0 != ViEAndroidAPI.VoE_Init(enableTrace)) {