diff --git a/src/app/api/settings/m18ImportTesting/actions.ts b/src/app/api/settings/m18ImportTesting/actions.ts
index 9141ea6..6af117b 100644
--- a/src/app/api/settings/m18ImportTesting/actions.ts
+++ b/src/app/api/settings/m18ImportTesting/actions.ts
@@ -8,11 +8,15 @@ import { BASE_API_URL } from "../../../../config/api";
 export interface M18ImportPoForm {
   modifiedDateFrom: string;
   modifiedDateTo: string;
+  dDateFrom: string;
+  dDateTo: string;
 }
 
 export interface M18ImportDoForm {
   modifiedDateFrom: string;
   modifiedDateTo: string;
+  dDateFrom: string;
+  dDateTo: string;
 }
 
 export interface M18ImportPqForm {
diff --git a/src/components/M18ImportTesting/M18ImportDo.tsx b/src/components/M18ImportTesting/M18ImportDo.tsx
index ac00212..cd5c71a 100644
--- a/src/components/M18ImportTesting/M18ImportDo.tsx
+++ b/src/components/M18ImportTesting/M18ImportDo.tsx
@@ -70,7 +70,7 @@ const M18ImportDo: React.FC<Props> = ({}) => {
               <Box display="flex">
                 <Controller
                   control={control}
-                  name="do.modifiedDateFrom"
+                  name="do.dDateFrom"
                   // rules={{
                   //     required: "Please input the date From!",
                   //     validate: {
@@ -80,7 +80,7 @@ const M18ImportDo: React.FC<Props> = ({}) => {
                   // }}
                   render={({ field, fieldState: { error } }) => (
                     <DateTimePicker
-                      label={t("Modified Date From *")}
+                      label={t("Delivery Date From *")}
                       format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`}
                       onChange={(newValue: Dayjs | null) =>
                         handleDateTimePickerOnChange(newValue, field.onChange)
@@ -104,7 +104,7 @@ const M18ImportDo: React.FC<Props> = ({}) => {
                 </Box>
                 <Controller
                   control={control}
-                  name="do.modifiedDateTo"
+                  name="do.dDateTo"
                   // rules={{
                   //     required: "Please input the date to!",
                   //     validate: {
@@ -116,7 +116,7 @@ const M18ImportDo: React.FC<Props> = ({}) => {
                   // }}
                   render={({ field, fieldState: { error } }) => (
                     <DateTimePicker
-                      label={t("Modified Date To *")}
+                      label={t("Delivery Date To *")}
                       format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`}
                       onChange={(newValue: Dayjs | null) =>
                         handleDateTimePickerOnChange(newValue, field.onChange)
diff --git a/src/components/M18ImportTesting/M18ImportPo.tsx b/src/components/M18ImportTesting/M18ImportPo.tsx
index 463dc4e..84b1f1e 100644
--- a/src/components/M18ImportTesting/M18ImportPo.tsx
+++ b/src/components/M18ImportTesting/M18ImportPo.tsx
@@ -70,7 +70,7 @@ const M18ImportPo: React.FC<Props> = ({}) => {
               <Box display="flex">
                 <Controller
                   control={control}
-                  name="po.modifiedDateFrom"
+                  name="po.dDateFrom"
                   // rules={{
                   //     required: "Please input the date From!",
                   //     validate: {
@@ -80,7 +80,7 @@ const M18ImportPo: React.FC<Props> = ({}) => {
                   // }}
                   render={({ field, fieldState: { error } }) => (
                     <DateTimePicker
-                      label={t("Modified Date From *")}
+                      label={t("Delivery Date From *")}
                       format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`}
                       onChange={(newValue: Dayjs | null) =>
                         handleDateTimePickerOnChange(newValue, field.onChange)
@@ -104,7 +104,7 @@ const M18ImportPo: React.FC<Props> = ({}) => {
                 </Box>
                 <Controller
                   control={control}
-                  name="po.modifiedDateTo"
+                  name="po.dDateTo"
                   // rules={{
                   //     required: "Please input the date to!",
                   //     validate: {
@@ -116,7 +116,7 @@ const M18ImportPo: React.FC<Props> = ({}) => {
                   // }}
                   render={({ field, fieldState: { error } }) => (
                     <DateTimePicker
-                      label={t("Modified Date To *")}
+                      label={t("Delivery Date To *")}
                       format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`}
                       onChange={(newValue: Dayjs | null) =>
                         handleDateTimePickerOnChange(newValue, field.onChange)