diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 451b42bff..5938adb52 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -516,14 +516,14 @@ int Folder::downloadInfoCount()
     return _journal.downloadInfoCount();
 }
 
-int Folder::blackListEntryCount()
+int Folder::errorBlackListEntryCount()
 {
-    return _journal.blackListEntryCount();
+    return _journal.errorBlackListEntryCount();
 }
 
-int Folder::slotWipeBlacklist()
+int Folder::slotWipeErrorBlacklist()
 {
-    return _journal.wipeBlacklist();
+    return _journal.wipeErrorBlacklist();
 }
 
 void Folder::slotWatchedPathChanged(const QString& path)
diff --git a/src/gui/folder.h b/src/gui/folder.h
index 1a9bcddd0..26689c61c 100644
--- a/src/gui/folder.h
+++ b/src/gui/folder.h
@@ -162,8 +162,8 @@ public slots:
 
       int slotDiscardDownloadProgress();
       int downloadInfoCount();
-      int slotWipeBlacklist();
-      int blackListEntryCount();
+      int slotWipeErrorBlacklist();
+      int errorBlackListEntryCount();
 
       /**
        * Triggered by the folder watcher when a file/dir in this folder
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index 992305b2e..0690cbdd0 100644
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -440,7 +440,7 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
         if (!startFromScratch || ensureStartFromScratch(localFolder)) {
             qDebug() << "Adding folder definition for" << localFolder << _remoteFolder;
             folderMan->addFolderDefinition(Theme::instance()->appName(),
-                                           localFolder, _remoteFolder, _ocWizard->blacklist() );
+                                           localFolder, _remoteFolder, _ocWizard->selectiveSyncBlacklist() );
             _ocWizard->appendToConfigurationLog(tr("<font color=\"green\"><b>Local sync folder %1 successfully created!</b></font>").arg(localFolder));
         }
     }
diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index a05f5d0f9..2440c361d 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -125,7 +125,7 @@ void ProtocolWidget::slotRetrySync()
     Folder::Map folders = folderMan->map();
 
     foreach( Folder *f, folders ) {
-        int num = f->slotWipeBlacklist();
+        int num = f->slotWipeErrorBlacklist();
         qDebug() << num << "entries were removed from"
                  << f->alias() << "blacklist";
 
@@ -255,7 +255,7 @@ void ProtocolWidget::computeResyncButtonEnabled()
     int blacklist_cnt = 0;
     int downloads_cnt = 0;
     foreach( Folder *f, folders ) {
-        blacklist_cnt += f->blackListEntryCount();
+        blacklist_cnt += f->errorBlackListEntryCount();
         downloads_cnt += f->downloadInfoCount();
     }
 
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index e518d87cf..e7c0af456 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -198,9 +198,9 @@ QString OwncloudAdvancedSetupPage::localFolder() const
     return folder;
 }
 
-QStringList OwncloudAdvancedSetupPage::blacklist() const
+QStringList OwncloudAdvancedSetupPage::selectiveSyncBlacklist() const
 {
-    return _blacklist;
+    return _selectiveSyncBlacklist;
 }
 
 bool OwncloudAdvancedSetupPage::validatePage()
@@ -276,13 +276,13 @@ void OwncloudAdvancedSetupPage::setConfigExists(bool config)
 void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked()
 {
     // Because clicking on it also changes it, restore it to the previous state in case the user cancel the dialog
-    _ui.rSyncEverything->setChecked(_blacklist.isEmpty());
+    _ui.rSyncEverything->setChecked(_selectiveSyncBlacklist.isEmpty());
 
     AccountPtr acc = static_cast<OwncloudWizard *>(wizard())->account();
-    SelectiveSyncDialog *dlg = new SelectiveSyncDialog(acc, _blacklist, this);
+    SelectiveSyncDialog *dlg = new SelectiveSyncDialog(acc, _selectiveSyncBlacklist, this);
     if (dlg->exec() == QDialog::Accepted) {
-        _blacklist = dlg->createBlackList();
-        if (!_blacklist.isEmpty()) {
+        _selectiveSyncBlacklist = dlg->createBlackList();
+        if (!_selectiveSyncBlacklist.isEmpty()) {
             _ui.rSelectiveSync->blockSignals(true);
             _ui.rSelectiveSync->setChecked(true);
             _ui.rSelectiveSync->blockSignals(false);
@@ -296,7 +296,7 @@ void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked()
             _ui.rSyncEverything->setChecked(true);
             _ui.lSelectiveSyncSizeLabel->setText(QString());
         }
-        wizard()->setProperty("blacklist", _blacklist);
+        wizard()->setProperty("blacklist", _selectiveSyncBlacklist);
     }
 }
 
@@ -304,7 +304,7 @@ void OwncloudAdvancedSetupPage::slotSyncEverythingClicked()
 {
     _ui.lSelectiveSyncSizeLabel->setText(QString());
     _ui.rSyncEverything->setChecked(true);
-    _blacklist.clear();
+    _selectiveSyncBlacklist.clear();
 }
 
 void OwncloudAdvancedSetupPage::slotQuotaRetrieved(qint64, qint64 usedQuota)
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.h b/src/gui/wizard/owncloudadvancedsetuppage.h
index afd7c3bd8..1245abcbb 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.h
+++ b/src/gui/wizard/owncloudadvancedsetuppage.h
@@ -36,7 +36,7 @@ public:
   virtual int nextId() const Q_DECL_OVERRIDE;
   bool validatePage() Q_DECL_OVERRIDE;
   QString localFolder() const;
-  QStringList blacklist() const;
+  QStringList selectiveSyncBlacklist() const;
   void setRemoteFolder( const QString& remoteFolder);
   void setMultipleFoldersExist( bool exist );
   void directoriesCreated();
@@ -69,7 +69,7 @@ private:
   QProgressIndicator* _progressIndi;
   QString _oldLocalFolder;
   QString _remoteFolder;
-  QStringList _blacklist;
+  QStringList _selectiveSyncBlacklist;
 };
 
 } // namespace OCC
diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
index 302061bbf..ae3ccd2fd 100644
--- a/src/gui/wizard/owncloudwizard.cpp
+++ b/src/gui/wizard/owncloudwizard.cpp
@@ -104,9 +104,9 @@ QString OwncloudWizard::localFolder() const
     return(_advancedSetupPage->localFolder());
 }
 
-QStringList OwncloudWizard::blacklist() const
+QStringList OwncloudWizard::selectiveSyncBlacklist() const
 {
-    return _advancedSetupPage->blacklist();
+    return _advancedSetupPage->selectiveSyncBlacklist();
 }
 
 
diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
index 0e0b23e17..ebfa35696 100644
--- a/src/gui/wizard/owncloudwizard.h
+++ b/src/gui/wizard/owncloudwizard.h
@@ -50,7 +50,7 @@ public:
     void setupCustomMedia( QVariant, QLabel* );
     QString ocUrl() const;
     QString localFolder() const;
-    QStringList blacklist() const;
+    QStringList selectiveSyncBlacklist() const;
 
     void enableFinishOnResultWidget(bool enable);
 
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 0fdd0f29b..d8fd514fe 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -57,13 +57,13 @@ int OwncloudPropagator::maximumActiveJob()
  */
 static bool blacklist(SyncJournalDb* journal, const SyncFileItem& item)
 {
-    SyncJournalBlacklistRecord oldEntry = journal->blacklistEntry(item._file);
-    SyncJournalBlacklistRecord newEntry = SyncJournalBlacklistRecord::update(oldEntry, item);
+    SyncJournalErrorBlacklistRecord oldEntry = journal->errorBlacklistEntry(item._file);
+    SyncJournalErrorBlacklistRecord newEntry = SyncJournalErrorBlacklistRecord::update(oldEntry, item);
 
     if (newEntry.isValid()) {
-        journal->updateBlacklistEntry(newEntry);
+        journal->updateErrorBlacklistEntry(newEntry);
     } else if (oldEntry.isValid()) {
-        journal->wipeBlacklistEntry(item._file);
+        journal->wipeErrorBlacklistEntry(item._file);
     }
 
     return newEntry.isValid();
@@ -106,10 +106,10 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
     case SyncFileItem::Restoration:
         if( _item._hasBlacklistEntry ) {
             // wipe blacklist entry.
-            _propagator->_journal->wipeBlacklistEntry(_item._file);
+            _propagator->_journal->wipeErrorBlacklistEntry(_item._file);
             // remove a blacklist entry in case the file was moved.
             if( _item._originalFile != _item._file ) {
-                _propagator->_journal->wipeBlacklistEntry(_item._originalFile);
+                _propagator->_journal->wipeErrorBlacklistEntry(_item._originalFile);
             }
         }
         break;
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 56ae3ce52..a5f141999 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -163,14 +163,14 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)
 
 }
 
