diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java
similarity index 99%
rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3Gateway.java
rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java
index 42943cc1..8bb7c863 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3Gateway.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddEditV3Gateway.java
@@ -17,7 +17,7 @@ import java.util.List;
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;
 
-public class RecipientAddV3Gateway extends PrivilegedGateway implements RecipientAddEditV3GatewayInterface {
+public class RecipientAddEditV3Gateway extends PrivilegedGateway implements RecipientAddEditV3GatewayInterface {
 
     @Override
     public Observable<ResponseBody> getDynamicValidationRules(String auth, String senderId, String countryId, String serviceType) {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java
index e8602504..d2f70f71 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/view/recipientaddeditV3/RecipientAddEditV3Activity.java
@@ -22,7 +22,7 @@ import com.gmeremit.online.gmeremittance_native.customwidgets.GenericImageWithTe
 import com.gmeremit.online.gmeremittance_native.customwidgets.GenericTextListingDialog;
 import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;
 import com.gmeremit.online.gmeremittance_native.customwidgets.TextWatcherAdapter;
-import com.gmeremit.online.gmeremittance_native.recipientV3.gateway.recipientaddeditV3.RecipientAddV3Gateway;
+import com.gmeremit.online.gmeremittance_native.recipientV3.gateway.recipientaddeditV3.RecipientAddEditV3Gateway;
 import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.countryservice.CountryServiceModel;
 import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.countryservice.ServiceTypeModel;
 import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.DropDownDTO;
@@ -239,10 +239,10 @@ public class RecipientAddEditV3Activity extends BaseActivity implements Recipien
 //        ReceiverInfoV3Model recipientToBeEdited = mockTestinData();
         if (recipientToBeEdited != null) {
             toolbarTitle.setText(getString(R.string.edit_recipient_text));
-            presenter = new RecipientEditV3Presenter(new RecipientAddV3Gateway(), this, recipientToBeEdited);
+            presenter = new RecipientEditV3Presenter(new RecipientAddEditV3Gateway(), this, recipientToBeEdited);
         } else {
             toolbarTitle.setText(getString(R.string.add_recipient_text));
-            presenter = new RecipientAddV3Presenter(new RecipientAddV3Gateway(), this, recipientToBeEdited);
+            presenter = new RecipientAddV3Presenter(new RecipientAddEditV3Gateway(), this, recipientToBeEdited);
         }
 
         iv_cancel.setVisibility(View.INVISIBLE);
diff --git a/app/src/test/java/com/gmeremit/online/gmeremittance_native/AddRecipientV3ValidationExecutorTester.java b/app/src/test/java/com/gmeremit/online/gmeremittance_native/AddRecipientV3ValidationExecutorTester.java
deleted file mode 100644
index 5f5ed343..00000000
--- a/app/src/test/java/com/gmeremit/online/gmeremittance_native/AddRecipientV3ValidationExecutorTester.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.gmeremit.online.gmeremittance_native;
-import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientlistingV3.ReceiverInfoV3Model;
-
-import com.gmeremit.online.gmeremittance_native.recipientV3.presenter.recipientaddeditV3.RecipientDetailValidatorV3;
-import com.gmeremit.online.gmeremittance_native.recipientV3.presenter.recipientaddeditV3.RecipientAddV3ContractInterface;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-
-
-public class AddRecipientV3ValidationExecutorTester {
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void constructor_Should_Throw_IAE_For_Null_Parameter()
-    {
-        new RecipientDetailValidatorV3(null,null);
-    }
-
-
-    @Test(expected = IllegalArgumentException.class)
-    public void apply_Dynamic_Validation_Rule_To_View_Should_Throw_IAE_For_Null_Validation_Rule()
-    {
-        RecipientAddV3ContractInterface view=Mockito.mock(RecipientAddV3ContractInterface.class);
-        ReceiverInfoV3Model receiverInfoV3Model= Mockito.mock(ReceiverInfoV3Model.class);
-        RecipientDetailValidatorV3 validationExecutor= new RecipientDetailValidatorV3(view,receiverInfoV3Model);
-
-
-        validationExecutor.applyDynamicValidationRuleToView(null);
-    }
-
-
-
-
-
-}
diff --git a/app/src/test/java/com/gmeremit/online/gmeremittance_native/ValidationRuleTest.java b/app/src/test/java/com/gmeremit/online/gmeremittance_native/ValidationRuleTest.java
index 62e97328..ff455060 100644
--- a/app/src/test/java/com/gmeremit/online/gmeremittance_native/ValidationRuleTest.java
+++ b/app/src/test/java/com/gmeremit/online/gmeremittance_native/ValidationRuleTest.java
@@ -30,7 +30,7 @@ public class ValidationRuleTest {
 
     @Test
     public void validateAll_Should_Return_NULL_When_Field_Required_Flag_Is_False() {
-        ValidationRuleModel validationRuleWithFieldRequiredFlagFalse = new ValidationRuleModel(0, "Full name", FIELD_REQUIRED_FALSE, -1, 2, "", false);
+        ValidationRuleModel validationRuleWithFieldRequiredFlagFalse = new ValidationRuleModel("", "Full name", -1, -1, "");
         assertNull("Should return NULL when field required flag is " + FIELD_REQUIRED_FALSE, validationRuleWithFieldRequiredFlagFalse.validateValueAndReturnErrorMessageOnFail(SOME_RANDOM_STRING_VALUE));
 
     }
@@ -38,7 +38,7 @@ public class ValidationRuleTest {
     @Test
     public void validateAll_Should_Return_Field_Is_Required_Error_Message_When_Field_Required_Flag_Is_True() {
 
-        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel(0, "Full name", FIELD_REQUIRED_TRUE, -1, 2, "", false);
+        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel("", "Full name", -1, 2, "");
 
         ValidationRuleModel rule = Mockito.spy(validationRuleWithFieldRequiredFlagTrue );
 
@@ -55,7 +55,7 @@ public class ValidationRuleTest {
     @Test
     public void validateAll_Should_Return_NULL_When_Passed_Value_Is_Greater_Or_Equal_To_Min_Val_Required() {
 
-        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel(0, "Full name", FIELD_REQUIRED_TRUE, -1, FIELD_LENGTH_LOWER_BOUND, "", false);
+        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel("", "Full name",  -1, FIELD_LENGTH_LOWER_BOUND, "");
 
 //        ValidationRuleModel rule = Mockito.spy(validationRuleWithFieldRequiredFlagTrue );
 //
@@ -71,7 +71,7 @@ public class ValidationRuleTest {
     @Test
     public void validateAll_Should_Return_Lower_Bound_Error_Message_When_Passed_Value_Is_Less_Than_Min_Val_Required() {
 
-        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel(0, "Full name", FIELD_REQUIRED_TRUE, -1, FIELD_LENGTH_LOWER_BOUND, "", false);
+        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel("", "Full name",  -1, FIELD_LENGTH_LOWER_BOUND, "");
 
         ValidationRuleModel rule = Mockito.spy(validationRuleWithFieldRequiredFlagTrue);
 
@@ -88,7 +88,7 @@ public class ValidationRuleTest {
     @Test
     public void validateAll_Should_Return_NULL_When_Passed_Value_Is_Less_Or_Equal_To_Max_Val_Required() {
 
-        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel(0, "Full name", FIELD_REQUIRED_TRUE, FIELD_LENGTH_UPPER_BOUND, FIELD_LENGTH_LOWER_BOUND, "", false);
+        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel("", "Full name",  FIELD_LENGTH_UPPER_BOUND, FIELD_LENGTH_LOWER_BOUND, "");
 
 //        ValidationRuleModel rule = Mockito.spy(validationRuleWithFieldRequiredFlagTrue );
 //
@@ -103,7 +103,7 @@ public class ValidationRuleTest {
     @Test
     public void validateAll_Should_Return_Upper_Bound_Error_Message_When_Passed_Value_Is_Greater_Than_MAx_Val_Required() {
 
-        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel(0, "Full name", FIELD_REQUIRED_TRUE, FIELD_LENGTH_UPPER_BOUND, FIELD_LENGTH_LOWER_BOUND, "", false);
+        ValidationRuleModel validationRuleWithFieldRequiredFlagTrue = new ValidationRuleModel("", "Full name",  FIELD_LENGTH_UPPER_BOUND, FIELD_LENGTH_LOWER_BOUND, "");
 
         ValidationRuleModel rule = Mockito.spy(validationRuleWithFieldRequiredFlagTrue);