diff --git a/app/lib/common/widgets/tutorial/show_app_tour.dart b/app/lib/common/widgets/tutorial/show_app_tour.dart
index 5b232143..ac0b988d 100644
--- a/app/lib/common/widgets/tutorial/show_app_tour.dart
+++ b/app/lib/common/widgets/tutorial/show_app_tour.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import '../../module.dart';
-import 'content.dart';
-import 'controller.dart';
+import 'tutorial_controller.dart';
+import 'tutorial_page.dart';
 
 FutureOr<void> showAppTour(
   BuildContext context,
@@ -13,7 +13,7 @@ FutureOr<void> showAppTour(
     TutorialController.instance.showTutorial(
       context: context,
       pages: [
-        TutorialContent(
+        TutorialPage(
           title: (context) =>
             context.l10n.tutorial_app_tour_1_title,
           content: (context) => TextSpan(
diff --git a/app/lib/common/widgets/tutorial/show_drug_selection_intro.dart b/app/lib/common/widgets/tutorial/show_drug_selection_intro.dart
index bf53aaab..d9360103 100644
--- a/app/lib/common/widgets/tutorial/show_drug_selection_intro.dart
+++ b/app/lib/common/widgets/tutorial/show_drug_selection_intro.dart
@@ -1,14 +1,14 @@
 import 'dart:async';
 
 import '../../module.dart';
-import 'content.dart';
-import 'controller.dart';
+import 'tutorial_controller.dart';
+import 'tutorial_page.dart';
 
 FutureOr<void> showDrugSelectionIntro(BuildContext context) =>
   TutorialController.instance.showTutorial(
     context: context,
     pages: [
-      TutorialContent(
+      TutorialPage(
         title: (context) =>
           context.l10n.tutorial_initial_drug_selection_title,
         content: (context) => TextSpan(
diff --git a/app/lib/common/widgets/tutorial/container.dart b/app/lib/common/widgets/tutorial/tutorial_builder.dart
similarity index 95%
rename from app/lib/common/widgets/tutorial/container.dart
rename to app/lib/common/widgets/tutorial/tutorial_builder.dart
index 11b8aa1a..4e07b3f6 100644
--- a/app/lib/common/widgets/tutorial/container.dart
+++ b/app/lib/common/widgets/tutorial/tutorial_builder.dart
@@ -1,14 +1,14 @@
 import '../../module.dart';
-import 'content.dart';
+import 'tutorial_page.dart';
 
-class TutorialContainer extends HookWidget {
-  const TutorialContainer({
+class TutorialBuilder extends HookWidget {
+  const TutorialBuilder({
     super.key,
     required this.pages,
     this.lastNextButtonText,
   });
 
-  final List<TutorialContent> pages;
+  final List<TutorialPage> pages;
   final String? lastNextButtonText;
 
   @override
diff --git a/app/lib/common/widgets/tutorial/controller.dart b/app/lib/common/widgets/tutorial/tutorial_controller.dart
similarity index 85%
rename from app/lib/common/widgets/tutorial/controller.dart
rename to app/lib/common/widgets/tutorial/tutorial_controller.dart
index 36086fac..612cbb6c 100644
--- a/app/lib/common/widgets/tutorial/controller.dart
+++ b/app/lib/common/widgets/tutorial/tutorial_controller.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import '../../module.dart';
-import 'container.dart';
-import 'content.dart';
+import 'tutorial_builder.dart';
+import 'tutorial_page.dart';
 
 class TutorialController {
   factory TutorialController() {
@@ -16,7 +16,7 @@ class TutorialController {
 
   FutureOr<void> showTutorial({
     required BuildContext context,
-    required List<TutorialContent> pages,
+    required List<TutorialPage> pages,
     String? lastNextButtonText,
     FutureOr<void> Function()? onClose,
   }) async {
@@ -30,7 +30,7 @@ class TutorialController {
       isScrollControlled: true,
       useSafeArea: true,
       elevation: 0,
-      builder: (context) => TutorialContainer(
+      builder: (context) => TutorialBuilder(
         pages: pages,
         lastNextButtonText: lastNextButtonText,
       ),
diff --git a/app/lib/common/widgets/tutorial/content.dart b/app/lib/common/widgets/tutorial/tutorial_page.dart
similarity index 82%
rename from app/lib/common/widgets/tutorial/content.dart
rename to app/lib/common/widgets/tutorial/tutorial_page.dart
index aeb60597..2cd1b57d 100644
--- a/app/lib/common/widgets/tutorial/content.dart
+++ b/app/lib/common/widgets/tutorial/tutorial_page.dart
@@ -1,7 +1,7 @@
 import '../../module.dart';
 
-class TutorialContent {
-  TutorialContent({
+class TutorialPage {
+  TutorialPage ({
     this.title,
     this.content,
     this.assetPath,