diff --git a/assets/blocks/quiz/question-block/question.scss b/assets/blocks/quiz/question-block/question.scss
index c8c6e4b0db..d7fb2805a7 100644
--- a/assets/blocks/quiz/question-block/question.scss
+++ b/assets/blocks/quiz/question-block/question.scss
@@ -54,11 +54,12 @@ $question-input-border-color: var(--wp--preset--color--foreground, #155E65 );
 			line-height: 1;
 		}
 	}
-	.submitted_file {
+
+	.wp-block-sensei-lms-question-answers__filename {
 		margin-bottom: 20px;
 	}
 
-	.submitted_image_file {
+	.wp-block-sensei-lms-question-answers__preview {
 		max-height: 480px;
 	}
 }
diff --git a/assets/css/3rd-party/themes/course/quiz.scss b/assets/css/3rd-party/themes/course/quiz.scss
index f85e081a87..4525a21a16 100644
--- a/assets/css/3rd-party/themes/course/quiz.scss
+++ b/assets/css/3rd-party/themes/course/quiz.scss
@@ -2,11 +2,11 @@
 
 .wp-block-sensei-lms-quiz {
 	.wp-block-sensei-lms-question-answers {
-		.sensei_quiz_question_user_text_answer {
+		.wp-block-sensei-lms-question-answers__answer {
 			color: $gray-50;
 		}
 
-		.submitted_image_file {
+		.wp-block-sensei-lms-question-answers__preview {
 			border-radius: 4px;
 			border: 1px solid var(--wp--preset--color--foreground);
 		}
diff --git a/assets/css/sensei-course-theme/quiz-compat.scss b/assets/css/sensei-course-theme/quiz-compat.scss
index b734ccb21d..c7cf10cb48 100644
--- a/assets/css/sensei-course-theme/quiz-compat.scss
+++ b/assets/css/sensei-course-theme/quiz-compat.scss
@@ -25,7 +25,7 @@ $textColor: #1E1E1E;
 		font-size: 1.125rem;
 	}
 
-	.submitted_file {
+	.wp-block-sensei-lms-question-answers__filename {
 		font-size: 18px;
 		font-style: normal;
 		font-weight: 400;
@@ -35,7 +35,7 @@ $textColor: #1E1E1E;
 		}
 	}
 
-	.sensei_quiz_question_user_text_answer {
+	.wp-block-sensei-lms-question-answers__answer {
 		color: $gray-50;
 	}
 }
diff --git a/templates/single-quiz/question-type-file-upload.php b/templates/single-quiz/question-type-file-upload.php
index 94e1a7a222..49dcfc14b1 100755
--- a/templates/single-quiz/question-type-file-upload.php
+++ b/templates/single-quiz/question-type-file-upload.php
@@ -36,7 +36,7 @@
 
 <?php if ( $question_data['answer_media_url'] && $question_data['answer_media_filename'] ) { ?>
 
-	<p class="submitted_file">
+	<p class="wp-block-sensei-lms-question-answers__filename">
 
 		<?php
 		printf(
@@ -51,7 +51,7 @@
 	</p>
 
 	<?php if ( $sensei_is_quiz_view_only_mode && getimagesize( $question_data['answer_media_url'] ) ) { ?>
-		<img src="<?php echo esc_url( $question_data['answer_media_url'] ); ?>" class="submitted_image_file" />
+		<img src="<?php echo esc_url( $question_data['answer_media_url'] ); ?>" class="wp-block-sensei-lms-question-answers__preview" />
 	<?php } ?>
 
 	<?php if ( ! $question_data['quiz_is_completed'] ) { ?>
diff --git a/templates/single-quiz/question-type-gap-fill.php b/templates/single-quiz/question-type-gap-fill.php
index f853650b7f..01949f3228 100755
--- a/templates/single-quiz/question-type-gap-fill.php
+++ b/templates/single-quiz/question-type-gap-fill.php
@@ -28,7 +28,7 @@
 	<span class="gapfill-answer-pre">
 		<?php echo wp_kses_post( apply_filters( 'sensei_answer_text', esc_html( $question_data['gapfill_pre'] ) ) ); ?>
 		<?php if ( $sensei_is_quiz_view_only_mode ) { ?>
-			<span class="sensei_quiz_question_user_text_answer">
+			<span class="wp-block-sensei-lms-question-answers__answer">
 				<?php echo wp_kses_post( $question_data['user_answer_entry'] ); ?>
 			</span>
 		<?php } else { ?>
diff --git a/templates/single-quiz/question-type-multi-line.php b/templates/single-quiz/question-type-multi-line.php
index e9c88606ec..95ad3782c4 100755
--- a/templates/single-quiz/question-type-multi-line.php
+++ b/templates/single-quiz/question-type-multi-line.php
@@ -24,7 +24,7 @@
 
 if ( $sensei_is_quiz_view_only_mode ) {
 	?>
-	<div class="sensei_quiz_question_user_text_answer">
+	<div class="wp-block-sensei-lms-question-answers__answer">
 		<?php echo wp_kses_post( $question_data['user_answer_entry'] ); ?>
 	</div>
 	<?php
diff --git a/templates/single-quiz/question-type-single-line.php b/templates/single-quiz/question-type-single-line.php
index 6ed86de541..8784e3a420 100755
--- a/templates/single-quiz/question-type-single-line.php
+++ b/templates/single-quiz/question-type-single-line.php
@@ -27,7 +27,7 @@
 <div class="answer">
 
 	<?php if ( $sensei_is_quiz_view_only_mode ) { ?>
-		<div class="sensei_quiz_question_user_text_answer">
+		<div class="wp-block-sensei-lms-question-answers__answer">
 			<?php echo wp_kses_post( $question_data['user_answer_entry'] ); ?>
 		</div>
 	<?php } else { ?>