diff --git a/lib/favorite_photos_repository.dart b/lib/favorite_files_repository.dart
similarity index 100%
rename from lib/favorite_photos_repository.dart
rename to lib/favorite_files_repository.dart
diff --git a/lib/main.dart b/lib/main.dart
index 56cfabd24..eff7d3449 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/configuration.dart';
-import 'package:photos/favorite_photos_repository.dart';
+import 'package:photos/favorite_files_repository.dart';
 import 'package:photos/folder_service.dart';
 import 'package:photos/photo_sync_manager.dart';
 import 'package:photos/ui/home_widget.dart';
diff --git a/lib/models/filters/favorite_items_filter.dart b/lib/models/filters/favorite_items_filter.dart
index 24579a11f..3f509aa4c 100644
--- a/lib/models/filters/favorite_items_filter.dart
+++ b/lib/models/filters/favorite_items_filter.dart
@@ -1,4 +1,4 @@
-import 'package:photos/favorite_photos_repository.dart';
+import 'package:photos/favorite_files_repository.dart';
 import 'package:photos/models/filters/gallery_items_filter.dart';
 import 'package:photos/models/file.dart';
 
diff --git a/lib/ui/detail_page.dart b/lib/ui/detail_page.dart
index 4f0d822cb..ec483be0f 100644
--- a/lib/ui/detail_page.dart
+++ b/lib/ui/detail_page.dart
@@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:like_button/like_button.dart';
 import 'package:photos/core/cache/image_cache.dart';
-import 'package:photos/favorite_photos_repository.dart';
+import 'package:photos/favorite_files_repository.dart';
 import 'package:photos/models/file_type.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/ui/video_widget.dart';
diff --git a/lib/ui/device_folders_gallery_widget.dart b/lib/ui/device_folders_gallery_widget.dart
index 66ec291b1..e23e972c7 100644
--- a/lib/ui/device_folders_gallery_widget.dart
+++ b/lib/ui/device_folders_gallery_widget.dart
@@ -5,7 +5,7 @@ import 'package:flutter/widgets.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/photo_db.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
-import 'package:photos/favorite_photos_repository.dart';
+import 'package:photos/favorite_files_repository.dart';
 import 'package:photos/models/device_folder.dart';
 import 'package:photos/models/filters/favorite_items_filter.dart';
 import 'package:photos/models/filters/folder_name_filter.dart';
@@ -73,8 +73,7 @@ class _DeviceFolderGalleryWidgetState extends State<DeviceFolderGalleryWidget> {
     for (final path in paths) {
       final file = await FileDB.instance.getLatestFileInPath(path);
       final folderName = p.basename(path);
-      folders
-          .add(DeviceFolder(folderName, file, FolderNameFilter(folderName)));
+      folders.add(DeviceFolder(folderName, file, FolderNameFilter(folderName)));
     }
     folders.sort((first, second) {
       return second.thumbnail.createTimestamp
@@ -83,8 +82,7 @@ class _DeviceFolderGalleryWidgetState extends State<DeviceFolderGalleryWidget> {
     if (FavoriteFilesRepository.instance.hasFavorites()) {
       final file = await FileDB.instance.getLatestFileAmongGeneratedIds(
           FavoriteFilesRepository.instance.getLiked().toList());
-      folders.insert(
-          0, DeviceFolder("Favorites", file, FavoriteItemsFilter()));
+      folders.insert(0, DeviceFolder("Favorites", file, FavoriteItemsFilter()));
     }
     return folders;
   }