diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormContent.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormContent.kt
index d0ca88dd..232dbfc9 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormContent.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormContent.kt
@@ -19,9 +19,9 @@ internal fun SurveyFormContent(
     content: String,
     question: String,
     questionType: QuestionType,
-    time: LocalTime,
-    date: LocalDate,
-    questionNumber: Int,
+    timeDeadline: LocalTime,
+    dateDeadline: LocalDate,
+    currentQuestionNumber: Int,
     totalQuestionNumber: Int,
     timePickerState: TimePickerState,
     showDatePicker: Boolean,
@@ -86,7 +86,7 @@ internal fun SurveyFormContent(
                 },
                 onQuestionChanged = onQuestionChanged,
                 onAddSurveyQuestionButtonClicked = onAddQuestionButtonClicked,
-                questionNumber = questionNumber,
+                currentQuestionNumber = currentQuestionNumber,
                 totalQuestionNumber = totalQuestionNumber,
                 onPreviousButtonClicked = {
                     onPreviousButtonClicked(SurveyFormState.INFORMATION)
@@ -104,8 +104,8 @@ internal fun SurveyFormContent(
 
         SurveyFormState.DEADLINE -> {
             SurveyDeadlineContent(
-                time = time,
-                date = date,
+                timeDeadline = timeDeadline,
+                dateDeadline = dateDeadline,
                 timePickerState = timePickerState,
                 showDatePicker = showDatePicker,
                 showTimePicker = showTimePicker,
diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyQuestionContent.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyQuestionContent.kt
index ee7c892f..41f4b34d 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyQuestionContent.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyQuestionContent.kt
@@ -41,7 +41,7 @@ import com.wap.wapp.core.model.survey.QuestionType
 internal fun SurveyQuestionContent(
     question: String,
     questionType: QuestionType,
-    questionNumber: Int,
+    currentQuestionNumber: Int,
     totalQuestionNumber: Int,
     onQuestionChanged: (String) -> Unit,
     onQuestionTypeChanged: (QuestionType) -> Unit,
@@ -75,7 +75,7 @@ internal fun SurveyQuestionContent(
             )
 
             SurveyQuestionNumberText(
-                questionNumber = questionNumber + 1,
+                questionNumber = currentQuestionNumber + 1,
                 totalQuestionNumber = totalQuestionNumber + 1,
                 onPreviousQuestionButtonClicked = onPreviousQuestionButtonClicked,
                 onNextQuestionButtonClicked = onNextQuestionButtonClicked,