diff --git a/lib/app.dart b/lib/app.dart
index 1671c120..0faafab8 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -69,20 +69,14 @@ class JournalApp extends StatefulWidget {
 
     await settings.migrate(pref, appState.gitBaseDirectory);
 
-    var gitRepoDir =
-        p.join(appState.gitBaseDirectory, settings.internalRepoFolderName);
+    var gitRepoDir = p.join(appState.gitBaseDirectory, settings.folderName);
 
     var repoDirStat = File(gitRepoDir).statSync();
     if (repoDirStat.type != FileSystemEntityType.directory) {
-      settings.internalRepoFolderName = "journal";
+      settings.folderName = "journal";
 
-      var repoPath = p.join(
-        appState.gitBaseDirectory,
-        settings.internalRepoFolderName,
-      );
-
-      Log.i("Calling GitInit at: $repoPath");
-      await GitRepository.init(repoPath);
+      Log.i("Calling GitInit at: $gitRepoDir");
+      await GitRepository.init(gitRepoDir);
 
       settings.save();
     } else {
@@ -405,7 +399,7 @@ class _JournalAppState extends State<JournalApp> {
         return SettingsScreen();
       case '/setupRemoteGit':
         return GitHostSetupScreen(
-          repoFolderName: settings.internalRepoFolderName,
+          repoFolderName: settings.folderName,
           remoteName: "origin",
           onCompletedFunction: stateContainer.completeGitHostSetup,
         );
diff --git a/lib/settings.dart b/lib/settings.dart
index 71dfd52d..71373c0b 100644
--- a/lib/settings.dart
+++ b/lib/settings.dart
@@ -59,7 +59,7 @@ class Settings extends ChangeNotifier {
 
   bool bottomMenuBar = true;
 
-  String internalRepoFolderName = "journal";
+  String folderName = "journal";
 
   bool storeInternally = true;
   String storageLocation = "";
@@ -128,8 +128,7 @@ class Settings extends ChangeNotifier {
         pref.getStringList("inlineTagPrefixes")?.toSet() ?? inlineTagPrefixes;
 
     // From AppState
-    internalRepoFolderName =
-        pref.getString("remoteGitRepoPath") ?? internalRepoFolderName;
+    folderName = pref.getString("remoteGitRepoPath") ?? folderName;
 
     bottomMenuBar = pref.getBool("bottomMenuBar") ?? bottomMenuBar;
     storeInternally = pref.getBool("storeInternally") ?? storeInternally;
@@ -216,7 +215,7 @@ class Settings extends ChangeNotifier {
 
     pref.setInt("settingsVersion", version);
 
-    pref.setString("remoteGitRepoPath", internalRepoFolderName);
+    pref.setString("remoteGitRepoPath", folderName);
 
     notifyListeners();
   }
@@ -294,7 +293,7 @@ class Settings extends ChangeNotifier {
       'swipeToDelete': swipeToDelete.toString(),
       'inlineTagPrefixes': inlineTagPrefixes.join(' '),
       'emojiParser': emojiParser.toString(),
-      'remoteGitRepoPath': internalRepoFolderName.toString(),
+      'folderName': folderName.toString(),
       'bottomMenuBar': bottomMenuBar.toString(),
       'storeInternally': storeInternally.toString(),
       'storageLocation': storageLocation,
@@ -325,11 +324,11 @@ class Settings extends ChangeNotifier {
         var newName = p.join(gitBaseDir, "journal");
 
         await Directory(oldName).rename(newName);
-        internalRepoFolderName = "journal";
+        folderName = "journal";
 
         version = 1;
         pref.setInt("settingsVersion", version);
-        pref.setString('remoteGitRepoPath', internalRepoFolderName);
+        pref.setString('remoteGitRepoPath', folderName);
         return;
       }
     }
diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index 25d3910e..19ff88d6 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -483,7 +483,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
     var basePath = stateContainer.appState.gitBaseDirectory;
 
     var settings = Provider.of<Settings>(context, listen: false);
-    var repoName = settings.internalRepoFolderName;
+    var repoName = settings.folderName;
     var repoPath = p.join(basePath, repoName);
     Log.i("RepoPath: $repoPath");
 
diff --git a/lib/state_container.dart b/lib/state_container.dart
index a8ebe6c4..76667c4b 100644
--- a/lib/state_container.dart
+++ b/lib/state_container.dart
@@ -43,7 +43,7 @@ class StateContainer with ChangeNotifier {
     @required this.gitBaseDirectory,
     @required this.cacheDirectory,
   }) {
-    var folderName = settings.internalRepoFolderName;
+    var folderName = settings.folderName;
     repoPath = settings.storeInternally
         ? p.join(gitBaseDirectory, folderName)
         : p.join(settings.storageLocation, folderName);
@@ -358,7 +358,7 @@ class StateContainer with ChangeNotifier {
   }
 
   Future<void> moveRepoToPath() async {
-    var folderName = settings.internalRepoFolderName;
+    var folderName = settings.folderName;
     var newRepoPath = settings.storeInternally
         ? p.join(gitBaseDirectory, folderName)
         : p.join(settings.storageLocation, folderName);