-bool SyncEngine::checkBlacklisting( SyncFileItem *item )
+bool SyncEngine::checkErrorBlacklisting( SyncFileItem *item )
 {
     if( !_journal ) {
         qWarning() << "Journal is undefined!";
         return false;
     }
 
-    SyncJournalBlacklistRecord entry = _journal->blacklistEntry(item->_file);
+    SyncJournalErrorBlacklistRecord entry = _journal->errorBlacklistEntry(item->_file);
     item->_hasBlacklistEntry = false;
 
     if( !entry.isValid() ) {
@@ -254,7 +254,7 @@ void SyncEngine::deleteStaleUploadInfos()
     _journal->deleteStaleUploadInfos(upload_file_paths);
 }
 
-void SyncEngine::deleteStaleBlacklistEntries()
+void SyncEngine::deleteStaleErrorBlacklistEntries()
 {
     // Find all blacklisted paths that we want to preserve.
     QSet<QString> blacklist_file_paths;
@@ -264,7 +264,7 @@ void SyncEngine::deleteStaleBlacklistEntries()
     }
 
     // Delete from journal.
-    _journal->deleteStaleBlacklistEntries(blacklist_file_paths);
+    _journal->deleteStaleErrorBlacklistEntries(blacklist_file_paths);
 }
 
 int SyncEngine::treewalkLocal( TREE_WALK_FILE* file, void *data )
