diff --git a/android/src/com/mapswithme/maps/purchase/AdRemovalPurchaseValidator.java b/android/src/com/mapswithme/maps/purchase/AdSubscriptionValidator.java
similarity index 68%
rename from android/src/com/mapswithme/maps/purchase/AdRemovalPurchaseValidator.java
rename to android/src/com/mapswithme/maps/purchase/AdSubscriptionValidator.java
index 2b22f51618..d4386685d4 100644
--- a/android/src/com/mapswithme/maps/purchase/AdRemovalPurchaseValidator.java
+++ b/android/src/com/mapswithme/maps/purchase/AdSubscriptionValidator.java
@@ -4,8 +4,8 @@ import android.support.annotation.NonNull;
 
 import com.mapswithme.maps.Framework;
 
-public class AdRemovalPurchaseValidator implements PurchaseValidator,
-                                                   Framework.SubscriptionValidationListener
+class AdSubscriptionValidator implements PurchaseValidator<AdValidationCallback>,
+                                                Framework.SubscriptionValidationListener
 {
   @Override
   public void initialize()
@@ -26,13 +26,13 @@ public class AdRemovalPurchaseValidator implements PurchaseValidator,
   }
 
   @Override
-  public void addCallback(@NonNull ValidationCallback callback)
+  public void addCallback(@NonNull AdValidationCallback callback)
   {
     // Coming soon.
   }
 
   @Override
-  public void removeCallback(@NonNull ValidationCallback callback)
+  public void removeCallback(@NonNull AdValidationCallback callback)
   {
     // Coming soon.
   }
diff --git a/android/src/com/mapswithme/maps/purchase/AdValidationCallback.java b/android/src/com/mapswithme/maps/purchase/AdValidationCallback.java
new file mode 100644
index 0000000000..12f3121dc6
--- /dev/null
+++ b/android/src/com/mapswithme/maps/purchase/AdValidationCallback.java
@@ -0,0 +1,8 @@
+package com.mapswithme.maps.purchase;
+
+import android.support.annotation.NonNull;
+
+public interface AdValidationCallback
+{
+  void onValidate(@NonNull AdValidationStatus status);
+}
diff --git a/android/src/com/mapswithme/maps/purchase/AdValidationStatus.java b/android/src/com/mapswithme/maps/purchase/AdValidationStatus.java
new file mode 100644
index 0000000000..d0b7cedfd5
--- /dev/null
+++ b/android/src/com/mapswithme/maps/purchase/AdValidationStatus.java
@@ -0,0 +1,8 @@
+package com.mapswithme.maps.purchase;
+
+public enum AdValidationStatus
+{
+  ACTIVE,
+  NOT_ACTIVE,
+  FAILURE
+}
diff --git a/android/src/com/mapswithme/maps/purchase/Factory.java b/android/src/com/mapswithme/maps/purchase/Factory.java
index d510498524..69220c09a6 100644
--- a/android/src/com/mapswithme/maps/purchase/Factory.java
+++ b/android/src/com/mapswithme/maps/purchase/Factory.java
@@ -11,7 +11,7 @@ public enum Factory
         @Override
         public PurchaseValidator createPurchaseManager()
         {
-          return new AdRemovalPurchaseValidator();
+          return new AdSubscriptionValidator();
         }
 
         @NonNull
diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java b/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java
index a98ca8c765..1588ff2ae3 100644
--- a/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java
+++ b/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java
@@ -4,12 +4,12 @@ import android.support.annotation.NonNull;
 
 /**
  * Represents a purchase validator. The main of purpose is to validate existing purchase and inform
- * the client code through {@link ValidationCallback#onValidate(Status)}.<br><br>
+ * the client code through typed callback {@link T}.<br><br>
  * <b>Important note: </b> one validator can serve only one purchase, i.e. logical link is
  * <b>one-to-one</b>. If you need to validate different purchases you have to create different
  * implementations of this interface.
  */
-public interface PurchaseValidator
+public interface PurchaseValidator<T>
 {
   /**
    * Initializes validator for further work.
@@ -31,22 +31,10 @@ public interface PurchaseValidator
   /**
    * Ads observer of validation.
    */
-  void addCallback(@NonNull ValidationCallback callback);
+  void addCallback(@NonNull T callback);
 
   /**
    * Removes observer of validation.
    */
-  void removeCallback(@NonNull ValidationCallback callback);
-
-  interface ValidationCallback
-  {
-    void onValidate(@NonNull Status status);
-  }
-
-  public enum Status
-  {
-    ACTIVE,
-    NOT_ACTIVE,
-    FAILURE;
-  }
+  void removeCallback(@NonNull T callback);
 }