diff --git a/src/components/NcActionInput/NcActionInput.vue b/src/components/NcActionInput/NcActionInput.vue
index 5d03f24f58..fa2033343c 100644
--- a/src/components/NcActionInput/NcActionInput.vue
+++ b/src/components/NcActionInput/NcActionInput.vue
@@ -166,7 +166,7 @@ For the `NcSelect` component, all events will be passed through. Please see the
 					</label>
 					<div class="action-input__input-container">
 
-						<NcDatetimePicker v-if="datePickerType"
+						<NcDateTimePicker v-if="datePickerType"
 							ref="datetimepicker"
 							:value="value"
 							style="z-index: 99999999999;"
@@ -261,7 +261,7 @@ For the `NcSelect` component, all events will be passed through. Please see the
 </template>
 
 <script>
-import NcDatetimePicker from '../NcDatetimePicker/index.js'
+import NcDateTimePicker from '../NcDateTimePicker/index.js'
 import NcDateTimePickerNative from '../NcDateTimePickerNative/index.js'
 import NcPasswordField from '../NcPasswordField/index.js'
 import NcSelect from '../NcSelect/index.js'
@@ -273,7 +273,7 @@ export default {
 	name: 'NcActionInput',
 
 	components: {
-		NcDatetimePicker,
+		NcDateTimePicker,
 		NcDateTimePickerNative,
 		NcPasswordField,
 		NcSelect,
diff --git a/src/components/NcDatetime/NcDatetime.vue b/src/components/NcDateTime/NcDateTime.vue
similarity index 95%
rename from src/components/NcDatetime/NcDatetime.vue
rename to src/components/NcDateTime/NcDateTime.vue
index 592960c869..354ebef330 100644
--- a/src/components/NcDatetime/NcDatetime.vue
+++ b/src/components/NcDateTime/NcDateTime.vue
@@ -33,7 +33,7 @@ Without any optional parameters the timestamp is displayed as a relative datetim
 
 ```vue
 <template>
-	<NcDatetime :timestamp="timestamp" />
+	<NcDateTime :timestamp="timestamp" />
 </template>
 <script>
 	export default {
@@ -52,7 +52,7 @@ If you do not want the seconds to be counted up until minutes are reached you ca
 
 ```vue
 <template>
-	<NcDatetime :timestamp="timestamp" :ignore-seconds="true" />
+	<NcDateTime :timestamp="timestamp" :ignore-seconds="true" />
 </template>
 <script>
 	export default {
@@ -74,13 +74,13 @@ It is also possible to disable relative time by setting the `relativeTime` prope
 <template>
 	<div>
 		<h4>Short relative time</h4>
-		<NcDatetime :timestamp="timestamp" relative-time="short" />
+		<NcDateTime :timestamp="timestamp" relative-time="short" />
 
 		<h4>Custom title format</h4>
-		<NcDatetime :timestamp="timestamp" :format="timeFormat" />
+		<NcDateTime :timestamp="timestamp" :format="timeFormat" />
 
 		<h4>Without relative time</h4>
-		<NcDatetime :timestamp="timestamp" :format="timeFormat" :relative-time="false" />
+		<NcDateTime :timestamp="timestamp" :format="timeFormat" :relative-time="false" />
 	</div>
 </template>
 <script>
@@ -123,7 +123,7 @@ const FEW_SECONDS_AGO = {
 }
 
 export default {
-	name: 'NcDatetime',
+	name: 'NcDateTime',
 
 	props: {
 		/**
diff --git a/src/components/NcDatetime/index.js b/src/components/NcDateTime/index.js
similarity index 95%
rename from src/components/NcDatetime/index.js
rename to src/components/NcDateTime/index.js
index 7f0296c74c..65d1c74321 100644
--- a/src/components/NcDatetime/index.js
+++ b/src/components/NcDateTime/index.js
@@ -20,4 +20,4 @@
  *
  */
 
-export { default } from './NcDatetime.vue'
+export { default } from './NcDateTime.vue'
diff --git a/src/components/NcDatetimePicker/NcDatetimePicker.vue b/src/components/NcDateTimePicker/NcDateTimePicker.vue
similarity index 98%
rename from src/components/NcDatetimePicker/NcDatetimePicker.vue
rename to src/components/NcDateTimePicker/NcDateTimePicker.vue
index 234a265664..3eac6b4f08 100644
--- a/src/components/NcDatetimePicker/NcDatetimePicker.vue
+++ b/src/components/NcDateTimePicker/NcDateTimePicker.vue
@@ -32,7 +32,7 @@
 ```vue
 <template>
 	<span>
-		<NcDatetimePicker
+		<NcDateTimePicker
 			v-model="time"
 			type="datetime" />
 		{{ time }}
@@ -53,7 +53,7 @@ export default {
 ```vue
 <template>
 	<span>
-		<NcDatetimePicker
+		<NcDateTimePicker
 			v-model="time"
 			type="datetime"
 			confirm />
@@ -75,7 +75,7 @@ export default {
 ```vue
 <template>
 	<span>
-		<NcDatetimePicker
+		<NcDateTimePicker
 			v-model="time"
 			range
 			type="date" />
@@ -101,7 +101,7 @@ picked time zone, but you will have to convert it yourself when necessary.
 ```vue
 <template>
 	<span>
-		<NcDatetimePicker
+		<NcDateTimePicker
 			v-model="time"
 			type="datetime"
 			:show-timezone-select="true"
@@ -200,7 +200,7 @@ const formatMap = {
 }
 
 export default {
-	name: 'NcDatetimePicker',
+	name: 'NcDateTimePicker',
 
 	components: {
 		CalendarBlank,
diff --git a/src/components/NcDatetimePicker/chevron-double-left-light.svg b/src/components/NcDateTimePicker/chevron-double-left-light.svg
similarity index 100%
rename from src/components/NcDatetimePicker/chevron-double-left-light.svg
rename to src/components/NcDateTimePicker/chevron-double-left-light.svg
diff --git a/src/components/NcDatetimePicker/chevron-double-left.svg b/src/components/NcDateTimePicker/chevron-double-left.svg
similarity index 100%
rename from src/components/NcDatetimePicker/chevron-double-left.svg
rename to src/components/NcDateTimePicker/chevron-double-left.svg
diff --git a/src/components/NcDatetimePicker/chevron-double-right-light.svg b/src/components/NcDateTimePicker/chevron-double-right-light.svg
similarity index 100%
rename from src/components/NcDatetimePicker/chevron-double-right-light.svg
rename to src/components/NcDateTimePicker/chevron-double-right-light.svg
diff --git a/src/components/NcDatetimePicker/chevron-double-right.svg b/src/components/NcDateTimePicker/chevron-double-right.svg
similarity index 100%
rename from src/components/NcDatetimePicker/chevron-double-right.svg
rename to src/components/NcDateTimePicker/chevron-double-right.svg
diff --git a/src/components/NcDatetimePicker/chevron-left-light.svg b/src/components/NcDateTimePicker/chevron-left-light.svg
similarity index 100%
rename from src/components/NcDatetimePicker/chevron-left-light.svg
rename to src/components/NcDateTimePicker/chevron-left-light.svg
diff --git a/src/components/NcDatetimePicker/chevron-left.svg b/src/components/NcDateTimePicker/chevron-left.svg
similarity index 100%
rename from src/components/NcDatetimePicker/chevron-left.svg
rename to src/components/NcDateTimePicker/chevron-left.svg
diff --git a/src/components/NcDatetimePicker/chevron-right-light.svg b/src/components/NcDateTimePicker/chevron-right-light.svg
similarity index 100%
rename from src/components/NcDatetimePicker/chevron-right-light.svg
rename to src/components/NcDateTimePicker/chevron-right-light.svg
diff --git a/src/components/NcDatetimePicker/chevron-right.svg b/src/components/NcDateTimePicker/chevron-right.svg
similarity index 100%
rename from src/components/NcDatetimePicker/chevron-right.svg
rename to src/components/NcDateTimePicker/chevron-right.svg
diff --git a/src/components/NcDatetimePicker/index.js b/src/components/NcDateTimePicker/index.js
similarity index 88%
rename from src/components/NcDatetimePicker/index.js
rename to src/components/NcDateTimePicker/index.js
index 087ea8dcf1..8b3922c137 100644
--- a/src/components/NcDatetimePicker/index.js
+++ b/src/components/NcDateTimePicker/index.js
@@ -20,9 +20,9 @@
  *
  */
 import './index.scss'
-import NcDatetimePicker from './NcDatetimePicker.vue'
+import NcDateTimePicker from './NcDateTimePicker.vue'
 import ScopeComponent from '../../utils/ScopeComponent.js'
 
-ScopeComponent(NcDatetimePicker)
+ScopeComponent(NcDateTimePicker)
 
-export default NcDatetimePicker
+export default NcDateTimePicker
diff --git a/src/components/NcDatetimePicker/index.scss b/src/components/NcDateTimePicker/index.scss
similarity index 100%
rename from src/components/NcDatetimePicker/index.scss
rename to src/components/NcDateTimePicker/index.scss
diff --git a/src/components/index.js b/src/components/index.js
index d40c433f15..a1c0e1cdff 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -57,8 +57,8 @@ export { default as NcContent } from './NcContent/index.js'
 export { default as NcCounterBubble } from './NcCounterBubble/index.js'
 export { default as NcDashboardWidget } from './NcDashboardWidget/index.js'
 export { default as NcDashboardWidgetItem } from './NcDashboardWidgetItem/index.js'
-export { default as NcDatetime } from './NcDatetime/index.js'
-export { default as NcDatetimePicker } from './NcDatetimePicker/index.js'
+export { default as NcDateTime } from './NcDateTime/index.js'
+export { default as NcDateTimePicker } from './NcDateTimePicker/index.js'
 export { default as NcDateTimePickerNative } from './NcDateTimePickerNative/index.js'
 // Not exported on purpose
 // export { default as NcEllipsisedOption } from './NcEllipsisedOption/index.js'
diff --git a/tests/unit/components/NcDatetime/NcDatetime.spec.js b/tests/unit/components/NcDateTime/NcDateTime.spec.js
similarity index 90%
rename from tests/unit/components/NcDatetime/NcDatetime.spec.js
rename to tests/unit/components/NcDateTime/NcDateTime.spec.js
index ad1f8918f2..30ee630c9e 100644
--- a/tests/unit/components/NcDatetime/NcDatetime.spec.js
+++ b/tests/unit/components/NcDateTime/NcDateTime.spec.js
@@ -21,15 +21,15 @@
  */
 
 import { mount } from '@vue/test-utils'
-import NcDatetime from '../../../../src/components/NcDatetime/NcDatetime.vue'
+import NcDateTime from '../../../../src/components/NcDateTime/NcDateTime.vue'
 
-describe('NcDatetime.vue', () => {
+describe('NcDateTime.vue', () => {
 	'use strict'
 
 	it('Sets the title property correctly', () => {
 		const time = Date.UTC(2023, 5, 23, 14, 30)
 		Date.now = jest.fn(() => new Date(time).valueOf())
-		const wrapper = mount(NcDatetime, {
+		const wrapper = mount(NcDateTime, {
 			propsData: {
 				timestamp: time,
 			},
@@ -42,7 +42,7 @@ describe('NcDatetime.vue', () => {
 	it('Can set format of the title property', () => {
 		const time = Date.UTC(2023, 5, 23, 14, 30)
 		Date.now = jest.fn(() => new Date(time).valueOf())
-		const wrapper = mount(NcDatetime, {
+		const wrapper = mount(NcDateTime, {
 			propsData: {
 				timestamp: time,
 				format: { dateStyle: 'long' },
@@ -56,7 +56,7 @@ describe('NcDatetime.vue', () => {
 	it('Can disable relative time', () => {
 		const time = Date.UTC(2023, 5, 23, 14, 30)
 		Date.now = jest.fn(() => new Date(time).valueOf())
-		const wrapper = mount(NcDatetime, {
+		const wrapper = mount(NcDateTime, {
 			propsData: {
 				timestamp: time,
 				relativeTime: false,
@@ -83,7 +83,7 @@ describe('NcDatetime.vue', () => {
 		it('', () => {
 			const time = Date.UTC(2023, 5, 23, 14, 30)
 			Date.now = jest.fn(() => new Date(time).valueOf())
-			const wrapper = mount(NcDatetime, {
+			const wrapper = mount(NcDateTime, {
 				propsData: {
 					timestamp: time,
 				},
@@ -98,7 +98,7 @@ describe('NcDatetime.vue', () => {
 		it('works with currentTime == timestamp', () => {
 			const time = Date.UTC(2023, 5, 23, 14, 30)
 			Date.now = jest.fn(() => new Date(time).valueOf())
-			const wrapper = mount(NcDatetime, {
+			const wrapper = mount(NcDateTime, {
 				propsData: {
 					timestamp: time,
 				},
@@ -112,7 +112,7 @@ describe('NcDatetime.vue', () => {
 			const time = Date.UTC(2023, 5, 23, 14, 30, 30)
 			let currentTime = Date.UTC(2023, 5, 23, 14, 30, 33)
 			Date.now = jest.fn(() => new Date(currentTime).valueOf())
-			const wrapper = mount(NcDatetime, {
+			const wrapper = mount(NcDateTime, {
 				propsData: {
 					timestamp: time,
 				},
@@ -130,7 +130,7 @@ describe('NcDatetime.vue', () => {
 			const time = Date.UTC(2023, 5, 23, 14, 30, 30)
 			const currentTime = Date.UTC(2023, 5, 23, 14, 30, 33)
 			Date.now = jest.fn(() => new Date(currentTime).valueOf())
-			const wrapper = mount(NcDatetime, {
+			const wrapper = mount(NcDateTime, {
 				propsData: {
 					timestamp: time,
 					relativeTime: 'short',
@@ -145,7 +145,7 @@ describe('NcDatetime.vue', () => {
 			const time = Date.UTC(2023, 5, 23, 14, 30, 30)
 			const currentTime = Date.UTC(2023, 5, 23, 14, 33, 30)
 			Date.now = jest.fn(() => new Date(currentTime).valueOf())
-			const wrapper = mount(NcDatetime, {
+			const wrapper = mount(NcDateTime, {
 				propsData: {
 					timestamp: time,
 				},
@@ -159,7 +159,7 @@ describe('NcDatetime.vue', () => {
 			const time = Date.UTC(2023, 5, 23, 14, 30, 30)
 			const currentTime = Date.UTC(2023, 5, 23, 17, 30, 30)
 			Date.now = jest.fn(() => new Date(currentTime).valueOf())
-			const wrapper = mount(NcDatetime, {
+			const wrapper = mount(NcDateTime, {
 				propsData: {
 					timestamp: time,
 				},
@@ -173,7 +173,7 @@ describe('NcDatetime.vue', () => {
 			const time = Date.UTC(2023, 5, 23, 14, 30, 30)
 			const currentTime = Date.UTC(2023, 6, 13, 14, 30, 30)
 			Date.now = jest.fn(() => new Date(currentTime).valueOf())
-			const wrapper = mount(NcDatetime, {
+			const wrapper = mount(NcDateTime, {
 				propsData: {
 					timestamp: time,
 				},
@@ -189,12 +189,12 @@ describe('NcDatetime.vue', () => {
 			const currentTime = Date.UTC(2024, 6, 13, 14, 30, 30)
 			Date.now = jest.fn(() => new Date(currentTime).valueOf())
 
-			const wrapper = mount(NcDatetime, {
+			const wrapper = mount(NcDateTime, {
 				propsData: {
 					timestamp: time,
 				},
 			})
-			const wrapper2 = mount(NcDatetime, {
+			const wrapper2 = mount(NcDateTime, {
 				propsData: {
 					timestamp: time2,
 				},