diff --git a/src/api/block/content-types/block/schema.json b/src/api/block/content-types/block/schema.json
index b3326d7..2ac381e 100644
--- a/src/api/block/content-types/block/schema.json
+++ b/src/api/block/content-types/block/schema.json
@@ -12,11 +12,11 @@
   },
   "pluginOptions": {},
   "attributes": {
-    "datestart": {
+    "datetime_start": {
       "type": "datetime",
       "required": true
     },
-    "dateend": {
+    "datetime_end": {
       "type": "datetime",
       "required": true
     },
@@ -29,12 +29,12 @@
       ],
       "default": "created"
     },
-    "sessionsTotal": {
+    "sessions_total": {
       "type": "integer",
       "default": 10,
       "required": true
     },
-    "sessionsCompleted": {
+    "sessions_completed": {
       "type": "integer",
       "default": 0
     },
diff --git a/src/api/order/content-types/order/schema.json b/src/api/order/content-types/order/schema.json
index 185f4ab..a6b8aaf 100644
--- a/src/api/order/content-types/order/schema.json
+++ b/src/api/order/content-types/order/schema.json
@@ -41,7 +41,7 @@
       "target": "api::block.block",
       "inversedBy": "orders"
     },
-    "orderNumber": {
+    "order_number": {
       "type": "integer"
     },
     "slot": {
@@ -50,11 +50,11 @@
       "target": "api::slot.slot",
       "inversedBy": "orders"
     },
-    "datestart": {
-      "type": "datetime"
+    "time_start": {
+      "type": "time"
     },
-    "dateend": {
-      "type": "datetime"
+    "time_end": {
+      "type": "time"
     }
   }
 }
diff --git a/src/api/setting/content-types/setting/schema.json b/src/api/setting/content-types/setting/schema.json
index 6c6d10a..4de5200 100644
--- a/src/api/setting/content-types/setting/schema.json
+++ b/src/api/setting/content-types/setting/schema.json
@@ -4,14 +4,15 @@
   "info": {
     "singularName": "setting",
     "pluralName": "settings",
-    "displayName": "Setting"
+    "displayName": "Setting",
+    "description": ""
   },
   "options": {
     "draftAndPublish": true
   },
   "pluginOptions": {},
   "attributes": {
-    "recordingByBlocks": {
+    "recording_by_blocks": {
       "type": "boolean",
       "default": false
     }
diff --git a/src/api/slot/content-types/slot/schema.json b/src/api/slot/content-types/slot/schema.json
index c0d6f7b..fa6175b 100644
--- a/src/api/slot/content-types/slot/schema.json
+++ b/src/api/slot/content-types/slot/schema.json
@@ -12,12 +12,12 @@
   },
   "pluginOptions": {},
   "attributes": {
-    "datestart": {
-      "type": "datetime",
+    "time_start": {
+      "type": "time",
       "required": true
     },
-    "dateend": {
-      "type": "datetime",
+    "time_end": {
+      "type": "time",
       "required": true
     },
     "state": {
@@ -39,6 +39,9 @@
       "relation": "manyToOne",
       "target": "api::customer.customer",
       "inversedBy": "slots"
+    },
+    "date": {
+      "type": "date"
     }
   }
 }
diff --git a/types/generated/contentTypes.d.ts b/types/generated/contentTypes.d.ts
index 1e0588a..cb8b1ee 100644
--- a/types/generated/contentTypes.d.ts
+++ b/types/generated/contentTypes.d.ts
@@ -385,16 +385,17 @@ export interface ApiBlockBlock extends Struct.CollectionTypeSchema {
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
-    dateend: Schema.Attribute.DateTime & Schema.Attribute.Required;
-    datestart: Schema.Attribute.DateTime & Schema.Attribute.Required;
+    datetime_end: Schema.Attribute.DateTime & Schema.Attribute.Required;
+    datetime_start: Schema.Attribute.DateTime & Schema.Attribute.Required;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
     localizations: Schema.Attribute.Relation<'oneToMany', 'api::block.block'> &
       Schema.Attribute.Private;
     master: Schema.Attribute.Relation<'manyToOne', 'api::customer.customer'>;
     orders: Schema.Attribute.Relation<'oneToMany', 'api::order.order'>;
     publishedAt: Schema.Attribute.DateTime;
-    sessionsCompleted: Schema.Attribute.Integer & Schema.Attribute.DefaultTo<0>;
-    sessionsTotal: Schema.Attribute.Integer &
+    sessions_completed: Schema.Attribute.Integer &
+      Schema.Attribute.DefaultTo<0>;
+    sessions_total: Schema.Attribute.Integer &
       Schema.Attribute.Required &
       Schema.Attribute.DefaultTo<10>;
     state: Schema.Attribute.Enumeration<['created', 'paid', 'deleted']> &
@@ -464,12 +465,10 @@ export interface ApiOrderOrder extends Struct.CollectionTypeSchema {
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
-    dateend: Schema.Attribute.DateTime;
-    datestart: Schema.Attribute.DateTime;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
     localizations: Schema.Attribute.Relation<'oneToMany', 'api::order.order'> &
       Schema.Attribute.Private;
-    orderNumber: Schema.Attribute.Integer;
+    order_number: Schema.Attribute.Integer;
     price: Schema.Attribute.Integer;
     publishedAt: Schema.Attribute.DateTime;
     service: Schema.Attribute.Text;
@@ -478,6 +477,8 @@ export interface ApiOrderOrder extends Struct.CollectionTypeSchema {
       ['created', 'scheduled', 'approved', 'completed', 'cancelled']
     > &
       Schema.Attribute.DefaultTo<'created'>;
+    time_end: Schema.Attribute.Time;
+    time_start: Schema.Attribute.Time;
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
@@ -487,6 +488,7 @@ export interface ApiOrderOrder extends Struct.CollectionTypeSchema {
 export interface ApiSettingSetting extends Struct.CollectionTypeSchema {
   collectionName: 'settings';
   info: {
+    description: '';
     displayName: 'Setting';
     pluralName: 'settings';
     singularName: 'setting';
@@ -505,7 +507,7 @@ export interface ApiSettingSetting extends Struct.CollectionTypeSchema {
     > &
       Schema.Attribute.Private;
     publishedAt: Schema.Attribute.DateTime;
-    recordingByBlocks: Schema.Attribute.Boolean &
+    recording_by_blocks: Schema.Attribute.Boolean &
       Schema.Attribute.DefaultTo<false>;
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
@@ -528,8 +530,7 @@ export interface ApiSlotSlot extends Struct.CollectionTypeSchema {
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
-    dateend: Schema.Attribute.DateTime & Schema.Attribute.Required;
-    datestart: Schema.Attribute.DateTime & Schema.Attribute.Required;
+    date: Schema.Attribute.Date;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
     localizations: Schema.Attribute.Relation<'oneToMany', 'api::slot.slot'> &
       Schema.Attribute.Private;
@@ -537,6 +538,8 @@ export interface ApiSlotSlot extends Struct.CollectionTypeSchema {
     orders: Schema.Attribute.Relation<'oneToMany', 'api::order.order'>;
     publishedAt: Schema.Attribute.DateTime;
     state: Schema.Attribute.Enumeration<['open', 'reserved', 'closed']>;
+    time_end: Schema.Attribute.Time & Schema.Attribute.Required;
+    time_start: Schema.Attribute.Time & Schema.Attribute.Required;
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;