diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml
index eac58d63..d299ebf6 100644
--- a/vtm-android-example/AndroidManifest.xml
+++ b/vtm-android-example/AndroidManifest.xml
@@ -51,6 +51,9 @@
         <activity
             android:name=".LocationActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".MapEventLayer2Activity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".MapsforgeActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
@@ -81,9 +84,6 @@
         <activity
             android:name=".MultiMapViewActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-        <activity
-            android:name=".NewGesturesActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".NextzenGeojsonActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
diff --git a/vtm-android-example/src/org/oscim/android/test/NewGesturesActivity.java b/vtm-android-example/src/org/oscim/android/test/MapEventLayer2Activity.java
similarity index 90%
rename from vtm-android-example/src/org/oscim/android/test/NewGesturesActivity.java
rename to vtm-android-example/src/org/oscim/android/test/MapEventLayer2Activity.java
index 599a6e75..6e4c17c9 100644
--- a/vtm-android-example/src/org/oscim/android/test/NewGesturesActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MapEventLayer2Activity.java
@@ -16,9 +16,9 @@ package org.oscim.android.test;
 
 import org.oscim.utils.Parameters;
 
-public class NewGesturesActivity extends MarkerOverlayActivity {
+public class MapEventLayer2Activity extends MarkerOverlayActivity {
 
-    public NewGesturesActivity() {
+    public MapEventLayer2Activity() {
         super();
         Parameters.MAP_EVENT_LAYER2 = true;
     }
diff --git a/vtm-android-example/src/org/oscim/android/test/Samples.java b/vtm-android-example/src/org/oscim/android/test/Samples.java
index cf0ae791..01d33c45 100644
--- a/vtm-android-example/src/org/oscim/android/test/Samples.java
+++ b/vtm-android-example/src/org/oscim/android/test/Samples.java
@@ -119,7 +119,7 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(LocationActivity.class));
 
         linearLayout.addView(createLabel("User Interaction"));
-        linearLayout.addView(createButton(NewGesturesActivity.class));
+        linearLayout.addView(createButton(MapEventLayer2Activity.class));
         linearLayout.addView(createButton(LayerGroupActivity.class));
 
         linearLayout.addView(createLabel("Dual Map Views"));
diff --git a/vtm-playground/src/org/oscim/test/NewGesturesTest.java b/vtm-playground/src/org/oscim/test/MapEventLayer2Test.java
similarity index 89%
rename from vtm-playground/src/org/oscim/test/NewGesturesTest.java
rename to vtm-playground/src/org/oscim/test/MapEventLayer2Test.java
index 58128113..07c8c337 100644
--- a/vtm-playground/src/org/oscim/test/NewGesturesTest.java
+++ b/vtm-playground/src/org/oscim/test/MapEventLayer2Test.java
@@ -17,12 +17,12 @@ package org.oscim.test;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.utils.Parameters;
 
-public class NewGesturesTest extends MarkerLayerTest {
+public class MapEventLayer2Test extends MarkerLayerTest {
 
     public static void main(String[] args) {
         Parameters.MAP_EVENT_LAYER2 = true;
 
         GdxMapApp.init();
-        GdxMapApp.run(new NewGesturesTest());
+        GdxMapApp.run(new MapEventLayer2Test());
     }
 }