diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SecondMapActivityTest.java b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java
similarity index 75%
rename from android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SecondMapActivityTest.java
rename to android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java
index e80098e1c..37b886ba6 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SecondMapActivityTest.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java
@@ -15,17 +15,17 @@ import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 
 /**
- * Tests on SecondMapActivity.
+ * Tests on InfoWindowAdapterActivity.
  */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
-public class SecondMapActivityTest extends BaseTest {
+public class InfoWindowAdapterActivityTest extends BaseTest {
 
     @Rule
-    public ActivityTestRule<SecondMapActivity> mActivityRule = new ActivityTestRule<>(
-            SecondMapActivity.class);
+    public ActivityTestRule<InfoWindowAdapterActivity> mActivityRule = new ActivityTestRule<>(
+            InfoWindowAdapterActivity.class);
 
-    private SecondMapActivity mActivity = null;
+    private InfoWindowAdapterActivity mActivity = null;
 
     @Before
     public void setActivity() {
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 872934245..53c16f56f 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.mapbox.mapboxsdk.testapp.SecondMapActivity" android:label="@string/activity_second"/>
+        <activity android:name=".InfoWindowAdapterActivity" android:label="@string/activity_second"/>
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="9724157045ff7d083492c6d9ae03e60e8609d461" />
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SecondMapActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
similarity index 95%
rename from android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SecondMapActivity.java
rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
index 173c1f288..ec6baab75 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SecondMapActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
@@ -19,9 +19,9 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-public class SecondMapActivity extends AppCompatActivity {
+public class InfoWindowAdapterActivity extends AppCompatActivity {
 
-    private static final String TAG = "SecondMapActivity";
+    private static final String TAG = "InfoWindowAdapter";
 
     private MapView mMapView;
 
@@ -58,7 +58,7 @@ public class SecondMapActivity extends AppCompatActivity {
 
             @Override
             public View getInfoWindow(Marker marker) {
-                TextView textView = new TextView(SecondMapActivity.this);
+                TextView textView = new TextView(InfoWindowAdapterActivity.this);
                 textView.setText(marker.getTitle());
                 textView.setBackgroundColor(Color.WHITE);
                 return textView;
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
index 7ee4ffcbe..e8cae73b0 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
-import android.graphics.PointF;
 import android.location.Location;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -19,7 +18,6 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
-import android.view.GestureDetector;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
@@ -292,7 +290,7 @@ public class MainActivity extends AppCompatActivity {
                                 return true;
 
                             case R.id.action_second_map_activity:
-                                startActivity(new Intent(getApplicationContext(), SecondMapActivity.class));
+                                startActivity(new Intent(getApplicationContext(), InfoWindowAdapterActivity.class));
                                 return true;
 
 /*
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
index add08824e..091df65e6 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -19,12 +19,6 @@
         android:icon="@android:drawable/ic_menu_compass"
         android:title="@string/action_compass" />
 
-    <item
-        android:id="@+id/action_second_map_activity"
-        android:checkable="false"
-        android:icon="@drawable/ic_looks_two_white_24dp"
-        android:title="@string/action_second_map_activity" />
-
     <!--
         <group android:id="@+id/locationFollowModesSeparator"/>
 
@@ -66,4 +60,10 @@
 
     </group>
 
+    <item
+        android:id="@+id/action_second_map_activity"
+        android:checkable="false"
+        android:icon="@drawable/ic_looks_two_white_24dp"
+        android:title="@string/action_info_window_adapter" />
+
 </menu>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 6cb4faa8b..a723e64aa 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="action_compass">Toggle compass</string>
     <string name="action_debug">Toggle debug mode</string>
     <string name="action_point_annotations">Toggle point annotations</string>
-    <string name="action_second_map_activity">Launch 2nd Map</string>
+    <string name="action_info_window_adapter">InfoWindow Adapter</string>
 
     <string name="label_fps">FPS:</string>