diff --git a/lib/screens/folder_listing.dart b/lib/screens/folder_listing.dart
index d6340bfb..eff6b3f1 100644
--- a/lib/screens/folder_listing.dart
+++ b/lib/screens/folder_listing.dart
@@ -8,7 +8,7 @@ import 'package:gitjournal/widgets/rename_dialog.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 
-import 'journal_listing.dart';
+import 'folder_view.dart';
 
 class FolderListingScreen extends StatefulWidget {
   @override
@@ -28,7 +28,7 @@ class _FolderListingScreenState extends State<FolderListingScreen> {
       rootFolder: notesFolder,
       onFolderEntered: (NotesFolder folder) {
         var route = MaterialPageRoute(
-          builder: (context) => JournalListingScreen(
+          builder: (context) => FolderView(
             notesFolder: folder,
           ),
         );
diff --git a/lib/screens/journal_listing.dart b/lib/screens/folder_view.dart
similarity index 94%
rename from lib/screens/journal_listing.dart
rename to lib/screens/folder_view.dart
index f75a2d70..6bf4f557 100644
--- a/lib/screens/journal_listing.dart
+++ b/lib/screens/folder_view.dart
@@ -17,16 +17,16 @@ import 'package:gitjournal/widgets/sync_button.dart';
 
 import 'package:provider/provider.dart';
 
-class JournalListingScreen extends StatefulWidget {
+class FolderView extends StatefulWidget {
   final NotesFolder notesFolder;
 
-  JournalListingScreen({@required this.notesFolder});
+  FolderView({@required this.notesFolder});
 
   @override
-  _JournalListingScreenState createState() => _JournalListingScreenState();
+  _FolderViewState createState() => _FolderViewState();
 }
 
-class _JournalListingScreenState extends State<JournalListingScreen> {
+class _FolderViewState extends State<FolderView> {
   SortedNotesFolder sortedNotesFolder;
 
   @override
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index e7af4112..b2ba7ab0 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -3,12 +3,12 @@ import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/notes_folder.dart';
 
-import 'journal_listing.dart';
+import 'folder_view.dart';
 
 class HomeScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final notesFolder = Provider.of<NotesFolder>(context);
-    return JournalListingScreen(notesFolder: notesFolder);
+    return FolderView(notesFolder: notesFolder);
   }
 }