diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 7d05e71b0..9581ce1a6 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -383,7 +383,6 @@ tasks.withType(JavaCompile) {
         //Todo Remove necessary checks from this list
         disable(
                 "UnusedVariable",
-                "SameNameButDifferent",
                 "TypeParameterUnusedInFormals",
                 "JdkObsolete",
                 "EmptyBlockTag",
@@ -425,6 +424,7 @@ tasks.withType(JavaCompile) {
                 "StreamResourceLeak",
                 "TruthIncompatibleType",
                 "ByteBufferBackingArray",
+                "SameNameButDifferent",
                 "OrphanedFormatString",
                 "CatchAndPrintStackTrace",
                 "ObjectToString",
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
index 3cf6b7ca8..94dd1754e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
@@ -90,7 +90,7 @@ final class DocumentManagementApiResourceSwagger {
 
         @ApiModelProperty(example = "3")
         public Long resourceId;
-        public PutEntityTypeEntityIdDocumentsResponseChangesSwagger changes;
+        public PutEntityTypeEntityIdDocumentsResponse.PutEntityTypeEntityIdDocumentsResponseChangesSwagger changes;
         @ApiModelProperty(example = "3")
         public String resourceIdentifier;
     }
@@ -112,7 +112,7 @@ final class DocumentManagementApiResourceSwagger {
 
         @ApiModelProperty(example = "3")
         public Long resourceId;
-        public PutEntityTypeEntityIdDocumentsResponseChangesSwagger changes;
+        public DeleteEntityTypeEntityIdDocumentsResponse.PutEntityTypeEntityIdDocumentsResponseChangesSwagger changes;
         @ApiModelProperty(example = "3")
         public String resourceIdentifier;
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
index abc5decd1..d5a48c4d1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
@@ -272,9 +272,9 @@ final class LoanProductsApiResourceSwagger {
             public Integer id;
             @ApiModelProperty(example = "1")
             public Integer productId;
-            public GetLoanProductsInterestRecalculationCompoundingType interestRecalculationCompoundingType;
+            public GetLoanProductsInterestRecalculationData.GetLoanProductsInterestRecalculationCompoundingType interestRecalculationCompoundingType;
             public GetLoanProductsInterestRecalculationCompoundingFrequencyType interestRecalculationCompoundingFrequencyType;
-            public GetLoanProductsRescheduleStrategyType rescheduleStrategyType;
+            public GetLoanProductsInterestRecalculationData.GetLoanProductsRescheduleStrategyType rescheduleStrategyType;
             public GetLoanProductsInterestRecalculationCompoundingFrequencyType recalculationRestFrequencyType;
             public GetLoanProductsPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy;
             @ApiModelProperty(example = "true")
@@ -327,7 +327,7 @@ final class LoanProductsApiResourceSwagger {
         public GetLoanProductsRepaymentFrequencyType repaymentFrequencyType;
         @ApiModelProperty(example = "15.000000")
         public Float interestRatePerPeriod;
-        public GetLoanProductsInterestRateFrequencyType interestRateFrequencyType;
+        public GetLoanProductsResponse.GetLoanProductsInterestRateFrequencyType interestRateFrequencyType;
         @ApiModelProperty(example = "15.000000")
         public Float annualInterestRate;
         public GetLoanProductsAmortizationType amortizationType;
@@ -348,7 +348,7 @@ final class LoanProductsApiResourceSwagger {
         @ApiModelProperty(example = "true")
         public Boolean isInterestRecalculationEnabled;
         public GetLoanProductsInterestRecalculationData interestRecalculationData;
-        public GetLoanProductsAccountingRule accountingRule;
+        public GetLoanProductsResponse.GetLoanProductsAccountingRule accountingRule;
         @ApiModelProperty(example = "0")
         public Integer principalThresholdForLastInstalment;
     }
@@ -478,8 +478,8 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            public GetLoanProductsInterestRecalculationCompoundingType interestRecalculationCompoundingType;
-            public GetLoanProductsRescheduleStrategyType rescheduleStrategyType;
+            public GetLoanProductsInterestRecalculationTemplateData.GetLoanProductsInterestRecalculationCompoundingType interestRecalculationCompoundingType;
+            public GetLoanProductsInterestRecalculationTemplateData.GetLoanProductsRescheduleStrategyType rescheduleStrategyType;
             public GetLoanProductsResponse.GetLoanProductsInterestRecalculationData.GetLoanProductsPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy;
         }
 
@@ -780,7 +780,7 @@ final class LoanProductsApiResourceSwagger {
         public List<Integer> interestRateVariationsForBorrowerCycle;
         @ApiModelProperty(example = "[]")
         public List<Integer> numberOfRepaymentVariationsForBorrowerCycle;
-        public GetLoanProductsAccountingRule accountingRule;
+        public GetLoanProductsTemplateResponse.GetLoanProductsAccountingRule accountingRule;
         public GetLoansProductsDaysInMonthTemplateType daysInMonthType;
         public GetLoanProductsDaysInYearTemplateType daysInYearType;
         @ApiModelProperty(example = "false")
@@ -1041,7 +1041,7 @@ final class LoanProductsApiResourceSwagger {
         public GetLoanProductsResponse.GetLoanProductsRepaymentFrequencyType repaymentFrequencyType;
         @ApiModelProperty(example = "5.000000")
         public Float interestRatePerPeriod;
-        public GetLoanProductsInterestRateFrequencyType interestRateFrequencyType;
+        public GetLoanProductsProductIdResponse.GetLoanProductsInterestRateFrequencyType interestRateFrequencyType;
         @ApiModelProperty(example = "60.000000")
         public Float annualInterestRate;
         public GetLoanProductsResponse.GetLoanProductsAmortizationType amortizationType;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/RolesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/RolesApiResourceSwagger.java
index 48ececb55..6a5d904a9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/RolesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/RolesApiResourceSwagger.java
@@ -186,7 +186,7 @@ final class RolesApiResourceSwagger {
             public String ALL_FUNCTIONS_READ;
         }
 
-        public PostRolesRoleIdPermissionsResponsePermissions permissions;
+        public PutRolesRoleIdPermissionsRequest.PostRolesRoleIdPermissionsResponsePermissions permissions;
 
     }
 
@@ -209,7 +209,7 @@ final class RolesApiResourceSwagger {
 
         @ApiModelProperty(example = "8")
         public Long resourceId;
-        public PostRolesRoleIdPermissionsResponsePermissions permissions;
+        public PutRolesRoleIdPermissionsRequest.PostRolesRoleIdPermissionsResponsePermissions permissions;
 
     }