diff --git a/build.gradle b/build.gradle
index dd4d180..c8e0112 100644
--- a/build.gradle
+++ b/build.gradle
@@ -230,7 +230,7 @@ application {
 }
 
 ext {
-  apiCourtScheduleVersion = "0.3.3"
+  apiCourtScheduleVersion = "0.4.1"
   log4JVersion = "2.24.3"
   logbackVersion = "1.5.18"
   lombokVersion = "1.18.38"
diff --git a/src/main/java/uk/gov/hmcts/cp/repositories/InMemoryCourtScheduleRepositoryImpl.java b/src/main/java/uk/gov/hmcts/cp/repositories/InMemoryCourtScheduleRepositoryImpl.java
index 4c867e0..f246414 100644
--- a/src/main/java/uk/gov/hmcts/cp/repositories/InMemoryCourtScheduleRepositoryImpl.java
+++ b/src/main/java/uk/gov/hmcts/cp/repositories/InMemoryCourtScheduleRepositoryImpl.java
@@ -1,10 +1,10 @@
 package uk.gov.hmcts.cp.repositories;
 
 import org.springframework.stereotype.Component;
+import uk.gov.hmcts.cp.openapi.model.CourtSchedule;
 import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponse;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInner;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInnerHearingsInner;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInnerHearingsInnerCourtSittingsInner;
+import uk.gov.hmcts.cp.openapi.model.CourtSitting;
+import uk.gov.hmcts.cp.openapi.model.Hearing;
 
 import java.time.OffsetDateTime;
 import java.util.List;
@@ -14,13 +14,13 @@
 public class InMemoryCourtScheduleRepositoryImpl implements CourtScheduleRepository {
 
     public CourtScheduleResponse getCourtScheduleByCaseUrn(final String caseUrn) {
-        final CourtScheduleResponseCourtScheduleInnerHearingsInner courtScheduleHearing = CourtScheduleResponseCourtScheduleInnerHearingsInner.builder()
+        final Hearing courtScheduleHearing = Hearing.builder()
                 .hearingId(UUID.randomUUID().toString())
                 .listNote("Requires interpreter")
                 .hearingDescription("Sentencing for theft case")
                 .hearingType("Trial")
                 .courtSittings(List.of(
-                        CourtScheduleResponseCourtScheduleInnerHearingsInnerCourtSittingsInner.builder()
+                        CourtSitting.builder()
                                 .courtHouse("Central Criminal Court")
                                 .sittingStart(OffsetDateTime.now())
                                 .sittingEnd(OffsetDateTime.now().plusMinutes(60))
@@ -30,7 +30,7 @@ public CourtScheduleResponse getCourtScheduleByCaseUrn(final String caseUrn) {
 
         return CourtScheduleResponse.builder()
                 .courtSchedule(List.of(
-                                CourtScheduleResponseCourtScheduleInner.builder()
+                                CourtSchedule.builder()
                                         .hearings(List.of(courtScheduleHearing)
                                         ).build()
                         )
diff --git a/src/test/java/uk/gov/hmcts/cp/controllers/CourtScheduleControllerTest.java b/src/test/java/uk/gov/hmcts/cp/controllers/CourtScheduleControllerTest.java
index b903748..16b978d 100644
--- a/src/test/java/uk/gov/hmcts/cp/controllers/CourtScheduleControllerTest.java
+++ b/src/test/java/uk/gov/hmcts/cp/controllers/CourtScheduleControllerTest.java
@@ -7,10 +7,10 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.server.ResponseStatusException;
+import uk.gov.hmcts.cp.openapi.model.CourtSchedule;
 import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponse;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInner;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInnerHearingsInner;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInnerHearingsInnerCourtSittingsInner;
+import uk.gov.hmcts.cp.openapi.model.CourtSitting;
+import uk.gov.hmcts.cp.openapi.model.Hearing;
 import uk.gov.hmcts.cp.repositories.CourtScheduleRepository;
 import uk.gov.hmcts.cp.repositories.InMemoryCourtScheduleRepositoryImpl;
 import uk.gov.hmcts.cp.services.CourtScheduleService;
@@ -52,11 +52,11 @@ void getJudgeById_ShouldReturnJudgesWithOkStatus() {
         assertNotNull(responseBody.getCourtSchedule());
         assertEquals(1, responseBody.getCourtSchedule().size());
 
-        CourtScheduleResponseCourtScheduleInner schedule = responseBody.getCourtSchedule().get(0);
+        CourtSchedule schedule = responseBody.getCourtSchedule().get(0);
         assertNotNull(schedule.getHearings());
         assertEquals(1, schedule.getHearings().size());
 
-        CourtScheduleResponseCourtScheduleInnerHearingsInner hearing = schedule.getHearings().get(0);
+        Hearing hearing = schedule.getHearings().get(0);
         assertNotNull(hearing.getHearingId());
         assertEquals("Requires interpreter", hearing.getListNote());
         assertEquals("Sentencing for theft case", hearing.getHearingDescription());
@@ -64,7 +64,7 @@ void getJudgeById_ShouldReturnJudgesWithOkStatus() {
         assertNotNull(hearing.getCourtSittings());
         assertEquals(1, hearing.getCourtSittings().size());
 
-        CourtScheduleResponseCourtScheduleInnerHearingsInnerCourtSittingsInner sitting =
+        CourtSitting sitting =
                 hearing.getCourtSittings().get(0);
         assertEquals("Central Criminal Court", sitting.getCourtHouse());
         assertNotNull(sitting.getSittingStart());
diff --git a/src/test/java/uk/gov/hmcts/cp/repositories/CourtScheduleRepositoryTest.java b/src/test/java/uk/gov/hmcts/cp/repositories/CourtScheduleRepositoryTest.java
index 9119c65..2467db7 100644
--- a/src/test/java/uk/gov/hmcts/cp/repositories/CourtScheduleRepositoryTest.java
+++ b/src/test/java/uk/gov/hmcts/cp/repositories/CourtScheduleRepositoryTest.java
@@ -2,10 +2,10 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import uk.gov.hmcts.cp.openapi.model.CourtSchedule;
 import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponse;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInner;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInnerHearingsInner;
-import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponseCourtScheduleInnerHearingsInnerCourtSittingsInner;
+import uk.gov.hmcts.cp.openapi.model.CourtSitting;
+import uk.gov.hmcts.cp.openapi.model.Hearing;
 
 import java.util.UUID;
 
@@ -30,11 +30,11 @@ void getCourtScheduleByCaseUrn_shouldReturnCourtScheduleResponse() {
         assertNotNull(response.getCourtSchedule());
         assertEquals(1, response.getCourtSchedule().size());
 
-        CourtScheduleResponseCourtScheduleInner schedule = response.getCourtSchedule().get(0);
+        CourtSchedule schedule = response.getCourtSchedule().get(0);
         assertNotNull(schedule.getHearings());
         assertEquals(1, schedule.getHearings().size());
 
-        CourtScheduleResponseCourtScheduleInnerHearingsInner hearing = schedule.getHearings().get(0);
+        Hearing hearing = schedule.getHearings().get(0);
         assertNotNull(hearing.getHearingId());
         assertEquals("Requires interpreter", hearing.getListNote());
         assertEquals("Sentencing for theft case", hearing.getHearingDescription());
@@ -42,7 +42,7 @@ void getCourtScheduleByCaseUrn_shouldReturnCourtScheduleResponse() {
         assertNotNull(hearing.getCourtSittings());
         assertEquals(1, hearing.getCourtSittings().size());
 
-        CourtScheduleResponseCourtScheduleInnerHearingsInnerCourtSittingsInner sitting =
+        CourtSitting sitting =
                 hearing.getCourtSittings().get(0);
         assertEquals("Central Criminal Court", sitting.getCourtHouse());
         assertNotNull(sitting.getSittingStart());