diff --git a/packages/flutter_availability/lib/src/routes.dart b/packages/flutter_availability/lib/src/routes.dart
index bc7078e..da4ce8b 100644
--- a/packages/flutter_availability/lib/src/routes.dart
+++ b/packages/flutter_availability/lib/src/routes.dart
@@ -1,8 +1,8 @@
 import "package:flutter/material.dart";
 import "package:flutter_availability/flutter_availability.dart";
 import "package:flutter_availability/src/service/availability_service.dart";
-import "package:flutter_availability/src/ui/screens/template_availability_day_overview.dart";
-import "package:flutter_availability/src/ui/screens/template_day_edit.dart";
+import "package:flutter_availability/src/ui/screens/availability_modification.dart";
+import "package:flutter_availability/src/ui/screens/template_day_modification.dart";
 import "package:flutter_availability/src/ui/screens/template_overview.dart";
 import "package:flutter_availability_data_interface/flutter_availability_data_interface.dart";
 
@@ -37,7 +37,7 @@ MaterialPageRoute templateOverviewRoute() => MaterialPageRoute(
 ///
 MaterialPageRoute templateEditDayRoute(AvailabilityTemplateModel? template) =>
     MaterialPageRoute(
-      builder: (context) => AvailabilityDayTemplateEdit(
+      builder: (context) => DayTemplateModificationScreen(
         template: template,
         onExit: () => Navigator.of(context).pop(),
       ),
@@ -49,7 +49,7 @@ MaterialPageRoute availabilityViewRoute(
   List<AvailabilityWithTemplate> initialAvailabilities,
 ) =>
     MaterialPageRoute(
-      builder: (context) => AvailabilityModificationView(
+      builder: (context) => AvailabilitiesModificationScreen(
         dateRange: dateRange,
         initialAvailabilities: initialAvailabilities,
         onExit: () {
diff --git a/packages/flutter_availability/lib/src/ui/screens/template_availability_day_overview.dart b/packages/flutter_availability/lib/src/ui/screens/availability_modification.dart
similarity index 86%
rename from packages/flutter_availability/lib/src/ui/screens/template_availability_day_overview.dart
rename to packages/flutter_availability/lib/src/ui/screens/availability_modification.dart
index eb318c0..e33339b 100644
--- a/packages/flutter_availability/lib/src/ui/screens/template_availability_day_overview.dart
+++ b/packages/flutter_availability/lib/src/ui/screens/availability_modification.dart
@@ -7,10 +7,12 @@ import "package:flutter_availability/src/ui/widgets/pause_selection.dart";
 import "package:flutter_availability/src/util/scope.dart";
 import "package:flutter_availability_data_interface/flutter_availability_data_interface.dart";
 
-///
-class AvailabilityModificationView extends StatefulWidget {
-  ///
-  const AvailabilityModificationView({
+/// Screen for modifying the availabilities for a specific daterange
+/// There might already be availabilities for the selected period but they
+/// will be overwritten
+class AvailabilitiesModificationScreen extends StatefulWidget {
+  /// Constructor
+  const AvailabilitiesModificationScreen({
     required this.dateRange,
     required this.onExit,
     required this.initialAvailabilities,
@@ -18,9 +20,13 @@ class AvailabilityModificationView extends StatefulWidget {
   });
 
   /// The date for which the availability is being managed
+  /// If the daterange is only 1 day the [AvailabilitiesModificationScreen] will
+  /// show the layout for a single day otherwise it will show the layout
+  /// for a period
   final DateTimeRange dateRange;
 
   /// The initial availabilities for the selected period
+  /// If empty the user will be creating new availabilities
   final List<AvailabilityWithTemplate> initialAvailabilities;
 
   /// Callback for when the user wants to navigate back or the
@@ -28,12 +34,12 @@ class AvailabilityModificationView extends StatefulWidget {
   final VoidCallback onExit;
 
   @override
-  State<AvailabilityModificationView> createState() =>
-      _AvailabilityModificationViewState();
+  State<AvailabilitiesModificationScreen> createState() =>
+      _AvailabilitiesModificationScreenState();
 }
 
-class _AvailabilityModificationViewState
-    extends State<AvailabilityModificationView> {
+class _AvailabilitiesModificationScreenState
+    extends State<AvailabilitiesModificationScreen> {
   late AvailabilityModel _availability;
   bool _clearAvailability = false;
   TimeOfDay? _startTime;
diff --git a/packages/flutter_availability/lib/src/ui/screens/template_day_edit.dart b/packages/flutter_availability/lib/src/ui/screens/template_day_modification.dart
similarity index 95%
rename from packages/flutter_availability/lib/src/ui/screens/template_day_edit.dart
rename to packages/flutter_availability/lib/src/ui/screens/template_day_modification.dart
index d2b75b5..97299c7 100644
--- a/packages/flutter_availability/lib/src/ui/screens/template_day_edit.dart
+++ b/packages/flutter_availability/lib/src/ui/screens/template_day_modification.dart
@@ -7,9 +7,9 @@ import "package:flutter_availability/src/util/scope.dart";
 import "package:flutter_availability_data_interface/flutter_availability_data_interface.dart";
 
 /// Page for creating or editing a day template
-class AvailabilityDayTemplateEdit extends StatefulWidget {
-  ///
-  const AvailabilityDayTemplateEdit({
+class DayTemplateModificationScreen extends StatefulWidget {
+  /// Constructor
+  const DayTemplateModificationScreen({
     required this.template,
     required this.onExit,
     super.key,
@@ -22,12 +22,12 @@ class AvailabilityDayTemplateEdit extends StatefulWidget {
   final VoidCallback onExit;
 
   @override
-  State<AvailabilityDayTemplateEdit> createState() =>
-      _AvailabilityDayTemplateEditState();
+  State<DayTemplateModificationScreen> createState() =>
+      _DayTemplateModificationScreenState();
 }
 
-class _AvailabilityDayTemplateEditState
-    extends State<AvailabilityDayTemplateEdit> {
+class _DayTemplateModificationScreenState
+    extends State<DayTemplateModificationScreen> {
   late int? _selectedColor;
   late AvailabilityTemplateModel _template;