diff --git a/mobile/apps/photos/lib/models/gallery/gallery_sections.dart b/mobile/apps/photos/lib/models/gallery/gallery_sections.dart
index 9ea2135e2c..3146ebb602 100644
--- a/mobile/apps/photos/lib/models/gallery/gallery_sections.dart
+++ b/mobile/apps/photos/lib/models/gallery/gallery_sections.dart
@@ -11,7 +11,7 @@ import "package:photos/service_locator.dart";
 import "package:photos/ui/viewer/gallery/component/gallery_file_widget.dart";
 import "package:photos/ui/viewer/gallery/component/group/group_header_widget.dart";
 import "package:photos/ui/viewer/gallery/component/group/type.dart";
-import "package:photos/ui/viewer/gallery/scrollbar/custom_scroll_bar_2.dart";
+import "package:photos/ui/viewer/gallery/scrollbar/custom_scroll_bar.dart";
 import "package:uuid/uuid.dart";
 
 /// In order to make the gallery performant when GroupTypes do not show group
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart b/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
index 79abb8de55..6a71b8d078 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/gallery.dart
@@ -21,7 +21,7 @@ import "package:photos/ui/viewer/gallery/component/group/group_header_widget.dar
 import "package:photos/ui/viewer/gallery/component/group/type.dart";
 import "package:photos/ui/viewer/gallery/component/sectioned_sliver_list.dart";
 import 'package:photos/ui/viewer/gallery/empty_state.dart';
-import "package:photos/ui/viewer/gallery/scrollbar/custom_scroll_bar_2.dart";
+import "package:photos/ui/viewer/gallery/scrollbar/custom_scroll_bar.dart";
 import "package:photos/ui/viewer/gallery/state/gallery_context_state.dart";
 import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
 import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";
@@ -501,7 +501,7 @@ class GalleryState extends State<Gallery> {
                 widget.footer ?? const SizedBox.shrink(),
               ],
             )
-          : CustomScrollBar2(
+          : CustomScrollBar(
               scrollController: _scrollController,
               galleryGroups: galleryGroups,
               inUseNotifier: scrollBarInUseNotifier,
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/custom_scroll_bar_2.dart b/mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/custom_scroll_bar.dart
similarity index 97%
rename from mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/custom_scroll_bar_2.dart
rename to mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/custom_scroll_bar.dart
index 7bd2722b60..cd85c5cdb2 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/custom_scroll_bar_2.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/scrollbar/custom_scroll_bar.dart
@@ -18,7 +18,7 @@ class ScrollbarDivision {
   });
 }
 
-class CustomScrollBar2 extends StatefulWidget {
+class CustomScrollBar extends StatefulWidget {
   final Widget child;
   final double bottomPadding;
   final double topPadding;
@@ -26,7 +26,7 @@ class CustomScrollBar2 extends StatefulWidget {
   final GalleryGroups galleryGroups;
   final ValueNotifier<bool> inUseNotifier;
   final double heighOfViewport;
-  const CustomScrollBar2({
+  const CustomScrollBar({
     super.key,
     required this.child,
     required this.scrollController,
@@ -38,7 +38,7 @@ class CustomScrollBar2 extends StatefulWidget {
   });
 
   @override
-  State<CustomScrollBar2> createState() => _CustomScrollBar2State();
+  State<CustomScrollBar> createState() => _CustomScrollBarState();
 }
 
 /*
@@ -55,7 +55,7 @@ Get the height of the scrollbar and create a normalized position for each
 division and populate position to title mapping. 
 */
 
-class _CustomScrollBar2State extends State<CustomScrollBar2> {
+class _CustomScrollBarState extends State<CustomScrollBar> {
   final _logger = Logger("CustomScrollBar2");
   final _scrollbarKey = GlobalKey();
   List<({double position, String title})>? positionToTitleMap;
@@ -77,7 +77,7 @@ class _CustomScrollBar2State extends State<CustomScrollBar2> {
   }
 
   @override
-  void didUpdateWidget(covariant CustomScrollBar2 oldWidget) {
+  void didUpdateWidget(covariant CustomScrollBar oldWidget) {
     super.didUpdateWidget(oldWidget);
     _init();
   }