diff --git a/lib/state_container.dart b/lib/state_container.dart
index 96fa6a07..8e515df9 100644
--- a/lib/state_container.dart
+++ b/lib/state_container.dart
@@ -49,6 +49,7 @@ class StateContainerState extends State<StateContainer> {
     getDirectory: getNotesDir,
     dirName: "journal",
     gitCloneUrl: "root@bcn.vhanda.in:git/test",
+    fileNameGenerator: (Note n) => n.created.toIso8601String(),
   );
 
   StateContainerState(bool onBoardingCompleted) {
diff --git a/lib/storage/git_storage.dart b/lib/storage/git_storage.dart
index 597e64c2..c50aa006 100644
--- a/lib/storage/git_storage.dart
+++ b/lib/storage/git_storage.dart
@@ -24,9 +24,10 @@ class GitNoteRepository implements NoteRepository {
     @required this.gitCloneUrl,
     @required this.dirName,
     @required this.getDirectory,
+    @required fileNameGenerator,
   }) : _fileStorage = FileStorage(
           noteSerializer: new MarkdownYAMLSerializer(),
-          fileNameGenerator: (Note note) => note.id,
+          fileNameGenerator: fileNameGenerator,
           getDirectory: getDirectory,
         ) {
     // FIXME: This isn't correct. The gitUrl might not be cloned at this point!