diff --git a/frontend/frontend/src/components/SubmissionListItemTeacherPage.tsx b/frontend/frontend/src/components/SubmissionListItemTeacherPage.tsx
index 27a4f734..3b5650c1 100644
--- a/frontend/frontend/src/components/SubmissionListItemTeacherPage.tsx
+++ b/frontend/frontend/src/components/SubmissionListItemTeacherPage.tsx
@@ -15,7 +15,7 @@ import { t } from 'i18next'
 import dayjs from 'dayjs'
 
 interface SubmissionListItemTeacherPageProps {
-    relative_group_id: string
+    group_name: string
     group_id: string
     assignment_id: string
     course_id: string
@@ -32,7 +32,7 @@ export interface Score {
  * @param {SubmissionListItemTeacherPageProps} props - Props for SubmissionListItemTeacherPage component
  */
 export function SubmissionListItemTeacherPage({
-    relative_group_id,
+    group_name,
     group_id,
     assignment_id,
     course_id,
@@ -148,7 +148,7 @@ export function SubmissionListItemTeacherPage({
                                 color: 'primary.light',
                             },
                         }}
-                        primary={relative_group_id}
+                        primary={group_name}
                     />
                     {/* Display submission timestamp */}
                     <ListItemText
diff --git a/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx b/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
index e833ba36..5102d5a8 100644
--- a/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
+++ b/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
@@ -527,7 +527,7 @@ export function AssignmentPage() {
                                             ))
                                         ) : (
                                             <List disablePadding={true}>
-                                                {groups.map((group) => (
+                                                {groups.map((group, index) => (
                                                     <Box key={group.groep_id}>
                                                         <Divider
                                                             color={'text.main'}
@@ -544,18 +544,13 @@ export function AssignmentPage() {
                                                             pr={3}
                                                         >
                                                             <SubmissionListItemTeacherPage
-                                                                relative_group_id={(
-                                                                    group.groep_id -
-                                                                    Math.min(
-                                                                        ...groups.map(
-                                                                            (
-                                                                                group
-                                                                            ) =>
-                                                                                group.groep_id
-                                                                        )
-                                                                    ) +
-                                                                    1
-                                                                ).toString()}
+                                                                group_name={
+                                                                    assignment
+                                                                        ? assignment.max_groep_grootte > 1
+                                                                            ? t('group') + ' ' + (index + 1).toString()
+                                                                            : t('group') + ' ' + (index + 1).toString() //TODO Dit vervangen door de naam van de student
+                                                                        : ''
+                                                                }
                                                                 group_id={group.groep_id.toString()}
                                                                 assignment_id={
                                                                     assignmentId