@@ -451,7 +451,7 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
     item._direction = dir;
     // check for blacklisting of this item.
     // if the item is on blacklist, the instruction was set to IGNORE
-    checkBlacklisting( &item );
+    checkErrorBlacklisting( &item );
 
     if (!item._isDirectory) {
         _progressInfo._totalFileCount++;
@@ -741,7 +741,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
 
     deleteStaleDownloadInfos();
     deleteStaleUploadInfos();
-    deleteStaleBlacklistEntries();
+    deleteStaleErrorBlacklistEntries();
     _journal->commit("post stale entry removal");
 
     // Emit the started signal only after the propagator has been set up.
diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h
index e63a51f5d..07d9400bf 100644
--- a/src/libsync/syncengine.h
+++ b/src/libsync/syncengine.h
@@ -120,7 +120,7 @@ private:
     static int treewalkLocal( TREE_WALK_FILE*, void *);
     static int treewalkRemote( TREE_WALK_FILE*, void *);
     int treewalkFile( TREE_WALK_FILE*, bool );
-    bool checkBlacklisting( SyncFileItem *item );
+    bool checkErrorBlacklisting( SyncFileItem *item );
 
     // Cleans up unnecessary downloadinfo entries in the journal as well
     // as their temporary files.
@@ -129,8 +129,8 @@ private:
     // Removes stale uploadinfos from the journal.
     void deleteStaleUploadInfos();
 
-    // Removes stale blacklist entries from the journal.
-    void deleteStaleBlacklistEntries();
+    // Removes stale error blacklist entries from the journal.
+    void deleteStaleErrorBlacklistEntries();
 
     // cleanup and emit the finished signal
     void finalize();
diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp
index 166fd5c39..93e1f1a93 100644
--- a/src/libsync/syncjournaldb.cpp
+++ b/src/libsync/syncjournaldb.cpp
@@ -333,11 +333,11 @@ bool SyncJournalDb::checkConnect()
         // case insensitively
         sql += QLatin1String(" COLLATE NOCASE");
     }
-    _getBlacklistQuery.reset(new SqlQuery(_db));
-    _getBlacklistQuery->prepare(sql);
+    _getErrorBlacklistQuery.reset(new SqlQuery(_db));
+    _getErrorBlacklistQuery->prepare(sql);
 
