diff --git a/lib/blocs/edit_weekplan_bloc.dart b/lib/blocs/edit_weekplan_bloc.dart
index adaeaeba6..9e1059e4f 100644
--- a/lib/blocs/edit_weekplan_bloc.dart
+++ b/lib/blocs/edit_weekplan_bloc.dart
@@ -5,7 +5,7 @@ import 'package:api_client/models/displayname_model.dart';
 import 'package:api_client/models/week_model.dart';
 import 'package:flutter/material.dart';
 import 'package:weekplanner/blocs/new_weekplan_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 
 ///This bloc is used to control the information when editing week plan
 class EditWeekplanBloc extends NewWeekplanBloc {
diff --git a/lib/blocs/weekplan_selector_bloc.dart b/lib/blocs/weekplans_bloc.dart
similarity index 98%
rename from lib/blocs/weekplan_selector_bloc.dart
rename to lib/blocs/weekplans_bloc.dart
index 517897a8c..7866ed908 100644
--- a/lib/blocs/weekplan_selector_bloc.dart
+++ b/lib/blocs/weekplans_bloc.dart
@@ -328,13 +328,15 @@ class WeekplansBloc extends BlocBase {
     }
   }
 
+
+
   /// This helper-method deletes the given week model from the database
   void _deleteWeekFromDatabase(List<WeekModel> weekModels, WeekModel weekModel) {
     _api.week
         .delete(_user.id!, weekModel.weekYear, weekModel.weekNumber)
         .listen((bool deleted) {
       if (deleted) {
-        deleteWeekFromStream(weekModels, weekModel);
+        _deleteWeekFromStream(weekModels, weekModel);
       }
     });
   }
