diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
index cec5af64e..6bc50e242 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
@@ -112,13 +112,13 @@
       </mat-form-field>
 
       <mat-checkbox fxFlex="48%" formControlName="isEqualAmortization"
-        [checked]="loansAccountTemplate?.isEqualAmortization">
+        [checked]="loansAccountTermsData?.isEqualAmortization">
         <p>Is Equal Amortization</p>
       </mat-checkbox>
 
     </ng-container>
 
-    <ng-container *ngIf="loansAccountTemplate?.isLoanProductLinkedToFloatingRate">
+    <ng-container *ngIf="loansAccountTermsData?.isLoanProductLinkedToFloatingRate">
 
       <div fxFlex="48%" fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column">
 
@@ -206,12 +206,12 @@
       <input type="number" matInput formControlName="graceOnArrearsAgeing">
     </mat-form-field>
 
-    <mat-form-field fxFlex="48%" *ngIf="loansAccountTemplate?.canDefineInstallmentAmount">
+    <mat-form-field fxFlex="48%" *ngIf="loansAccountTermsData?.canDefineInstallmentAmount">
       <mat-label>Installment Amount</mat-label>
       <input type="number" matInput formControlName="fixedEmiAmount">
     </mat-form-field>
 
-    <ng-container *ngIf="loansAccountTemplate?.canUseForTopup">
+    <ng-container *ngIf="loansAccountTermsData?.canUseForTopup">
 
       <mat-checkbox fxFlex="48%" formControlName="isTopup">
         <p>Is Topup Loan?</p>
@@ -232,60 +232,60 @@
 
     <div fxFlexFill>
       <span fxFlex="40%">Recalculate Interest</span>
-      <span fxFlex="60%">{{ loansAccountTemplate?.isInterestRecalculationEnabled? 'Yes' : 'No' }}</span>
+      <span fxFlex="60%">{{ loansAccountTermsData?.isInterestRecalculationEnabled? 'Yes' : 'No' }}</span>
     </div>
 
-    <div fxFlexFill *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled">
+    <div fxFlexFill *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled">
       <span fxFlex="40%">Days in year</span>
-      <span fxFlex="60%">{{ loansAccountTemplate?.daysInYearType.value}}</span>
+      <span fxFlex="60%">{{ loansAccountTermsData.daysInYearType.value}}</span>
     </div>
 
-    <ng-container *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled">
+    <ng-container *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled">
 
-      <div fxFlexFill *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled">
+      <div fxFlexFill *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled">
         <span fxFlex="40%">Advance payments adjustment type</span>
-        <span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.rescheduleStrategyType.value }}</span>
+        <span fxFlex="60%">{{ loansAccountTermsData.interestRecalculationData.rescheduleStrategyType.value }}</span>
       </div>
 
-      <div fxFlexFill *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled">
+      <div fxFlexFill *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled">
         <span fxFlex="40%">Days in month</span>
-        <span fxFlex="60%">{{ loansAccountTemplate?.daysInMonthType.value }}</span>
+        <span fxFlex="60%">{{ loansAccountTermsData.daysInMonthType.value }}</span>
       </div>
 
     </ng-container>
 
-    <ng-container *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled">
+    <ng-container *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled">
 
       <div fxFlexFill>
         <span fxFlex="40%">Interest recalculation compounding on</span>
-        <span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.interestRecalculationCompoundingType.value
+        <span fxFlex="60%">{{ loansAccountTermsData.interestRecalculationData.interestRecalculationCompoundingType.value
           }}</span>
       </div>
 
       <div fxFlexFill>
         <span fxFlex="40%">Frequency Interval for recalculation</span>
         <span fxFlex="60%">
-          <span>{{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyType.value}}</span>
-          <span *ngIf="loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyType.id == 3 &&
-                loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyWeekday != null">
-            on {{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyWeekday.value}}</span>
-          <span *ngIf="loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyType.id == 4 &&
-                loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyOnDay != null">on day
-            {{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyOnDay}}</span>
-          <span *ngIf="loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyType.id == 4 &&
-                loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyOnDay == null &&
-                loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyNthDay != null">on
-            {{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyNthDay.value}}
-            {{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyWeekday.value}}</span>
+          <span>{{ loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyType.value}}</span>
+          <span *ngIf="loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyType.id == 3 &&
+                loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyWeekday != null">
+            on {{ loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyWeekday.value}}</span>
+          <span *ngIf="loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyType.id == 4 &&
+                loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyOnDay != null">on day
+            {{ loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyOnDay}}</span>
+          <span *ngIf="loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyType.id == 4 &&
+                loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyOnDay == null &&
+                loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyNthDay != null">on
+            {{ loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyNthDay.value}}
+            {{ loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyWeekday.value}}</span>
         </span>
       </div>
 
     </ng-container>
 
     <div fxFlexFill
-      *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled && loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyType.id != 1">
+      *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled && loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyType.id != 1">
       <span fxFlex="40%">Frequency Interval for recalculation</span>
-      <span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyInterval}}</span>
+      <span fxFlex="60%">{{ loansAccountTermsData.interestRecalculationData.recalculationRestFrequencyInterval}}</span>
     </div>
 
     <ng-container *ngIf="multiDisburseLoan">
@@ -338,35 +338,35 @@
     </ng-container>
 
     <ng-container
-      *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled  && loansAccountTemplate?.interestRecalculationData.interestRecalculationCompoundingType.id != 0">
+      *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled  && loansAccountTermsData.interestRecalculationData.interestRecalculationCompoundingType.id != 0">
 
       <div fxFlexFill>
         <span fxFlex="40%">Frequency for compounding</span>
         <span fxFlex="60%">{{
-          loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.value}}
-          <span *ngIf="loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.id == 3 &&
-            loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday != null">
-            on {{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday.value}}
+          loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyType.value}}
+          <span *ngIf="loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyType.id == 3 &&
+            loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyWeekday != null">
+            on {{ loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyWeekday.value}}
           </span>
-          <span *ngIf="loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.id == 4 &&
-            loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyOnDay != null">on day
-            {{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyOnDay}}
+          <span *ngIf="loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyType.id == 4 &&
+            loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyOnDay != null">on day
+            {{ loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyOnDay}}
           </span>
-          <span *ngIf="loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.id == 4 &&
-            loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyOnDay == null &&
-            loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyNthDay != null">on
-            {{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyNthDay.value}}
-            {{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday.value}}
+          <span *ngIf="loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyType.id == 4 &&
+            loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyOnDay == null &&
+            loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyNthDay != null">on
+            {{ loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyNthDay.value}}
+            {{ loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyWeekday.value}}
           </span>
         </span>
       </div>
     </ng-container>
 
     <div fxFlexFill
-      *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled && loansAccountTemplate?.interestRecalculationData.interestRecalculationCompoundingType.id != 0 && loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.id != 1">
+      *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled && loansAccountTermsData.interestRecalculationData.interestRecalculationCompoundingType.id != 0 && loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyType.id != 1">
       <span fxFlex="40%">Frequency Interval for compounding</span>
       <span fxFlex="60%">{{
-        loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyInterval}}</span>
+        loansAccountTermsData.interestRecalculationData.recalculationCompoundingFrequencyInterval}}</span>
     </div>
 
     <mat-divider fxFlex="98%"></mat-divider>