diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryDiagnosisWithTreatment.kt b/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryDiagnosisWithTreatment.kt
index 5ab6b48670d..555b287ee4e 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryDiagnosisWithTreatment.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryDiagnosisWithTreatment.kt
@@ -56,7 +56,7 @@ fun MedicalHistoryDiagnosisWithTreatment(
                 color = MaterialTheme.colors.onSurface,
             )
 
-            AnswerChipsGroup(
+            MedicalHistoryQuestionOptions(
                 modifier = Modifier.align(Alignment.End),
                 selectedAnswer = diagnosisAnswer,
                 onSelectionChange = { newAnswer ->
@@ -88,7 +88,7 @@ fun MedicalHistoryDiagnosisWithTreatment(
                         color = MaterialTheme.colors.onSurface,
                     )
 
-                    AnswerChipsGroup(
+                    MedicalHistoryQuestionOptions(
                         modifier = Modifier.align(Alignment.End),
                         selectedAnswer = treatmentAnswer,
                         onSelectionChange = { newAnswer ->
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryQuestionItem.kt b/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryQuestionItem.kt
index 96b6b88e61b..833ea6a865d 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryQuestionItem.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryQuestionItem.kt
@@ -45,7 +45,7 @@ fun MedicalHistoryQuestionItem(
           overflow = TextOverflow.Ellipsis,
       )
 
-      AnswerChipsGroup(
+      MedicalHistoryQuestionOptions(
           selectedAnswer = selectedAnswer,
           onSelectionChange = { newAnswer ->
             if (newAnswer == selectedAnswer) {
diff --git a/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryAnswerChip.kt b/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryQuestionOptions.kt
similarity index 94%
rename from app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryAnswerChip.kt
rename to app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryQuestionOptions.kt
index b1407cabffb..817324d1bd5 100644
--- a/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryAnswerChip.kt
+++ b/app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryQuestionOptions.kt
@@ -20,7 +20,7 @@ import org.simple.clinic.R
 import org.simple.clinic.medicalhistory.Answer
 
 @Composable
-fun AnswerChipsGroup(
+fun MedicalHistoryQuestionOptions(
     modifier: Modifier = Modifier,
     selectedAnswer: Answer?,
     onSelectionChange: (Answer) -> Unit
@@ -30,7 +30,7 @@ fun AnswerChipsGroup(
       horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.spacing_8)),
       verticalAlignment = Alignment.CenterVertically,
   ) {
-    MedicalHistoryAnswerChip(
+    MedicalHistoryQuestionOption(
         label = stringResource(R.string.newmedicalhistory_yes),
         selected = selectedAnswer == Answer.Yes,
         onSelectionChange = {
@@ -38,7 +38,7 @@ fun AnswerChipsGroup(
         }
     )
 
-    MedicalHistoryAnswerChip(
+    MedicalHistoryQuestionOption(
         label = stringResource(R.string.newmedicalhistory_no),
         selected = selectedAnswer == Answer.No,
         onSelectionChange = {
@@ -50,7 +50,7 @@ fun AnswerChipsGroup(
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
-fun MedicalHistoryAnswerChip(
+fun MedicalHistoryQuestionOption(
     label: String,
     selected: Boolean,
     onSelectionChange: () -> Unit