diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index 8fa0cd8fd..104abe8ad 100755
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -483,7 +483,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
         mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
         
         if(Build.VERSION.SDK_INT >= 12) {
-            setOnGenericMotionListener(new SDLGenericMotionHandler_API12());
+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
         }
 
         // Some arbitrary defaults to avoid a potential division by zero
@@ -886,7 +886,7 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
     
 }
 
-class SDLGenericMotionHandler_API12 implements View.OnGenericMotionListener {
+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
     // Generic Motion (mouse hover, joystick...) events go here
     // We only have joysticks yet
     @Override