diff --git a/lib/core/src/lib/form/components/widgets/core/form-field-validator.ts b/lib/core/src/lib/form/components/widgets/core/form-field-validator.ts
index b4cd7c1b1c..fadc227fe7 100644
--- a/lib/core/src/lib/form/components/widgets/core/form-field-validator.ts
+++ b/lib/core/src/lib/form/components/widgets/core/form-field-validator.ts
@@ -148,8 +148,8 @@ export class DateFieldValidator implements FormFieldValidator {
     // Validates that the input string is a valid date formatted as <dateFormat> (default D-M-YYYY)
     static isValidDate(inputDate: string, dateFormat: string = 'D-M-YYYY'): boolean {
         if (inputDate) {
-            const d = DateFnsUtils.parseDate(inputDate, dateFormat);
-            return isValid(d);
+            const date = DateFnsUtils.parseDate(inputDate, dateFormat);
+            return isValid(date);
         }
 
         return false;
@@ -180,8 +180,8 @@ export class DateTimeFieldValidator implements FormFieldValidator {
     // Validates that the input string is a valid date formatted as <dateFormat> (default D-M-YYYY)
     static isValidDate(inputDate: string, dateFormat: string = 'YYYY-MM-DD HH:mm'): boolean {
         if (inputDate) {
-            const d = DateFnsUtils.parseDate(inputDate, dateFormat);
-            return isValid(d);
+            const dateTime = DateFnsUtils.parseDate(inputDate, dateFormat);
+            return isValid(dateTime);
         }
 
         return false;
diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.html b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.html
index d3487f71e9..7173016014 100644
--- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.html
+++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.html
@@ -1,10 +1,10 @@
 <div class="{{field.className}}" id="data-time-widget" [class.adf-invalid]="!field.isValid && isTouched()" [class.adf-left-label-input-container]="field.leftLabels">
     <div *ngIf="field.leftLabels">
-        <label class="adf-label adf-left-label" [attr.for]="field.id">{{formatLabel(field)}}<span class="adf-asterisk" *ngIf="isRequired()">*</span></label>
+        <label class="adf-label adf-left-label" [attr.for]="field.id">{{formatDateTimeLabel(field)}}<span class="adf-asterisk" *ngIf="isRequired()">*</span></label>
      </div>
     <div>
         <mat-form-field class="adf-date-time-widget" [class.adf-left-label-input-datepicker]="field.leftLabels" [hideRequiredMarker]="true">
-            <label class="adf-label" *ngIf="!field.leftLabels" [attr.for]="field.id">{{formatLabel(field)}}<span class="adf-asterisk" *ngIf="isRequired()">*</span></label>
+            <label class="adf-label" *ngIf="!field.leftLabels" [attr.for]="field.id">{{formatDateTimeLabel(field)}}<span class="adf-asterisk" *ngIf="isRequired()">*</span></label>
             <input matInput
                    [id]="field.id"
                    [value]="field.value"
diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts
index 1c02d0b2fa..db7a7059a0 100644
--- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts
+++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts
@@ -348,7 +348,7 @@ describe('DateTimeWidgetComponent', () => {
         });
 
         it('should format label correctly', () => {
-            const result = widget.formatLabel(widget.field);
+            const result = widget.formatDateTimeLabel(widget.field);
 
             expect(result).toBe('Date Time (D-M-YYYY hh:mm A)');
         });
diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts
index c2b77d48c7..249abe28f0 100644
--- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts
+++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts
@@ -95,17 +95,17 @@ export class DateTimeWidgetComponent extends WidgetComponent implements OnInit,
         this.onDestroy$.complete();
     }
 
-    formatLabel(field: FormFieldModel): string {
-        const displayName = this.translationService.instant(field.name);
-        const displayFormat = DateFnsUtils.convertDateFnsToMomentFormat(field.dateDisplayFormat);
+    formatDateTimeLabel(field: FormFieldModel): string {
+        const dateTimeDisplayName = this.translationService.instant(field.name);
+        const dateTimeDisplayFormat = DateFnsUtils.convertDateFnsToMomentFormat(field.dateDisplayFormat);
 
-        return `${displayName} (${displayFormat})`;
+        return `${dateTimeDisplayName} (${dateTimeDisplayFormat})`;
     }
 
     onDateChanged(newDateValue) {
-        const date = new Date(newDateValue);
-        if (isValid(date)) {
-            this.field.value = DateFnsUtils.formatDate(date, this.field.dateDisplayFormat);
+        const dateTimeValue = new Date(newDateValue);
+        if (isValid(dateTimeValue)) {
+            this.field.value = DateFnsUtils.formatDate(dateTimeValue, this.field.dateDisplayFormat);
         } else {
             this.field.value = newDateValue;
         }
diff --git a/lib/core/src/lib/form/components/widgets/date/date.widget.spec.ts b/lib/core/src/lib/form/components/widgets/date/date.widget.spec.ts
index cd88396ce9..10944967ed 100644
--- a/lib/core/src/lib/form/components/widgets/date/date.widget.spec.ts
+++ b/lib/core/src/lib/form/components/widgets/date/date.widget.spec.ts
@@ -62,9 +62,9 @@ describe('DateWidgetComponent', () => {
 
         widget.ngOnInit();
 
-        const expected = parse(minValue, widget.field.dateDisplayFormat, new Date());
+        const expectedMinDate = parse(minValue, widget.field.dateDisplayFormat, new Date());
         const widgetDate = parse(widget.minDate, widget.field.dateDisplayFormat, new Date());
-        expect(isSameDay(widgetDate, expected)).toBeTruthy();
+        expect(isSameDay(widgetDate, expectedMinDate)).toBeTruthy();
     });
 
     it('should date field be present', () => {
@@ -86,9 +86,9 @@ describe('DateWidgetComponent', () => {
         });
         widget.ngOnInit();
 
-        const expected = parse(maxValue, widget.field.dateDisplayFormat, new Date());
+        const expectedMaxDate = parse(maxValue, widget.field.dateDisplayFormat, new Date());
         const widgetDate = parse(widget.maxDate, widget.field.dateDisplayFormat, new Date());
-        expect(isSameDay(widgetDate, expected)).toBeTruthy();
+        expect(isSameDay(widgetDate, expectedMaxDate)).toBeTruthy();
     });
 
     it('should eval visibility on date changed', () => {
@@ -262,7 +262,7 @@ describe('DateWidgetComponent', () => {
         });
 
         it('should format label correctly', () => {
-            const result = widget.formatLabel(widget.field);
+            const result = widget.formatDateLabel(widget.field);
 
             expect(result).toBe('Date (D-M-YYYY)');
         });
diff --git a/lib/core/src/lib/pipes/date.pipe.spec.ts b/lib/core/src/lib/pipes/date.pipe.spec.ts
index ae4d29fd17..5f4ef651c7 100644
--- a/lib/core/src/lib/pipes/date.pipe.spec.ts
+++ b/lib/core/src/lib/pipes/date.pipe.spec.ts
@@ -75,18 +75,13 @@ describe('ADFDatePipe', () => {
     it('should return the formatted date string when given a valid date string', () => {
         const inputDate = '2023-08-14';
 
-        let dateFormat = 'DD-MM-YYYY';
-        let expectedOutput = '14-08-2023';
+        let dateFormat = 'DD-MM-YY';
+        let expectedOutput = '14-08-23';
         let result = datePipe.transform(inputDate, dateFormat);
         expect(result).toBe(expectedOutput);
 
-        dateFormat = 'MM-DD-YYYY';
-        expectedOutput = '08-14-2023';
-        result = datePipe.transform(inputDate, dateFormat);
-        expect(result).toBe(expectedOutput);
-
-        dateFormat = 'YYYY-MM-DD';
-        expectedOutput = '2023-08-14';
+        dateFormat = 'MM-DD-YY';
+        expectedOutput = '08-14-23';
         result = datePipe.transform(inputDate, dateFormat);
         expect(result).toBe(expectedOutput);
 
@@ -95,13 +90,18 @@ describe('ADFDatePipe', () => {
         result = datePipe.transform(inputDate, dateFormat);
         expect(result).toBe(expectedOutput);
 
-        dateFormat = 'MM-DD-YY';
-        expectedOutput = '08-14-23';
+        dateFormat = 'YYYY-MM-DD';
+        expectedOutput = '2023-08-14';
         result = datePipe.transform(inputDate, dateFormat);
         expect(result).toBe(expectedOutput);
 
-        dateFormat = 'DD-MM-YY';
-        expectedOutput = '14-08-23';
+        dateFormat = 'MM-DD-YYYY';
+        expectedOutput = '08-14-2023';
+        result = datePipe.transform(inputDate, dateFormat);
+        expect(result).toBe(expectedOutput);
+
+        dateFormat = 'DD-MM-YYYY';
+        expectedOutput = '14-08-2023';
         result = datePipe.transform(inputDate, dateFormat);
         expect(result).toBe(expectedOutput);
     });