diff --git a/docs/guide/migrating-to-version-9.md b/docs/guide/migrating-to-version-9.md
index 51478249e2..c426cf68b3 100644
--- a/docs/guide/migrating-to-version-9.md
+++ b/docs/guide/migrating-to-version-9.md
@@ -173,8 +173,8 @@ Kongponents styles are no longer designed to be utilized standalone, separately
#### Structure
-* `timepicker-input` class has been changed to `datetime-picker-input`
-* `k-datetime-picker-input` `data-testid` attribute has been changed to `datetime-picker-input`
+* `timepicker-input` class has been changed to `datetime-picker-trigger`
+* `k-datetime-picker-input` `data-testid` attribute has been changed to `datetime-picker-trigger`
* `timepicker-display` class has been changed to `datetime-picker-display`
* `k-datetime-picker-display` `data-testid` attribute has been changed to `datetime-picker-display`
* `k-datetime-picker-toggle` `data-testid` attribute has been changed to `datetime-picker-toggle`
diff --git a/sandbox/pages/SandboxDateTimePicker.vue b/sandbox/pages/SandboxDateTimePicker.vue
index 0fe3581fda..8e83ea7709 100644
--- a/sandbox/pages/SandboxDateTimePicker.vue
+++ b/sandbox/pages/SandboxDateTimePicker.vue
@@ -112,6 +112,7 @@
@@ -121,6 +122,29 @@
mode="dateTime"
/>
+
+
+
+
+
+
@@ -133,3 +157,28 @@ import SandboxSectionComponent from '../components/SandboxSectionComponent.vue'
const maxDate = new Date()
maxDate.setMonth(new Date().getMonth() + 3)
+
+
diff --git a/src/components/KDateTimePicker/KDateTimePicker.cy.ts b/src/components/KDateTimePicker/KDateTimePicker.cy.ts
index 9a58f45f9c..4bb5674615 100644
--- a/src/components/KDateTimePicker/KDateTimePicker.cy.ts
+++ b/src/components/KDateTimePicker/KDateTimePicker.cy.ts
@@ -54,7 +54,7 @@ const emptyTimeRange = {
timePeriodKey: null,
}
-const timepickerInput = 'datetime-picker-input'
+const timepickerInput = 'datetime-picker-trigger'
const timepickerDisplay = 'datetime-picker-display'
const submitButton = 'datetime-picker-submit'
const clearButton = 'datetime-picker-clear'
diff --git a/src/components/KDateTimePicker/KDateTimePicker.vue b/src/components/KDateTimePicker/KDateTimePicker.vue
index 38dc035538..af65de1223 100644
--- a/src/components/KDateTimePicker/KDateTimePicker.vue
+++ b/src/components/KDateTimePicker/KDateTimePicker.vue
@@ -6,6 +6,7 @@
:style="widthStyle"
>
-