@@ -342,7 +344,7 @@ class WeekplansBloc extends BlocBase {
   ///This method was created during refactoring to simplify unit-testing.
   /// In this way it is possible to test removing it from the stream independently
   /// of testing working with the database
-  void deleteWeekFromStream(List<WeekModel> weekModels, WeekModel weekModel) {
+  void _deleteWeekFromStream(List<WeekModel> weekModels, WeekModel weekModel) {
     weekModels.remove(weekModel);
     _weekModels.add(weekModels);
   }
@@ -394,7 +396,9 @@ class WeekplansBloc extends BlocBase {
     _editMode.add(!_editMode.value);
   }
 
-  /// This stream checks that you have only marked one week model
+
+  /// This stream checks that you have only marked one week model. It is currently
+  /// not being used
   Stream<bool> onlyOneModelMarkedStream() {
     return _markedWeekModels.map((List<WeekModel> event) => event.length == 1);
   }
diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
index 3ffb7bdc0..67f3f365f 100644
--- a/lib/bootstrap.dart
+++ b/lib/bootstrap.dart
@@ -17,7 +17,7 @@ import 'package:weekplanner/blocs/timer_bloc.dart';
 import 'package:weekplanner/blocs/toolbar_bloc.dart';
 import 'package:weekplanner/blocs/upload_from_gallery_bloc.dart';
 import 'package:weekplanner/blocs/weekplan_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/providers/environment_provider.dart' as environment;
 
diff --git a/lib/screens/edit_weekplan_screen.dart b/lib/screens/edit_weekplan_screen.dart
index cbb63ea9a..15d6b5716 100644
--- a/lib/screens/edit_weekplan_screen.dart
+++ b/lib/screens/edit_weekplan_screen.dart
@@ -2,7 +2,7 @@ import 'package:api_client/models/displayname_model.dart';
 import 'package:api_client/models/week_model.dart';
 import 'package:flutter/material.dart';
 import 'package:weekplanner/blocs/edit_weekplan_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/exceptions/custom_exceptions.dart';
 import 'package:weekplanner/routes.dart';
diff --git a/lib/screens/weekplan_selector_screen.dart b/lib/screens/weekplan_selector_screen.dart
index cfc4de61e..6215694da 100644
--- a/lib/screens/weekplan_selector_screen.dart
+++ b/lib/screens/weekplan_selector_screen.dart
@@ -5,7 +5,7 @@ import 'package:api_client/models/week_model.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:weekplanner/blocs/pictogram_image_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/models/enums/app_bar_icons_enum.dart';
 import 'package:weekplanner/routes.dart';
diff --git a/test/blocs/edit_weekplan_bloc_test.dart b/test/blocs/edit_weekplan_bloc_test.dart
index 7b710a11b..5311ed197 100644
--- a/test/blocs/edit_weekplan_bloc_test.dart
+++ b/test/blocs/edit_weekplan_bloc_test.dart
@@ -10,7 +10,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:rxdart/rxdart.dart' as rx_dart;
 import 'package:weekplanner/blocs/edit_weekplan_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 
 class MockWeekApi extends Mock implements WeekApi {}
diff --git a/test/blocs/new_weekplan_bloc_test.dart b/test/blocs/new_weekplan_bloc_test.dart
index 9d050e32b..f8beacc97 100644
--- a/test/blocs/new_weekplan_bloc_test.dart
+++ b/test/blocs/new_weekplan_bloc_test.dart
@@ -9,7 +9,7 @@ import 'package:async_test/async_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:weekplanner/blocs/new_weekplan_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 
 class MockWeekApi extends Mock implements WeekApi {}
diff --git a/test/blocs/weekplans_bloc_test.dart b/test/blocs/weekplans_bloc_test.dart
index 13ffaeb68..6b5815789 100644
--- a/test/blocs/weekplans_bloc_test.dart
+++ b/test/blocs/weekplans_bloc_test.dart
@@ -12,7 +12,7 @@ import 'package:csv/csv.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:rxdart/rxdart.dart' as rx_dart;
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 
 class MockWeekApi extends Mock implements WeekApi {}
 
diff --git a/test/screens/copy_resolve_screen_test.dart b/test/screens/copy_resolve_screen_test.dart
index 835eb78c6..cbdf7d5e7 100644
--- a/test/screens/copy_resolve_screen_test.dart
+++ b/test/screens/copy_resolve_screen_test.dart
@@ -17,7 +17,7 @@ import 'package:weekplanner/blocs/edit_weekplan_bloc.dart';
 import 'package:weekplanner/blocs/pictogram_image_bloc.dart';
 import 'package:weekplanner/blocs/settings_bloc.dart';
 import 'package:weekplanner/blocs/toolbar_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/screens/copy_resolve_screen.dart';
 import 'package:weekplanner/screens/weekplan_selector_screen.dart';
diff --git a/test/screens/copy_to_citizens_screen_test.dart b/test/screens/copy_to_citizens_screen_test.dart
index 345b720a8..7287a42da 100644
--- a/test/screens/copy_to_citizens_screen_test.dart
+++ b/test/screens/copy_to_citizens_screen_test.dart
@@ -22,7 +22,7 @@ import 'package:weekplanner/blocs/edit_weekplan_bloc.dart';
 import 'package:weekplanner/blocs/pictogram_image_bloc.dart';
 import 'package:weekplanner/blocs/settings_bloc.dart';
 import 'package:weekplanner/blocs/toolbar_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/screens/copy_to_citizens_screen.dart';
 import 'package:weekplanner/widgets/giraf_3button_dialog.dart';
diff --git a/test/screens/edit_weekplan_screen_test.dart b/test/screens/edit_weekplan_screen_test.dart
index fa48f4003..134cb5ac0 100644
--- a/test/screens/edit_weekplan_screen_test.dart
+++ b/test/screens/edit_weekplan_screen_test.dart
@@ -15,7 +15,7 @@ import 'package:weekplanner/blocs/edit_weekplan_bloc.dart';
 import 'package:weekplanner/blocs/pictogram_bloc.dart';
 import 'package:weekplanner/blocs/pictogram_image_bloc.dart';
 import 'package:weekplanner/blocs/toolbar_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/screens/edit_weekplan_screen.dart';
 import 'package:weekplanner/screens/pictogram_search_screen.dart';
diff --git a/test/screens/new_weekplan_screen_test.dart b/test/screens/new_weekplan_screen_test.dart
index affcb9f17..3a26a162d 100644
--- a/test/screens/new_weekplan_screen_test.dart
+++ b/test/screens/new_weekplan_screen_test.dart
@@ -15,7 +15,7 @@ import 'package:weekplanner/blocs/new_weekplan_bloc.dart';
 import 'package:weekplanner/blocs/pictogram_bloc.dart';
 import 'package:weekplanner/blocs/pictogram_image_bloc.dart';
 import 'package:weekplanner/blocs/toolbar_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/screens/new_weekplan_screen.dart';
 import 'package:weekplanner/screens/pictogram_search_screen.dart';
diff --git a/test/screens/weekplan_selector_screen_test.dart b/test/screens/weekplan_selector_screen_test.dart
index 5e38d8344..d453022d2 100644
--- a/test/screens/weekplan_selector_screen_test.dart
+++ b/test/screens/weekplan_selector_screen_test.dart
@@ -28,7 +28,7 @@ import 'package:weekplanner/blocs/settings_bloc.dart';
 import 'package:weekplanner/blocs/timer_bloc.dart';
 import 'package:weekplanner/blocs/toolbar_bloc.dart';
 import 'package:weekplanner/blocs/weekplan_bloc.dart';
-import 'package:weekplanner/blocs/weekplan_selector_bloc.dart';
+import 'package:weekplanner/blocs/weekplans_bloc.dart';
 import 'package:weekplanner/di.dart';
 import 'package:weekplanner/models/enums/app_bar_icons_enum.dart';
 import 'package:weekplanner/screens/copy_resolve_screen.dart';