diff --git a/client/src/Types/StudentType.tsx b/client/src/Types/StudentType.tsx
index 833856e..04848dc 100644
--- a/client/src/Types/StudentType.tsx
+++ b/client/src/Types/StudentType.tsx
@@ -1,4 +1,12 @@
+export interface Answer {
+    answer: string | number | boolean;
+    isCorrect: boolean;
+    idQuestion: number;
+}
+
 export interface StudentType {
     name: string;
     id: string;
+    room?: string;
+    answers?: Answer[];
 }
diff --git a/client/src/__tests__/components/UserWaitPage/UserWaitPage.test.tsx b/client/src/__tests__/components/StudentWaitPage/StudentWaitPage.test.tsx
similarity index 77%
rename from client/src/__tests__/components/UserWaitPage/UserWaitPage.test.tsx
rename to client/src/__tests__/components/StudentWaitPage/StudentWaitPage.test.tsx
index 6722794..40fd745 100644
--- a/client/src/__tests__/components/UserWaitPage/UserWaitPage.test.tsx
+++ b/client/src/__tests__/components/StudentWaitPage/StudentWaitPage.test.tsx
@@ -1,9 +1,9 @@
 // Importez le type UserType s'il n'est pas déjà importé
 import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import UserWaitPage from '../../../components/UserWaitPage/UserWaitPage';
+import StudentWaitPage from '../../../components/StudentWaitPage/StudentWaitPage';
 
-describe('UserWaitPage Component', () => {
+describe('StudentWaitPage Component', () => {
     const mockUsers = [
         { id: '1', name: 'User1' },
         { id: '2', name: 'User2' },
@@ -17,8 +17,8 @@ describe('UserWaitPage Component', () => {
         setQuizMode: jest.fn(),
       };
 
-    test('renders UserWaitPage with correct content', () => {
-        render(<UserWaitPage {...mockProps} />);
+    test('renders StudentWaitPage with correct content', () => {
+        render(<StudentWaitPage {...mockProps} />);
 
         //expect(screen.getByText(/Test Room/)).toBeInTheDocument();
 
@@ -31,7 +31,7 @@ describe('UserWaitPage Component', () => {
       });
 
       test('clicking on "Lancer" button opens LaunchQuizDialog', () => {
-        render(<UserWaitPage {...mockProps} />);
+        render(<StudentWaitPage {...mockProps} />);
 
         fireEvent.click(screen.getByRole('button', { name: /Lancer/i }));
 
diff --git a/client/src/components/UserWaitPage/UserWaitPage.tsx b/client/src/components/StudentWaitPage/StudentWaitPage.tsx
similarity index 88%
rename from client/src/components/UserWaitPage/UserWaitPage.tsx
rename to client/src/components/StudentWaitPage/StudentWaitPage.tsx
index db4e110..5bfc6a2 100644
--- a/client/src/components/UserWaitPage/UserWaitPage.tsx
+++ b/client/src/components/StudentWaitPage/StudentWaitPage.tsx
@@ -1,56 +1,56 @@
-import { Button, Chip, Grid } from '@mui/material';
-import { StudentType } from '../../Types/StudentType';
-import { PlayArrow } from '@mui/icons-material';
-import LaunchQuizDialog from '../LaunchQuizDialog/LaunchQuizDialog';
-import { useState } from 'react';
-import './userWaitPage.css';
-
-interface Props {
-    users: StudentType[];
-    launchQuiz: () => void;
-    setQuizMode: (mode: 'student' | 'teacher') => void;
-}
-
-const UserWaitPage: React.FC<Props> = ({ users, launchQuiz, setQuizMode }) => {
-    const [isDialogOpen, setIsDialogOpen] = useState<boolean>(false);
-
-    return (
-        <div className="wait">
-            <div className='button'>
-                <Button
-                    variant="contained"
-                    onClick={() => setIsDialogOpen(true)}
-                    startIcon={<PlayArrow />}
-                    fullWidth
-                    sx={{ fontWeight: 600, fontSize: 20 }}
-                >
-                    Lancer
-                </Button> 
-            </div>
-
-            <div className="students">
-               
-                <Grid container spacing={3}>
-
-                    {users.map((user, index) => (
-                        <Grid item key={user.name + index}>
-                            <Chip label={user.name} sx={{ width: '100%' }} />
-                        </Grid>
-                    ))}
-                    
-                </Grid>
-
-            </div>
-
-            <LaunchQuizDialog
-                open={isDialogOpen}
-                handleOnClose={() => setIsDialogOpen(false)}
-                launchQuiz={launchQuiz}
-                setQuizMode={setQuizMode}
-            />
-
-        </div>
-    );
-};
-
-export default UserWaitPage;
+import { Button, Chip, Grid } from '@mui/material';
+import { StudentType } from '../../Types/StudentType';
+import { PlayArrow } from '@mui/icons-material';
+import LaunchQuizDialog from '../LaunchQuizDialog/LaunchQuizDialog';
+import { useState } from 'react';
+import './studentWaitPage.css';
+
+interface Props {
+    users: StudentType[];
+    launchQuiz: () => void;
+    setQuizMode: (mode: 'student' | 'teacher') => void;
+}
+
+const StudentWaitPage: React.FC<Props> = ({ users, launchQuiz, setQuizMode }) => {
+    const [isDialogOpen, setIsDialogOpen] = useState<boolean>(false);
+
+    return (
+        <div className="wait">
+            <div className='button'>
+                <Button
+                    variant="contained"
+                    onClick={() => setIsDialogOpen(true)}
+                    startIcon={<PlayArrow />}
+                    fullWidth
+                    sx={{ fontWeight: 600, fontSize: 20 }}
+                >
+                    Lancer
+                </Button> 
+            </div>
+
+            <div className="students">
+               
+                <Grid container spacing={3}>
+
+                    {users.map((user, index) => (
+                        <Grid item key={user.name + index}>
+                            <Chip label={user.name} sx={{ width: '100%' }} />
+                        </Grid>
+                    ))}
+                    
+                </Grid>
+
+            </div>
+
+            <LaunchQuizDialog
+                open={isDialogOpen}
+                handleOnClose={() => setIsDialogOpen(false)}
+                launchQuiz={launchQuiz}
+                setQuizMode={setQuizMode}
+            />
+
+        </div>
+    );
+};
+
+export default StudentWaitPage;
diff --git a/client/src/components/UserWaitPage/userWaitPage.css b/client/src/components/StudentWaitPage/studentWaitPage.css
similarity index 100%
rename from client/src/components/UserWaitPage/userWaitPage.css
rename to client/src/components/StudentWaitPage/studentWaitPage.css
diff --git a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
index 4bb3161..0691d9c 100644
--- a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
+++ b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
@@ -15,7 +15,7 @@ import { StudentType } from '../../../Types/StudentType';
 import { Button } from '@mui/material';
 import LoadingCircle from '../../../components/LoadingCircle/LoadingCircle';
 import { Refresh, Error } from '@mui/icons-material';
-import UserWaitPage from '../../../components/UserWaitPage/UserWaitPage';
+import StudentWaitPage from '../../../components/StudentWaitPage/StudentWaitPage';
 import DisconnectButton from '../../../components/DisconnectButton/DisconnectButton';
 import QuestionNavigation from '../../../components/QuestionNavigation/QuestionNavigation';
 import Question from '../../../components/Questions/Question';
@@ -311,7 +311,7 @@ const ManageRoom: React.FC = () => {
 
                 ) : (
 
-                    <UserWaitPage
+                    <StudentWaitPage
                         users={students}
                         launchQuiz={launchQuiz}
                         setQuizMode={setQuizMode}