diff --git a/src/video_engine/main/test/android_test/res/layout/main.xml b/src/video_engine/main/test/android_test/res/layout/main.xml
index af1ecd5502..c9cb6ce8cc 100644
--- a/src/video_engine/main/test/android_test/res/layout/main.xml
+++ b/src/video_engine/main/test/android_test/res/layout/main.xml
@@ -67,19 +67,19 @@
                   android:orientation="vertical"
                   android:id="@+id/radio_group1">
                   <RadioButton
-                          android:id="@+id/radio_surface"
-                          android:onClick="onClick"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:text="@string/surfaceview"
-                          android:checked="true"
-                          android:textColor="#f00"/>
-                 <RadioButton
                           android:id="@+id/radio_opengl"
                           android:onClick="onClick"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:text="@string/opengl"
+                          android:checked="true"
+                          android:textColor="#0f0"/>
+                 <RadioButton
+                          android:id="@+id/radio_surface"
+                          android:onClick="onClick"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/surfaceview"
                           android:textColor="#0f0" />
         </RadioGroup>
 	</LinearLayout>
diff --git a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java b/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java
index 7ba46f06eb..5e769e4c1c 100644
--- a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java
+++ b/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/WebRTCDemo.java
@@ -120,7 +120,7 @@ public class WebRTCDemo extends TabActivity implements IViEAndroidCallback,
     private boolean loopbackMode = true;
     private CheckBox cbStats;
     private boolean isStatsOn = true;
-    private boolean isSurfaceView = true;
+    private boolean useOpenGLRender = true;
 
     // Video settings
     private Spinner spCodecType;
@@ -385,11 +385,11 @@ public class WebRTCDemo extends TabActivity implements IViEAndroidCallback,
 
         RadioGroup radioGroup = (RadioGroup)findViewById(R.id.radio_group1);
         radioGroup.clearCheck();
-        if (isSurfaceView == true) {
-            radioGroup.check(R.id.radio_surface);
+        if (useOpenGLRender == true) {
+            radioGroup.check(R.id.radio_opengl);
         }
         else {
-            radioGroup.check(R.id.radio_opengl);
+            radioGroup.check(R.id.radio_surface);
         }
 
         // voice codec
@@ -482,7 +482,7 @@ public class WebRTCDemo extends TabActivity implements IViEAndroidCallback,
                     remoteIp.getBytes());
 
             if (enableVideoReceive) {
-                if(!isSurfaceView) {
+                if(useOpenGLRender) {
                     Log.v(TAG, "Create OpenGL Render");
                     remoteSurfaceView = ViERenderer.CreateRenderer(this, true);
                     ret = ViEAndroidAPI.AddRemoteRenderer(channel, remoteSurfaceView);
@@ -704,10 +704,10 @@ public class WebRTCDemo extends TabActivity implements IViEAndroidCallback,
                 }
                 break;
             case R.id.radio_surface:
-                isSurfaceView = true;
+                useOpenGLRender = false;
                 break;
             case R.id.radio_opengl:
-                isSurfaceView = false;
+                useOpenGLRender = true;
                 break;
             case R.id.cbNack:
                 enableNack  = cbEnableNack.isChecked();