diff --git a/lib/analytics.dart b/lib/analytics.dart
index f877852e..372e113f 100644
--- a/lib/analytics.dart
+++ b/lib/analytics.dart
@@ -1,4 +1,4 @@
-import 'package:journal/app.dart';
+import 'package:gitjournal/app.dart';
 
 import 'package:firebase_analytics/firebase_analytics.dart';
 
diff --git a/lib/apis/git_migration.dart b/lib/apis/git_migration.dart
index b5c0ded6..03c09bf9 100644
--- a/lib/apis/git_migration.dart
+++ b/lib/apis/git_migration.dart
@@ -3,8 +3,8 @@ import 'dart:io';
 
 import 'package:fimber/fimber.dart';
 import 'package:flutter/foundation.dart';
-import 'package:journal/apis/git.dart';
-import 'package:journal/settings.dart';
+import 'package:gitjournal/apis/git.dart';
+import 'package:gitjournal/settings.dart';
 import 'package:path/path.dart' as p;
 
 //
diff --git a/lib/app.dart b/lib/app.dart
index ef476afa..dd9bc0a7 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -6,14 +6,14 @@ import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_analytics/observer.dart';
 import 'package:flutter/material.dart';
 
-import 'package:journal/apis/git.dart';
-import 'package:journal/screens/home_screen.dart';
-import 'package:journal/screens/settings_screen.dart';
-import 'package:journal/settings.dart';
-import 'package:journal/state_container.dart';
-import 'package:journal/utils.dart';
-import 'package:journal/appstate.dart';
-import 'package:journal/themes.dart';
+import 'package:gitjournal/apis/git.dart';
+import 'package:gitjournal/screens/home_screen.dart';
+import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/appstate.dart';
+import 'package:gitjournal/themes.dart';
 
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:dynamic_theme/dynamic_theme.dart';
diff --git a/lib/appstate.dart b/lib/appstate.dart
index 4754aed4..43a568a3 100644
--- a/lib/appstate.dart
+++ b/lib/appstate.dart
@@ -1,6 +1,6 @@
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:fimber/fimber.dart';
-import 'package:journal/note.dart';
+import 'package:gitjournal/note.dart';
 
 class AppState {
   //
diff --git a/lib/gitapp.dart b/lib/gitapp.dart
index 2e7cc760..cee46bf0 100644
--- a/lib/gitapp.dart
+++ b/lib/gitapp.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:journal/apis/git.dart';
-import 'package:journal/apis/git_migration.dart';
+import 'package:gitjournal/apis/git.dart';
+import 'package:gitjournal/apis/git_migration.dart';
 
 const basePath = "journal";
 String cloneUrl = "git@github.com:GitJournal/journal_test.git";
diff --git a/lib/main.dart b/lib/main.dart
index 215429ed..b1a609e8 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_crashlytics/flutter_crashlytics.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'package:journal/app.dart';
-import 'package:journal/settings.dart';
+import 'package:gitjournal/app.dart';
+import 'package:gitjournal/settings.dart';
 
 void main() async {
   var pref = await SharedPreferences.getInstance();
diff --git a/lib/note.dart b/lib/note.dart
index 178c8856..52baa8d5 100644
--- a/lib/note.dart
+++ b/lib/note.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
-import 'package:journal/storage/serializers.dart';
-import 'package:journal/datetime_utils.dart';
+import 'package:gitjournal/storage/serializers.dart';
+import 'package:gitjournal/datetime_utils.dart';
 
 enum NoteLoadState {
   None,
diff --git a/lib/note_fileName.dart b/lib/note_fileName.dart
index cd546a98..97f7b678 100644
--- a/lib/note_fileName.dart
+++ b/lib/note_fileName.dart
@@ -1,6 +1,6 @@
-import 'package:journal/note.dart';
-import 'package:journal/datetime_utils.dart';
-import 'package:journal/settings.dart';
+import 'package:gitjournal/note.dart';
+import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/settings.dart';
 
 String getFileName(Note note) {
   switch (Settings.instance.noteFileNameFormat) {
diff --git a/lib/screens/githostsetup_autoconfigure.dart b/lib/screens/githostsetup_autoconfigure.dart
index 49021eff..5e50a438 100644
--- a/lib/screens/githostsetup_autoconfigure.dart
+++ b/lib/screens/githostsetup_autoconfigure.dart
@@ -1,10 +1,10 @@
 import 'package:fimber/fimber.dart';
 import 'package:flutter/material.dart';
 import 'package:function_types/function_types.dart';
-import 'package:journal/analytics.dart';
-import 'package:journal/apis/git.dart';
-import 'package:journal/apis/githost_factory.dart';
-import 'package:journal/settings.dart';
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/apis/git.dart';
+import 'package:gitjournal/apis/githost_factory.dart';
+import 'package:gitjournal/settings.dart';
 
 import 'githostsetup_button.dart';
 import 'githostsetup_error.dart';
diff --git a/lib/screens/githostsetup_button.dart b/lib/screens/githostsetup_button.dart
index 15ec9723..9035bfe6 100644
--- a/lib/screens/githostsetup_button.dart
+++ b/lib/screens/githostsetup_button.dart
@@ -1,7 +1,7 @@
 import 'package:fimber/fimber.dart';
 import 'package:flutter/material.dart';
 import 'package:function_types/function_types.dart';
-import 'package:journal/analytics.dart';
+import 'package:gitjournal/analytics.dart';
 
 class GitHostSetupButton extends StatelessWidget {
   final Func0<void> onPressed;
diff --git a/lib/screens/githostsetup_clone_url.dart b/lib/screens/githostsetup_clone_url.dart
index 1f6d33fe..17112df0 100644
--- a/lib/screens/githostsetup_clone_url.dart
+++ b/lib/screens/githostsetup_clone_url.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:function_types/function_types.dart';
-import 'package:journal/apis/githost_factory.dart';
+import 'package:gitjournal/apis/githost_factory.dart';
 
 import 'githostsetup_button.dart';
 
diff --git a/lib/screens/githostsetup_screens.dart b/lib/screens/githostsetup_screens.dart
index 8782915f..5bfaee46 100644
--- a/lib/screens/githostsetup_screens.dart
+++ b/lib/screens/githostsetup_screens.dart
@@ -5,10 +5,10 @@ import 'package:fimber/fimber.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:function_types/function_types.dart';
-import 'package:journal/analytics.dart';
-import 'package:journal/apis/git.dart';
-import 'package:journal/apis/githost_factory.dart';
-import 'package:journal/state_container.dart';
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/apis/git.dart';
+import 'package:gitjournal/apis/githost_factory.dart';
+import 'package:gitjournal/state_container.dart';
 import 'package:path/path.dart' as p;
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 104b4c91..c8b3035d 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -1,12 +1,12 @@
 import 'package:badges/badges.dart';
 import 'package:flutter/material.dart';
-import 'package:journal/note.dart';
-import 'package:journal/apis/git.dart';
-import 'package:journal/screens/note_editor.dart';
-import 'package:journal/screens/note_viewer.dart';
-import 'package:journal/state_container.dart';
-import 'package:journal/widgets/app_drawer.dart';
-import 'package:journal/widgets/journal_list.dart';
+import 'package:gitjournal/note.dart';
+import 'package:gitjournal/apis/git.dart';
+import 'package:gitjournal/screens/note_editor.dart';
+import 'package:gitjournal/screens/note_viewer.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/widgets/app_drawer.dart';
+import 'package:gitjournal/widgets/journal_list.dart';
 
 class HomeScreen extends StatelessWidget {
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
diff --git a/lib/screens/note_editor.dart b/lib/screens/note_editor.dart
index 33aec355..501d9c3c 100644
--- a/lib/screens/note_editor.dart
+++ b/lib/screens/note_editor.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:journal/note.dart';
-import 'package:journal/state_container.dart';
-import 'package:journal/widgets/note_header.dart';
+import 'package:gitjournal/note.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/widgets/note_header.dart';
 
 class NoteEditor extends StatefulWidget {
   final Note note;
diff --git a/lib/screens/note_viewer.dart b/lib/screens/note_viewer.dart
index fe49ef53..94c0b312 100644
--- a/lib/screens/note_viewer.dart
+++ b/lib/screens/note_viewer.dart
@@ -2,11 +2,11 @@ import 'package:fimber/fimber.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:journal/note.dart';
-import 'package:journal/state_container.dart';
-import 'package:journal/utils.dart';
-import 'package:journal/settings.dart';
-import 'package:journal/widgets/note_header.dart';
+import 'package:gitjournal/note.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/widgets/note_header.dart';
 import 'package:share/share.dart';
 
 import 'note_editor.dart';
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 0d43e04e..33acf2bc 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:journal/settings.dart';
-import 'package:journal/utils.dart';
+import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/utils.dart';
 
 import 'package:preferences/preferences.dart';
 import 'package:dynamic_theme/dynamic_theme.dart';
diff --git a/lib/state_container.dart b/lib/state_container.dart
index 75eba150..a5faa943 100644
--- a/lib/state_container.dart
+++ b/lib/state_container.dart
@@ -4,12 +4,12 @@ import 'dart:io';
 import 'package:fimber/fimber.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:journal/analytics.dart';
-import 'package:journal/apis/git_migration.dart';
-import 'package:journal/appstate.dart';
-import 'package:journal/note.dart';
-import 'package:journal/note_fileName.dart';
-import 'package:journal/storage/git_storage.dart';
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/apis/git_migration.dart';
+import 'package:gitjournal/appstate.dart';
+import 'package:gitjournal/note.dart';
+import 'package:gitjournal/note_fileName.dart';
+import 'package:gitjournal/storage/git_storage.dart';
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 
diff --git a/lib/storage/git_storage.dart b/lib/storage/git_storage.dart
index 21447c29..16f59d6e 100644
--- a/lib/storage/git_storage.dart
+++ b/lib/storage/git_storage.dart
@@ -3,9 +3,9 @@ import 'dart:io';
 
 import 'package:fimber/fimber.dart';
 import 'package:flutter/foundation.dart';
-import 'package:journal/apis/git.dart';
-import 'package:journal/note.dart';
-import 'package:journal/settings.dart';
+import 'package:gitjournal/apis/git.dart';
+import 'package:gitjournal/note.dart';
+import 'package:gitjournal/settings.dart';
 import 'package:path/path.dart' as p;
 
 class NoteRepoResult {
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index 72b6b24c..8bd88ce7 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -2,9 +2,9 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_email_sender/flutter_email_sender.dart';
-import 'package:journal/analytics.dart';
-import 'package:journal/state_container.dart';
-import 'package:journal/utils.dart';
+import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/utils.dart';
 import 'package:launch_review/launch_review.dart';
 import 'package:share/share.dart';
 import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/widgets/journal_list.dart b/lib/widgets/journal_list.dart
index 5d357684..2798dab5 100644
--- a/lib/widgets/journal_list.dart
+++ b/lib/widgets/journal_list.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:journal/note.dart';
-import 'package:journal/state_container.dart';
-import 'package:journal/utils.dart';
-import 'package:journal/utils/markdown.dart';
-import 'package:journal/widgets/icon_dismissable.dart';
+import 'package:gitjournal/note.dart';
+import 'package:gitjournal/state_container.dart';
+import 'package:gitjournal/utils.dart';
+import 'package:gitjournal/utils/markdown.dart';
+import 'package:gitjournal/widgets/icon_dismissable.dart';
 import 'package:path/path.dart';
 
 typedef void NoteSelectedFunction(int noteIndex);
diff --git a/lib/widgets/note_header.dart b/lib/widgets/note_header.dart
index bab4dd6c..9d9f29f0 100644
--- a/lib/widgets/note_header.dart
+++ b/lib/widgets/note_header.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:journal/note.dart';
+import 'package:gitjournal/note.dart';
 
 class NoteHeader extends StatelessWidget {
   final Note note;
diff --git a/pubspec.yaml b/pubspec.yaml
index bb0b953e..5e464924 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,4 +1,4 @@
-name: journal
+name: gitjournal
 description: A Journaling App Built on top of Git
 version: 1.1.14+10
 
diff --git a/test/datetime_utils_test.dart b/test/datetime_utils_test.dart
index 65daf915..eb950882 100644
--- a/test/datetime_utils_test.dart
+++ b/test/datetime_utils_test.dart
@@ -1,4 +1,4 @@
-import 'package:journal/datetime_utils.dart';
+import 'package:gitjournal/datetime_utils.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/note_storage_test.dart b/test/note_storage_test.dart
index d536fde9..83b62413 100644
--- a/test/note_storage_test.dart
+++ b/test/note_storage_test.dart
@@ -1,9 +1,9 @@
 import 'dart:collection';
 import 'dart:io';
 
-import 'package:journal/datetime_utils.dart';
-import 'package:journal/note.dart';
-import 'package:journal/storage/serializers.dart';
+import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/note.dart';
+import 'package:gitjournal/storage/serializers.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
diff --git a/test/serializers_test.dart b/test/serializers_test.dart
index 1c52e0f9..c743d8e1 100644
--- a/test/serializers_test.dart
+++ b/test/serializers_test.dart
@@ -1,7 +1,7 @@
 import 'dart:collection';
 
-import 'package:journal/storage/serializers.dart';
-import 'package:journal/datetime_utils.dart';
+import 'package:gitjournal/storage/serializers.dart';
+import 'package:gitjournal/datetime_utils.dart';
 import 'package:test/test.dart';
 
 DateTime nowWithoutMicro() {
diff --git a/test/strip_markdown_formatting_test.dart b/test/strip_markdown_formatting_test.dart
index 371d2647..cf351bb9 100644
--- a/test/strip_markdown_formatting_test.dart
+++ b/test/strip_markdown_formatting_test.dart
@@ -1,4 +1,4 @@
-import 'package:journal/utils/markdown.dart';
+import 'package:gitjournal/utils/markdown.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test_driver/git.dart b/test_driver/git.dart
index 6769c876..0a51624f 100644
--- a/test_driver/git.dart
+++ b/test_driver/git.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_driver/driver_extension.dart';
-import 'package:journal/apis/git.dart';
-import 'package:journal/gitapp.dart';
+import 'package:gitjournal/apis/git.dart';
+import 'package:gitjournal/gitapp.dart';
 
 void main() async {
   // This line enables the extension
diff --git a/test_driver/main.dart b/test_driver/main.dart
index 13d82c14..c6a131a1 100644
--- a/test_driver/main.dart
+++ b/test_driver/main.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_driver/driver_extension.dart';
-import 'package:journal/app.dart';
+import 'package:gitjournal/app.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 void main() async {