diff --git a/picard/acoustid.py b/picard/acoustid.py
index d0ed115af..1339a295c 100644
--- a/picard/acoustid.py
+++ b/picard/acoustid.py
@@ -246,7 +246,7 @@ class AcoustIDClient(QtCore.QObject):
     def analyze(self, file, next):
         fpcalc_next = partial(self._lookup_fingerprint, next, file.filename)
 
-        if not config.setting["ignore_existing_acoustid"]:
+        if not config.setting["ignore_existing_acoustid_fingerprints"]:
             # use cached fingerprint
             fingerprints = file.metadata.getall('acoustid_fingerprint')
             if fingerprints:
diff --git a/picard/ui/options/fingerprinting.py b/picard/ui/options/fingerprinting.py
index 30bc767a8..7e7a47608 100644
--- a/picard/ui/options/fingerprinting.py
+++ b/picard/ui/options/fingerprinting.py
@@ -35,7 +35,7 @@ class FingerprintingOptionsPage(OptionsPage):
     ACTIVE = True
 
     options = [
-        config.BoolOption("setting", "ignore_existing_acoustid", False),
+        config.BoolOption("setting", "ignore_existing_acoustid_fingerprints", False),
         config.TextOption("setting", "fingerprinting_system", "acoustid"),
         config.TextOption("setting", "acoustid_fpcalc", ""),
         config.TextOption("setting", "acoustid_apikey", ""),
@@ -60,7 +60,7 @@ class FingerprintingOptionsPage(OptionsPage):
             self.ui.disable_fingerprinting.setChecked(True)
         self.ui.acoustid_fpcalc.setText(config.setting["acoustid_fpcalc"])
         self.ui.acoustid_apikey.setText(config.setting["acoustid_apikey"])
-        self.ui.ignore_existing_acoustid.setChecked(config.setting["ignore_existing_acoustid"])
+        self.ui.ignore_existing_acoustid_fingerprints.setChecked(config.setting["ignore_existing_acoustid_fingerprints"])
         self.update_groupboxes()
 
     def save(self):
@@ -70,7 +70,7 @@ class FingerprintingOptionsPage(OptionsPage):
             config.setting["fingerprinting_system"] = ""
         config.setting["acoustid_fpcalc"] = unicode(self.ui.acoustid_fpcalc.text())
         config.setting["acoustid_apikey"] = unicode(self.ui.acoustid_apikey.text())
-        config.setting["ignore_existing_acoustid"] = self.ui.ignore_existing_acoustid.isChecked()
+        config.setting["ignore_existing_acoustid_fingerprints"] = self.ui.ignore_existing_acoustid_fingerprints.isChecked()
 
     def update_groupboxes(self):
         if self.ui.use_acoustid.isChecked():
diff --git a/picard/ui/ui_options_fingerprinting.py b/picard/ui/ui_options_fingerprinting.py
index 30bde237f..c9c711d4c 100644
--- a/picard/ui/ui_options_fingerprinting.py
+++ b/picard/ui/ui_options_fingerprinting.py
@@ -41,9 +41,9 @@ class Ui_FingerprintingOptionsPage(object):
         self.acoustid_settings.setObjectName(_fromUtf8("acoustid_settings"))
         self.verticalLayout_2 = QtGui.QVBoxLayout(self.acoustid_settings)
         self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
-        self.ignore_existing_acoustid = QtGui.QCheckBox(self.acoustid_settings)
-        self.ignore_existing_acoustid.setObjectName(_fromUtf8("ignore_existing_acoustid"))
-        self.verticalLayout_2.addWidget(self.ignore_existing_acoustid)
+        self.ignore_existing_acoustid_fingerprints = QtGui.QCheckBox(self.acoustid_settings)
+        self.ignore_existing_acoustid_fingerprints.setObjectName(_fromUtf8("ignore_existing_acoustid_fingerprints"))
+        self.verticalLayout_2.addWidget(self.ignore_existing_acoustid_fingerprints)
         self.label = QtGui.QLabel(self.acoustid_settings)
         self.label.setObjectName(_fromUtf8("label"))
         self.verticalLayout_2.addWidget(self.label)
@@ -87,7 +87,7 @@ class Ui_FingerprintingOptionsPage(object):
         self.disable_fingerprinting.setText(_("Do not use audio fingerprinting"))
         self.use_acoustid.setText(_("Use AcoustID"))
         self.acoustid_settings.setTitle(_("AcoustID Settings"))
-        self.ignore_existing_acoustid.setText(_("Ignore existing AcoustID tags"))
+        self.ignore_existing_acoustid_fingerprints.setText(_("Ignore existing AcoustID fingerprints"))
         self.label.setText(_("Fingerprint calculator:"))
         self.acoustid_fpcalc_browse.setText(_("Browse..."))
         self.acoustid_fpcalc_download.setText(_("Download..."))
diff --git a/ui/options_fingerprinting.ui b/ui/options_fingerprinting.ui
index 1c08714fd..69b78fd74 100644
--- a/ui/options_fingerprinting.ui
+++ b/ui/options_fingerprinting.ui
@@ -44,9 +44,9 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QCheckBox" name="ignore_existing_acoustid">
+       <widget class="QCheckBox" name="ignore_existing_acoustid_fingerprints">
         <property name="text">
-         <string>Ignore existing AcoustID tags</string>
+         <string>Ignore existing AcoustID fingerprints</string>
         </property>
        </widget>
       </item>