diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index d474f3a855..1a62f33d75 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -257,9 +257,7 @@ int FolderMan::setupFoldersMigration()
 
 bool FolderMan::ensureJournalGone( const QString& journalDbFile )
 {
-    // FIXME move this to UI, not libowncloudsync
-    // FIXME use the remoteUrl to remove the MD5-journal name
-    // remove old .csync_journal file
+    // remove the old journal file
     while (QFile::exists(journalDbFile) && !QFile::remove(journalDbFile)) {
         qDebug() << "Could not remove old db file at" << journalDbFile;
         int ret = QMessageBox::warning(0, tr("Could not reset folder state"),
diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index f93dfad447..d312d9b0cb 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -74,7 +74,7 @@ public:
     Folder* setupFolderFromOldConfigFile(const QString &, AccountState *account );
 
     /**
-     * Ensures that a given directory does not contain a .csync_journal.
+     * Ensures that a given directory does not contain a sync journal file.
      *
      * @returns false if the journal could not be removed, true otherwise.
      */
diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp
index 5a75e761e9..76dc23f42c 100644
--- a/src/libsync/propagateremotemove.cpp
+++ b/src/libsync/propagateremotemove.cpp
@@ -166,7 +166,7 @@ void PropagateRemoteMove::finalize()
         record._contentChecksum = oldRecord._contentChecksum;
         record._contentChecksumType = oldRecord._contentChecksumType;
         if (record._fileSize != oldRecord._fileSize) {
-            qDebug() << "Warning: file sizes differ on server vs csync_journal: " << record._fileSize << oldRecord._fileSize;
+            qDebug() << "Warning: file sizes differ on server vs sync journal: " << record._fileSize << oldRecord._fileSize;
             record._fileSize = oldRecord._fileSize; // server might have claimed different size, we take the old one from the DB
         }
     }