diff --git a/lib/routes.dart b/lib/routes.dart
index 1e0d37c0..53145bdc 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -61,8 +61,8 @@ const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details';
 const String CREATE_EPISODE = 'patients/create-episode';
 const String UPDATE_EPISODE = 'patients/update-episode';
 const String PATIENT_ADMISSION_REQUEST = 'patients/admission_request';
-const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission_request-second';
-const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission_request-third';
+const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission_request_second';
+const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission_request_third';
 const String PATIENT_MEDICAL_REPORT = 'patients/medical-report';
 const String PATIENT_MEDICAL_REPORT_INSERT = 'patients/medical-report-insert';
 const String PATIENT_MEDICAL_REPORT_DETAIL = 'patients/medical-report-detail';
diff --git a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
index 6cbadd09..e69faab8 100644
--- a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
+++ b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
@@ -372,7 +372,7 @@ class _AdmissionRequestThirdScreenState
             ],
           ),
         ),
-        bottomSheet: BottomSheetDialogButton(
+        bottomSheet: CustomBottomSheetContainer(
           label: "${TranslationBase.of(context).next}",
           onTap: () async {
             await locator<AnalyticsService>().logEvent(
diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart
index 3a69d0b3..a68127c0 100644
--- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart
+++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart
@@ -567,7 +567,7 @@ class _PatientMakeInPatientReferralScreenState extends State<PatientMakeInPatien
               ? Container(
             height: 0,
           )
-              :BottomSheetDialogButton(
+              :CustomBottomSheetContainer(
             label: "${TranslationBase.of(context).refer}",
             onTap: () async {
               setState(() {
diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart
index bf9af33e..ea9bfeb2 100644
--- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart
+++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart
@@ -159,7 +159,7 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
                   ],
                 ),
                 if (model.patientReferral.length == 0)
-                  BottomSheetDialogButton(
+                  CustomBottomSheetContainer(
                       label: "${TranslationBase.of(context).refer}",
                       onTap: () async {
                         await locator<AnalyticsService>().logEvent(
diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
index 0d98ff81..181560a6 100644
--- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
+++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
@@ -399,7 +399,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
               ? Container(
                   height: 0,
                 )
-              : BottomSheetDialogButton(
+              : CustomBottomSheetContainer(
                   label: (widget.isUpdate
                       ? 'Update Assessment Details'
                       : 'Add Assessment Details'),
diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
index bd1801ac..82dfb0da 100644
--- a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
+++ b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
@@ -102,7 +102,7 @@ class _AddExaminationPageState extends State<AddExaminationPage> {
                   ? Container(
                       height: 0,
                     )
-                  : BottomSheetDialogButton(
+                  : CustomBottomSheetContainer(
                       label: "${TranslationBase.of(context).addExamination}",
                       onTap: () {
                         widget
diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
index 226ec2f3..026ca14a 100644
--- a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
@@ -118,7 +118,7 @@ class _AddAllergiesState extends State<AddAllergies> {
               ? Container(
                   height: 0,
                 )
-              : BottomSheetDialogButton(
+              : CustomBottomSheetContainer(
                   label: TranslationBase.of(context).addAllergies,
                   onTap: () {
                     setState(() {
diff --git a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
index 277dd23a..16bec79b 100644
--- a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
@@ -165,7 +165,7 @@ class _AddHistoryDialogState extends State<AddHistoryDialog> {
                 ? Container(
                     height: 0,
                   )
-                : BottomSheetDialogButton(
+                : CustomBottomSheetContainer(
                     label: TranslationBase.of(context).addSelectedHistories,
                     onTap: () {
                       widget.addSelectedHistories();
diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
index c9a07bb5..0b92aef9 100644
--- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
@@ -424,7 +424,7 @@ class _AddMedicationState extends State<AddMedication> {
                 ? Container(
                     height: 0,
                   )
-                : BottomSheetDialogButton(
+                : CustomBottomSheetContainer(
                     label: TranslationBase.of(context).addMedication,
                     onTap: () {
                       setState(() {
diff --git a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart
index 6f593a82..8151eb90 100644
--- a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart
+++ b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart
@@ -84,7 +84,7 @@ class _AddDrugWidgetState extends State<AddDrugWidget> {
           ? Container(
               height: 0,
             )
-          : BottomSheetDialogButton(
+          : CustomBottomSheetContainer(
               label: TranslationBase.of(context).addMedication,
               onTap: () async {
                 GifLoaderDialogUtils.showMyDialog(context);
diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart
index a004fc15..5e7c9eb0 100644
--- a/lib/screens/procedures/add-favourite-procedure.dart
+++ b/lib/screens/procedures/add-favourite-procedure.dart
@@ -83,7 +83,7 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
                             .youDoNotHaveFavoritePrescription,
                       ),
               ]),
-              bottomSheet: BottomSheetDialogButton(
+              bottomSheet: CustomBottomSheetContainer(
                   label: widget.procedureType.getAddButtonTitle(context) ??
                       TranslationBase.of(context).addSelectedProcedures,
                   onTap: () async {
diff --git a/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart b/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart
index 13354f22..af7d0a4c 100644
--- a/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart
+++ b/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart
@@ -5,13 +5,13 @@ import 'package:hexcolor/hexcolor.dart';
 
 import '../../config/config.dart';
 
-class BottomSheetDialogButton extends StatelessWidget {
+class CustomBottomSheetContainer extends StatelessWidget {
   final Function onTap;
   final String label;
 
   double headerHeight = SizeConfig.heightMultiplier * 12;
 
-  BottomSheetDialogButton({Key key, this.onTap, this.label}) : super(key: key);
+  CustomBottomSheetContainer({Key key, this.onTap, this.label}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {