diff --git a/libs/api-hjarntorget/lib/apiHjarntorget.ts b/libs/api-hjarntorget/lib/apiHjarntorget.ts
index 72e5aa77..8087c890 100644
--- a/libs/api-hjarntorget/lib/apiHjarntorget.ts
+++ b/libs/api-hjarntorget/lib/apiHjarntorget.ts
@@ -51,6 +51,7 @@ import {
   verifyUrlBase,
   wallMessagesUrl,
 } from './routes'
+import parse from '@skolplattformen/curriculum'
 
 function getDateOfISOWeek(week: number, year: number) {
   const simple = new Date(year, 0, 1 + (week - 1) * 7)
@@ -470,9 +471,8 @@ export class ApiHjarntorget extends EventEmitter implements Api {
         zone: FixedOffsetZone.instance(l.endDate.timezoneOffsetMinutes),
       })
       return {
+        ...parse(l.title, _lang),
         id: l.id,
-        code: l.title,
-        name: l.title,
         teacher: l.bookedTeacherNames && l.bookedTeacherNames[0],
         location: l.location,
         timeStart: start.toISOTime().substring(0, 5),
@@ -480,7 +480,7 @@ export class ApiHjarntorget extends EventEmitter implements Api {
         dayOfWeek: start.toJSDate().getDay(),
         blockName: l.title,
         dateStart: start.toISODate(),
-        dateEnd: start.toISODate(),
+        dateEnd: end.toISODate(),
       } as TimetableEntry
     })
   }