-    _setBlacklistQuery.reset(new SqlQuery(_db));
-    _setBlacklistQuery->prepare("INSERT OR REPLACE INTO blacklist "
+    _setErrorBlacklistQuery.reset(new SqlQuery(_db));
+    _setErrorBlacklistQuery->prepare("INSERT OR REPLACE INTO blacklist "
                                 "(path, lastTryEtag, lastTryModtime, retrycount, errorstring, lastTryTime, ignoreDuration) "
                                 "VALUES ( ?1, ?2, ?3, ?4, ?5, ?6, ?7)");
 
@@ -369,7 +369,7 @@ void SyncJournalDb::close()
     _deleteUploadInfoQuery.reset(0);
     _deleteFileRecordPhash.reset(0);
     _deleteFileRecordRecursively.reset(0);
-    _getBlacklistQuery.reset(0);
+    _getErrorBlacklistQuery.reset(0);
     _possibleUpgradeFromMirall_1_5 = false;
 
     _db.close();
@@ -381,7 +381,7 @@ bool SyncJournalDb::updateDatabaseStructure()
 {
     if (!updateMetadataTableStructure())
         return false;
-    if (!updateBlacklistTableStructure())
+    if (!updateErrorBlacklistTableStructure())
         return false;
     return true;
 }
@@ -456,7 +456,7 @@ bool SyncJournalDb::updateMetadataTableStructure()
     return re;
 }
 
-bool SyncJournalDb::updateBlacklistTableStructure()
+bool SyncJournalDb::updateErrorBlacklistTableStructure()
 {
     QStringList columns = tableColumns("blacklist");
     bool re = true;
@@ -985,39 +985,39 @@ bool SyncJournalDb::deleteStaleUploadInfos(const QSet<QString> &keep)
     return deleteBatch(*_deleteUploadInfoQuery, superfluousPaths, "uploadinfo");
 }
 
-SyncJournalBlacklistRecord SyncJournalDb::blacklistEntry( const QString& file )
+SyncJournalErrorBlacklistRecord SyncJournalDb::errorBlacklistEntry( const QString& file )
 {
     QMutexLocker locker(&_mutex);
-    SyncJournalBlacklistRecord entry;
+    SyncJournalErrorBlacklistRecord entry;
 
     if( file.isEmpty() ) return entry;
 
     // SELECT lastTryEtag, lastTryModtime, retrycount, errorstring
 
     if( checkConnect() ) {
-        _getBlacklistQuery->reset();
-        _getBlacklistQuery->bindValue( 1, file );
-        if( _getBlacklistQuery->exec() ){
-            if( _getBlacklistQuery->next() ) {
-                entry._lastTryEtag    = _getBlacklistQuery->baValue(0);
-                entry._lastTryModtime = _getBlacklistQuery->int64Value(1);
-                entry._retryCount     = _getBlacklistQuery->intValue(2);
-                entry._errorString    = _getBlacklistQuery->stringValue(3);
-                entry._lastTryTime    = _getBlacklistQuery->int64Value(4);
-                entry._ignoreDuration = _getBlacklistQuery->int64Value(5);
+        _getErrorBlacklistQuery->reset();
+        _getErrorBlacklistQuery->bindValue( 1, file );
+        if( _getErrorBlacklistQuery->exec() ){
+            if( _getErrorBlacklistQuery->next() ) {
+                entry._lastTryEtag    = _getErrorBlacklistQuery->baValue(0);
+                entry._lastTryModtime = _getErrorBlacklistQuery->int64Value(1);
+                entry._retryCount     = _getErrorBlacklistQuery->intValue(2);
+                entry._errorString    = _getErrorBlacklistQuery->stringValue(3);
+                entry._lastTryTime    = _getErrorBlacklistQuery->int64Value(4);
+                entry._ignoreDuration = _getErrorBlacklistQuery->int64Value(5);
                 entry._file           = file;
             }
-            _getBlacklistQuery->reset();
+            _getErrorBlacklistQuery->reset();
         } else {
-            qWarning() << "Exec error blacklist: " << _getBlacklistQuery->lastQuery() <<  " : "
-                       << _getBlacklistQuery->error();
+            qWarning() << "Exec error blacklist: " << _getErrorBlacklistQuery->lastQuery() <<  " : "
+                       << _getErrorBlacklistQuery->error();
         }
     }
 
     return entry;
 }
 
-bool SyncJournalDb::deleteStaleBlacklistEntries(const QSet<QString> &keep)
+bool SyncJournalDb::deleteStaleErrorBlacklistEntries(const QSet<QString> &keep)
 {
     QMutexLocker locker(&_mutex);
 
@@ -1048,7 +1048,7 @@ bool SyncJournalDb::deleteStaleBlacklistEntries(const QSet<QString> &keep)
     return deleteBatch(delQuery, superfluousPaths, "blacklist");
 }
 
-int SyncJournalDb::blackListEntryCount()
+int SyncJournalDb::errorBlackListEntryCount()
 {
     int re = 0;
 
@@ -1066,7 +1066,7 @@ int SyncJournalDb::blackListEntryCount()
     return re;
 }
 
-int SyncJournalDb::wipeBlacklist()
+int SyncJournalDb::wipeErrorBlacklist()
 {
     QMutexLocker locker(&_mutex);
     if( checkConnect() ) {
@@ -1083,7 +1083,7 @@ int SyncJournalDb::wipeBlacklist()
     return -1;
 }
 
-void SyncJournalDb::wipeBlacklistEntry( const QString& file )
+void SyncJournalDb::wipeErrorBlacklistEntry( const QString& file )
 {
     if( file.isEmpty() ) {
         return;
@@ -1101,7 +1101,7 @@ void SyncJournalDb::wipeBlacklistEntry( const QString& file )
     }
 }
 
-void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item )
+void SyncJournalDb::updateErrorBlacklistEntry( const SyncJournalErrorBlacklistRecord& item )
 {
     if( !checkConnect() ) {
         return;
@@ -1109,21 +1109,21 @@ void SyncJournalDb::updateBlacklistEntry( const SyncJournalBlacklistRecord& item
 
     QMutexLocker locker(&_mutex);
 
-    _setBlacklistQuery->bindValue(1, item._file);
-    _setBlacklistQuery->bindValue(2, item._lastTryEtag);
-    _setBlacklistQuery->bindValue(3, QString::number(item._lastTryModtime));
-    _setBlacklistQuery->bindValue(4, item._retryCount);
-    _setBlacklistQuery->bindValue(5, item._errorString);
-    _setBlacklistQuery->bindValue(6, QString::number(item._lastTryTime));
-    _setBlacklistQuery->bindValue(7, QString::number(item._ignoreDuration));
-    if( !_setBlacklistQuery->exec() ) {
-        QString bug = _setBlacklistQuery->error();
+    _setErrorBlacklistQuery->bindValue(1, item._file);
+    _setErrorBlacklistQuery->bindValue(2, item._lastTryEtag);
+    _setErrorBlacklistQuery->bindValue(3, QString::number(item._lastTryModtime));
+    _setErrorBlacklistQuery->bindValue(4, item._retryCount);
+    _setErrorBlacklistQuery->bindValue(5, item._errorString);
+    _setErrorBlacklistQuery->bindValue(6, QString::number(item._lastTryTime));
+    _setErrorBlacklistQuery->bindValue(7, QString::number(item._ignoreDuration));
+    if( !_setErrorBlacklistQuery->exec() ) {
+        QString bug = _setErrorBlacklistQuery->error();
         qDebug() << "SQL exec blacklistitem insert or replace failed: "<< bug;
     }
     qDebug() << "set blacklist entry for " << item._file << item._retryCount
              << item._errorString << item._lastTryTime << item._ignoreDuration
              << item._lastTryModtime << item._lastTryEtag;
-    _setBlacklistQuery->reset();
+    _setErrorBlacklistQuery->reset();
 
 }
 
diff --git a/src/libsync/syncjournaldb.h b/src/libsync/syncjournaldb.h
index 2f82f4b4e..226224b0f 100644
--- a/src/libsync/syncjournaldb.h
+++ b/src/libsync/syncjournaldb.h
@@ -24,7 +24,7 @@
 
 namespace OCC {
 class SyncJournalFileRecord;
-class SyncJournalBlacklistRecord;
+class SyncJournalErrorBlacklistRecord;
 
 /**
  * Class that handle the sync database
@@ -47,10 +47,10 @@ public:
     QString databaseFilePath();
     static qint64 getPHash(const QString& );
 
-    void updateBlacklistEntry( const SyncJournalBlacklistRecord& item );
-    void wipeBlacklistEntry(const QString& file);
-    int wipeBlacklist();
-    int blackListEntryCount();
+    void updateErrorBlacklistEntry( const SyncJournalErrorBlacklistRecord& item );
+    void wipeErrorBlacklistEntry(const QString& file);
+    int wipeErrorBlacklist();
+    int errorBlackListEntryCount();
 
     struct DownloadInfo {
         DownloadInfo() : _errorCount(0), _valid(false) {}
@@ -84,8 +84,8 @@ public:
     void setUploadInfo(const QString &file, const UploadInfo &i);
     bool deleteStaleUploadInfos(const QSet<QString>& keep);
 
-    SyncJournalBlacklistRecord blacklistEntry( const QString& );
-    bool deleteStaleBlacklistEntries(const QSet<QString>& keep);
+    SyncJournalErrorBlacklistRecord errorBlacklistEntry( const QString& );
+    bool deleteStaleErrorBlacklistEntries(const QSet<QString>& keep);
 
     void avoidRenamesOnNextSync(const QString &path);
     void setPollInfo(const PollInfo &);
@@ -121,7 +121,7 @@ public:
 private:
     bool updateDatabaseStructure();
     bool updateMetadataTableStructure();
-    bool updateBlacklistTableStructure();
+    bool updateErrorBlacklistTableStructure();
     bool sqlFail(const QString& log, const SqlQuery &query );
     void commitInternal(const QString &context, bool startTrans = true);
     void startTransaction();
@@ -144,8 +144,8 @@ private:
     QScopedPointer<SqlQuery> _deleteUploadInfoQuery;
     QScopedPointer<SqlQuery> _deleteFileRecordPhash;
     QScopedPointer<SqlQuery> _deleteFileRecordRecursively;
-    QScopedPointer<SqlQuery> _getBlacklistQuery;
-    QScopedPointer<SqlQuery> _setBlacklistQuery;
+    QScopedPointer<SqlQuery> _getErrorBlacklistQuery;
+    QScopedPointer<SqlQuery> _setErrorBlacklistQuery;
 
     /* This is the list of paths we called avoidReadFromDbOnNextSync on.
      * It means that they should not be written to the DB in any case since doing
diff --git a/src/libsync/syncjournalfilerecord.cpp b/src/libsync/syncjournalfilerecord.cpp
index 46adce528..770177233 100644
--- a/src/libsync/syncjournalfilerecord.cpp
+++ b/src/libsync/syncjournalfilerecord.cpp
@@ -95,17 +95,17 @@ static time_t getMaxBlacklistTime()
     return 24*60*60; // 1 day
 }
 
-bool SyncJournalBlacklistRecord::isValid() const
+bool SyncJournalErrorBlacklistRecord::isValid() const
 {
     return ! _file.isEmpty()
         && (!_lastTryEtag.isEmpty() || _lastTryModtime != 0)
         && _lastTryTime > 0 && _ignoreDuration > 0;
 }
 
-SyncJournalBlacklistRecord SyncJournalBlacklistRecord::update(
-        const SyncJournalBlacklistRecord& old, const SyncFileItem& item)
+SyncJournalErrorBlacklistRecord SyncJournalErrorBlacklistRecord::update(
+        const SyncJournalErrorBlacklistRecord& old, const SyncFileItem& item)
 {
-    SyncJournalBlacklistRecord entry;
+    SyncJournalErrorBlacklistRecord entry;
     if (item._httpErrorCode == 0  // Do not blacklist local errors. (#1985)
 #ifdef OWNCLOUD_5XX_NO_BLACKLIST
         || item._httpErrorCode / 100 == 5 // In this configuration, never blacklist error 5xx
diff --git a/src/libsync/syncjournalfilerecord.h b/src/libsync/syncjournalfilerecord.h
index aac9ce0fb..459c6e6fe 100644
--- a/src/libsync/syncjournalfilerecord.h
+++ b/src/libsync/syncjournalfilerecord.h
@@ -48,10 +48,10 @@ bool OWNCLOUDSYNC_EXPORT
 operator==(const SyncJournalFileRecord & lhs,
            const SyncJournalFileRecord & rhs);
 
-class SyncJournalBlacklistRecord
+class SyncJournalErrorBlacklistRecord
 {
 public:
-    SyncJournalBlacklistRecord()
+    SyncJournalErrorBlacklistRecord()
         : _retryCount(0)
         , _lastTryModtime(0)
         , _lastTryTime(0)
@@ -83,8 +83,8 @@ public:
      * If the returned record is invalid, the file shall not be
      * blacklisted.
      */
-    static SyncJournalBlacklistRecord update(
-            const SyncJournalBlacklistRecord& old, const SyncFileItem& item);
+    static SyncJournalErrorBlacklistRecord update(
+            const SyncJournalErrorBlacklistRecord& old, const SyncFileItem& item);
 };
 
 }