3281: More updates of the name Hash set replacing hash database

Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties

@@ -17,10 +17,10 @@ EamSqliteSettingsDialog.bnDatabasePathFileOpen.text=Browse...
 EamSqliteSettingsDialog.tfDatabasePath.toolTipText=Filename and path to store SQLite db file
 EamSqliteSettingsDialog.tfDatabasePath.text=
 EamSqliteSettingsDialog.lbDatabasePath.text=Database Path :
-ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this database
+ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this hash set 
-ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Database Version Number
+ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Hash Set Version Number
-ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this database
+ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this hash set
-ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Database Version Number
+ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Hash Set Version Number
 GlobalSettingsPanel.tbOops.text=
 GlobalSettingsPanel.lbDatabaseSettings.text=Database Settings
 GlobalSettingsPanel.bnImportDatabase.label=Import Hash Set 

Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddContentToHashDbAction.java

@@ -149,7 +149,7 @@ final class AddContentToHashDbAction extends AbstractAction implements Presenter
                 if (null != md5Hash) {
                     // don't let them add the hash for an empty file to the DB
                     if (HashUtility.isNoDataMd5(md5Hash)) { //NON-NLS
-                        Logger.getLogger(AddContentToHashDbAction.class.getName()).log(Level.INFO, "Not adding " + file.getName() + " to database (empty content)"); //NON-NLS
+                        Logger.getLogger(AddContentToHashDbAction.class.getName()).log(Level.INFO, "Not adding " + file.getName() + " to hash set (empty content)"); //NON-NLS
                         JOptionPane.showMessageDialog(null,
                                 NbBundle.getMessage(this.getClass(),
                                         "AddContentToHashDbAction.addFilesToHashSet.unableToAddFileEmptyMsg",

Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties

@@ -1,7 +1,7 @@
 OpenIDE-Module-Display-Category=Ingest Module
 OpenIDE-Module-Long-Description=\
     Hash Set ingest module.  \n\n\
-    The ingest module analyzes files in the disk image and marks them as "known" (based on NSRL database lookup for "known" files) and "bad / interesting" (based on one or more databases supplied by the user).\n\n\
+    The ingest module analyzes files in the disk image and marks them as "known" (based on NSRL hashset lookup for "known" files) and "bad / interesting" (based on one or more hash sets supplied by the user).\n\n\
     The module also contains additional non-ingest tools that are integrated in the GUI, such as file lookup by hash and hash set configuration.
 OpenIDE-Module-Name=HashDatabases
 OptionsCategory_Name_HashDatabase=Hash Sets
@@ -20,7 +20,7 @@ OpenIDE-Module-Short-Description=Hash Set Ingest Module and hash set tools
 HashDbImportDatabaseDialog.jLabel1.text=Name:
 HashDbImportDatabaseDialog.databasePathTextField.text=
 HashDbImportDatabaseDialog.knownBadRadioButton.text=Notable
-HashDbImportDatabaseDialog.jLabel2.text=Type of database\:
+HashDbImportDatabaseDialog.jLabel2.text=Type of hash set\:
 HashDbImportDatabaseDialog.okButton.text=OK
 HashDbImportDatabaseDialog.cancelButton.text=Cancel
 HashDbCreateDatabaseDialog.jLabel2.text=Type:
@@ -34,7 +34,7 @@ HashDbImportDatabaseDialog.knownRadioButton.text=Known (NSRL or other)
 HashDbCreateDatabaseDialog.knownRadioButton.text=Known
 HashDbCreateDatabaseDialog.saveAsButton.text=Save As...
 HashDbCreateDatabaseDialog.hashSetNameTextField.text=
-HashDbImportDatabaseDialog.jLabel3.text=Database Path:
+HashDbImportDatabaseDialog.jLabel3.text=Hash set Path:
 HashDbCreateDatabaseDialog.sendIngestMessagesCheckbox.text=Send ingest inbox messages for each hit
 HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text=Send ingest inbox message for each hit
 HashDbImportDatabaseDialog.hashSetNameTextField.text=
@@ -52,7 +52,7 @@ AddContentToHashDbAction.addFilesToHashSet.unableToAddFileEmptyMsg=Unable to add
 AddContentToHashDbAction.addFilesToHashSet.unableToAddFileSzMsg=Unable to add the {0} to the hash set. Hashes have not been calculated. Please configure and run an appropriate ingest module.
 HashDatabaseOptionsPanelController.moduleErr=Module Error
 HashDatabaseOptionsPanelController.moduleErrMsg=A module caused an error listening to HashDatabaseOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
-HashDbConfigPanel.noSelectionText=No database selected
+HashDbConfigPanel.noSelectionText=
 HashDbConfigPanel.errorGettingPathText=Error occurred getting path
 HashDbConfigPanel.errorGettingIndexStatusText=Error occurred getting status
 HashDbConfigPanel.indexButtonText.index=Index
@@ -62,10 +62,10 @@ HashDbConfigPanel.indexStatusText.indexOnly=Index only
 HashDbConfigPanel.indexStatusText.indexed=Indexed
 HashDbConfigPanel.indexButtonText.reIndex=Re-Index
 HashDbConfigPanel.indexStatusText.noIndex=No index
-HashDbConfigPanel.dbsNotIndexedMsg=The following databases are not indexed, would you like to index them now? \n {0}
+HashDbConfigPanel.dbsNotIndexedMsg=The following hash sets are not indexed, would you like to index them now? \n {0}
-HashDbConfigPanel.dbNotIndexedMsg=The following database is not indexed, would you like to index it now? \n{0}
+HashDbConfigPanel.dbNotIndexedMsg=The following hash set is not indexed, would you like to index it now? \n{0}
-HashDbConfigPanel.unindexedDbsMsg=Unindexed databases
+HashDbConfigPanel.unindexedDbsMsg=Unindexed hash sets
-HashDbConfigPanel.allUnindexedDbsRmFromListMsg=All unindexed databases will be removed from the list
+HashDbConfigPanel.allUnindexedDbsRmFromListMsg=All unindexed hashsets will be removed from the list
 HashDbConfigPanel.nameColLbl=Name
 HashDbConfigPanel.editingCellsNotSupportedMsg=Editing of cells is not supported
 HashDbConfigPanel.deleteDbActionConfirmMsg=This will remove the hash set for all cases. Do you want to proceed?
@@ -78,19 +78,19 @@ HashDbCreateDatabaseDialog.fileNameAlreadyExistsMsg=A file with this name alread
 HashDbCreateDatabaseDialog.fileExistsErr=File Already Exists Error
 HashDbCreateDatabaseDialog.mustEnterHashSetNameMsg=A hash set name must be entered.
 HashDbCreateDatabaseDialog.createHashDbErr=Create Hash Set Error
-HashDbCreateDatabaseDialog.mustEnterHashDbPathMsg=A database path must be entered.
+HashDbCreateDatabaseDialog.mustEnterHashDbPathMsg=A hash set path must be entered.
 HashDbCreateDatabaseDialog.errMsg.hashDbCreationErr=Hash set creation error
 HashDbCreateDatabaseDialog.cannotCreateFileAtLocMsg=Cannot create a hash set file at the selected location.
 HashDbCreateDatabaseDialog.failedToCreateHashDbMsg=Failed to create the hash set.
 HashDbImportDatabaseDialog.importHashDbMsg=Import Hash Set
 HashDbImportDatabaseDialog.fileNameExtFilter.text=Hash Set File
-HashDbImportDatabaseDialog.failedToGetDbPathMsg=Failed to get the path of the selected database.
+HashDbImportDatabaseDialog.failedToGetDbPathMsg=Failed to get the path of the selected hash set.
 HashDbImportDatabaseDialog.importHashDbErr=Import Hash Set Error
 HashDbImportDatabaseDialog.mustSelectHashDbFilePathMsg=A hash set file path must be selected.
 HashDbImportDatabaseDialog.hashDbDoesNotExistMsg=The selected hash set does not exist.
 HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg=Failed to open hash set at {0}.
 HashDbIngestModule.moduleName=Hash Lookup
-HashDbIngestModule.moduleDescription=Identifies known and notable files using supplied hash sets, such as a standard NSRL database.
+HashDbIngestModule.moduleDescription=Identifies known and notable files using supplied hash sets, such as a standard NSRL hash set.
 HashDbIngestModule.fileReadErrorMsg=Read Error\: {0}
 HashDbIngestModule.calcHashValueErr=Error encountered while calculating the hash value for {0}.
 HashDbIngestModule.hashLookupErrorMsg=Hash Lookup Error\: {0}
@@ -104,7 +104,7 @@ HashDbIngestModule.postToBB.knownBadMsg=Notable\: {0}
 HashDbIngestModule.complete.knownBadsFound=Notables found\:
 HashDbIngestModule.complete.totalCalcTime=Total Calculation Time
 HashDbIngestModule.complete.totalLookupTime=Total Lookup Time
-HashDbIngestModule.complete.databasesUsed=Databases Used\:
+HashDbIngestModule.complete.databasesUsed=Hash sets Used\:
 HashDbIngestModule.complete.hashLookupResults=Hash Lookup Results
 HashDbManager.moduleErrorListeningToUpdatesMsg=A module caused an error listening to HashDbManager updates. See log to determine which module. Some data could be incomplete.
 HashDbManager.replacingDuplicateHashsetNameMsg=Duplicate hash set name {0} found.\nReplacing with {1}.
@@ -113,8 +113,8 @@ HashDbManager.unableToOpenHashDbMsg=Unable to open {0} hash set.
 HashDbManager.savedBackupOfOldConfigMsg={0}\nA backup copy of the old configuration has been saved as\n{1}
 HashDbManager.baseMessage.updatedFormatHashDbConfig=The format of the hash set configuration file has been updated.
 HashDbManager.msgBoxTitle.confFileFmtChanged=Configuration File Format Changed
-HashDbManager.dlgMsg.dbNotFoundAtLoc=Database {0} could not be found at location\n{1}\nWould you like to search for the file?
+HashDbManager.dlgMsg.dbNotFoundAtLoc=Hash set {0} could not be found at location\n{1}\nWould you like to search for the file?
-HashDbManager.dlgTitle.MissingDb=Missing Database
+HashDbManager.dlgTitle.MissingDb=Missing Hash set
 HashDbManager.progress.indexingHashSet=Indexing {0}
 HashDbManager.dlgMsg.errorIndexingHashSet=Error indexing {0} hash set.
 HashDbManager.hashDbIndexingErr=Hash Set Indexing Error
@@ -130,14 +130,14 @@ HashDbSearchPanel.errorText.invalidMD5HashMsg=Error\: That is not a valid MD5 ha
 HashDbSearchThread.progress.cancellingSearch={0} (Cancelling...)
 HashDbSearchThread.name.searching=Searching
 HashDbSearchThread.noMoreFilesWithMD5Msg=No other files with the same MD5 hash were found.
-ModalNoButtons.indexingDbsTitle=Indexing databases
+ModalNoButtons.indexingDbsTitle=Indexing hash sets
-ModalNoButtons.indexingDbTitle=Indexing database
+ModalNoButtons.indexingDbTitle=Indexing hash set
 ModalNoButtons.exitHashDbIndexingMsg=You are about to exit out of indexing your hash sets. \n\
 The generated index will be left unusable. If you choose to continue,\n\
  please delete the corresponding -md5.idx file in the hash folder.\n\
                                                 Exit indexing?
 ModalNoButtons.dlgTitle.unfinishedIndexing=Unfinished Indexing
-ModalNoButtons.indexThis.currentlyIndexing1Db=Currently indexing 1 database
+ModalNoButtons.indexThis.currentlyIndexing1Db=Currently indexing 1 hash set 
 ModalNoButtons.indexThese.currentlyIndexing1OfNDbs=Currently indexing 1 of {0}
 ModalNoButtons.propChg.currentlyIndexingXofN=Currently indexing {0} of {1}
 HashDbManager.duplicateHashSetNameExceptionMsg=The hash set name ''{0}'' has already been used for another hash set.
@@ -156,7 +156,7 @@ AddContentToHashDbAction.singleSelectionName=Add file to hash set
 AddContentToHashDbAction.multipleSelectionName=Add files to hash set
 HashDbManager.ingestRunningExceptionMsg=Ingest is ongoing; this service will be unavailable until it finishes.
 HashDbManager.saveErrorExceptionMsg=Error saving hash configuration
-HashLookupSettingsPanel.jButton3.text=Import Database
+HashLookupSettingsPanel.jButton3.text=Import Hash set
 HashLookupSettingsPanel.jLabel6.text=Type:
 HashLookupSettingsPanel.jLabel4.text=Location:
 HashLookupSettingsPanel.jLabel2.text=Name:
@@ -171,15 +171,15 @@ HashLookupModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected setting
 HashLookupModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof HashLookupModuleSettings
 HashLookupModuleSettingsPanel.alwaysCalcHashesCheckbox.toolTipText=Calculate MD5 even if no hash set is selected
 HashDbSearchPanel.hashTable.defaultModel.title.text=MD5 Hashes
-AddHashValuesToDatabaseDialog.JDialog.Title=Add Hashes to Database
+AddHashValuesToDatabaseDialog.JDialog.Title=Add Hashes to Hash set
 AddHashValuesToDatabaseDialog.instructionLabel.text_1=Paste MD5 hash values (one per line) below:
 AddHashValuesToDatabaseDialog.cancelButton.text_2=Cancel
-AddHashValuesToDatabaseDialog.AddValuesToHashDatabaseButton.text_2=Add Hashes to Database
+AddHashValuesToDatabaseDialog.AddValuesToHashDatabaseButton.text_2=Add Hashes to Hash set
 AddHashValuesToDatabaseDialog.pasteFromClipboardButton.text_2=Paste From Clipboard
 AddHashValuesToDatabaseProgressDialog.okButton.text=OK
 AddHashValuesToDatabaseProgressDialog.statusLabel.text=status
-AddHashValuesToDatabaseProgressDialog.title=Add Hashes to Database Progress
+AddHashValuesToDatabaseProgressDialog.title=Add Hashes to Hash set Progress
-AddHashValuesToDatabaseDialog.title=Add Hashes to Database
+AddHashValuesToDatabaseDialog.title=Add Hashes to Hash set
 AddHashValuesToDatabaseProgressDialog.showErrorsButton.text=Show Errors
 AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.parsing=Parsing text for MD5 hashes...
 AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.invalidHash=The input contains invalid hash.
@@ -187,47 +187,47 @@ AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.invaliHash.msg=Inv
 AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.noHashesToAdd=There are no hashes to add.
 AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.success={0} Hashes added successfully.
 AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash=There is an error adding valid hashes.
-AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash.msg=Error adding valid hashes to the database:
+AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash.msg=Error adding valid hashes to the hash set:
 HashLookupSettingsPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
-HashLookupSettingsPanel.addHashesToDatabaseButton.text=Add Hashes to Database
+HashLookupSettingsPanel.addHashesToDatabaseButton.text=Add Hashes to Hash set
-HashLookupSettingsPanel.indexPathLabel.text=No database selected
+HashLookupSettingsPanel.indexPathLabel.text=
 HashLookupSettingsPanel.indexPathLabelLabel.text=Index Path:
 HashLookupSettingsPanel.createDatabaseButton.toolTipText=
-HashLookupSettingsPanel.createDatabaseButton.text=New database
+HashLookupSettingsPanel.createDatabaseButton.text=New hash set
 HashLookupSettingsPanel.optionsLabel.text=Options
 HashLookupSettingsPanel.informationLabel.text=Information
 HashLookupSettingsPanel.sendIngestMessagesCheckBox.text=Send ingest inbox message for each hit
 HashLookupSettingsPanel.indexButton.text=Index
 HashLookupSettingsPanel.indexLabel.text=Index Status:
-HashLookupSettingsPanel.hashDbIndexStatusLabel.text=No database selected
+HashLookupSettingsPanel.hashDbIndexStatusLabel.text=
-HashLookupSettingsPanel.hashDbTypeLabel.text=No database selected
+HashLookupSettingsPanel.hashDbTypeLabel.text=
 HashLookupSettingsPanel.typeLabel.text=Type:
-HashLookupSettingsPanel.locationLabel.text=Database Path:
+HashLookupSettingsPanel.locationLabel.text=Hash set Path:
-HashLookupSettingsPanel.hashDbLocationLabel.text=No database selected
+HashLookupSettingsPanel.hashDbLocationLabel.text=
-HashLookupSettingsPanel.hashDbNameLabel.text=No database selected
+HashLookupSettingsPanel.hashDbNameLabel.text=
 HashLookupSettingsPanel.nameLabel.text=Name:
 HashLookupSettingsPanel.hashDatabasesLabel.text=Hash Sets:
 HashLookupSettingsPanel.importDatabaseButton.toolTipText=
-HashLookupSettingsPanel.importDatabaseButton.text=Import database
+HashLookupSettingsPanel.importDatabaseButton.text=Import hash set
-HashLookupSettingsPanel.deleteDatabaseButton.text=Delete database
+HashLookupSettingsPanel.deleteDatabaseButton.text=Delete hash set
-ImportHashDatabaseDialog.lbFilePath.text=Database Path:
+ImportHashDatabaseDialog.lbFilePath.text=Hash set Path:
-ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this database
+ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this hash set
-ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Database Version Number
+ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Hash set Version Number
-ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this database
+ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this hash set
-ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Database Version Number
+ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Hash set Version Number
 ImportCentralRepoDbProgressDialog.lbProgress.text=Starting import...
 ImportCentralRepoDbProgressDialog.bnOk.text=OK
 ImportCentralRepoDbProgressDialog.bnCancel.text=Cancel
 HashLookupSettingsPanel.versionLabel.text_1=Version:
-HashLookupSettingsPanel.hashDbVersionLabel.text_1=No database selected
+HashLookupSettingsPanel.hashDbVersionLabel.text_1=
 HashLookupSettingsPanel.orgLabel.text_1=Organization:
-HashLookupSettingsPanel.hashDbOrgLabel.text_1=No database selected
+HashLookupSettingsPanel.hashDbOrgLabel.text_1=
 HashLookupSettingsPanel.readOnlyLabel.text_1=Read only:
-HashLookupSettingsPanel.hashDbReadOnlyLabel.text_1=No database selected
+HashLookupSettingsPanel.hashDbReadOnlyLabel.text_1=
 ImportCentralRepoDbProgressDialog.jLabel1.text=Importing hash set into the central repository
 HashDbImportDatabaseDialog.lbVersion.text=Version:
 HashDbImportDatabaseDialog.lbOrg.text=Source Organization:
-HashDbImportDatabaseDialog.readOnlyCheckbox.text=Make database read-only
+HashDbImportDatabaseDialog.readOnlyCheckbox.text=Make hash set read-only
 HashDbImportDatabaseDialog.orgButton.text=Manage Organizations
 HashDbImportDatabaseDialog.versionTextField.text=1.0
 HashDbImportDatabaseDialog.fileTypeRadioButton.text=Local
@@ -238,4 +238,4 @@ HashDbCreateDatabaseDialog.fileTypeRadioButton.text=Local
 HashDbCreateDatabaseDialog.centralRepoRadioButton.text=Remote (Central Repository)
 HashDbCreateDatabaseDialog.lbOrg.text=Source Organization:
 HashDbCreateDatabaseDialog.orgButton.text=Manage Organizations
-HashDbCreateDatabaseDialog.databasePathLabel.text=Database Path:
+HashDbCreateDatabaseDialog.databasePathLabel.text=Hash set Path:

Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java

@@ -420,7 +420,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
                 }
                 ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, LAST_FILE_PATH_KEY, databaseFile.getParent());
             } catch (IOException ex) {
-                Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.SEVERE, "Failed to get path of selected database", ex); //NON-NLS
+                Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.SEVERE, "Failed to get path of selected hash set", ex); //NON-NLS
                 JOptionPane.showMessageDialog(this,
                         NbBundle.getMessage(this.getClass(),
                                 "HashDbImportDatabaseDialog.failedToGetDbPathMsg"));

Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java

@@ -276,14 +276,14 @@ public class HashDbManager implements PropertyChangeListener {
             boolean readOnly) throws TskCoreException{
         
         if(! EamDb.isEnabled()){
-            throw new TskCoreException("Could not load central repository database " + hashSetName + " - central repository is not enabled");
+            throw new TskCoreException("Could not load central repository hash set " + hashSetName + " - central repository is not enabled");
         }
         
         CentralRepoHashSet db = new CentralRepoHashSet(hashSetName, version, referenceSetID, searchDuringIngest,
             sendIngestMessages, knownFilesType, readOnly);
         
         if(! db.isValid()){
-            throw new TskCoreException("Error finding database " + hashSetName + " in central repository");
+            throw new TskCoreException("Error finding hash set " + hashSetName + " in central repository");
         }
         
         // Add the hash database to the collection
@@ -363,7 +363,7 @@ public class HashDbManager implements PropertyChangeListener {
                     hashSetPaths.remove(hashDatabase.getIndexPath());
                 }
             } catch (TskCoreException ex) {
-                Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting index path of " + hashDatabase.getHashSetName() + " hash set when removing the database", ex); //NON-NLS
+                Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting index path of " + hashDatabase.getHashSetName() + " hash set when removing the hash set", ex); //NON-NLS
             }        
 
             try {
@@ -371,13 +371,13 @@ public class HashDbManager implements PropertyChangeListener {
                     hashSetPaths.remove(hashDatabase.getDatabasePath());
                 }
             } catch (TskCoreException ex) {
-                Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting database path of " + hashDatabase.getHashSetName() + " hash set when removing the database", ex); //NON-NLS
+                Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting hash set path of " + hashDatabase.getHashSetName() + " hash set when removing the hash set", ex); //NON-NLS
             }
         
             try {
                 hashDatabase.close();
             } catch (TskCoreException ex) {
-                Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + hashDb.getHashSetName() + " hash set when removing the database", ex); //NON-NLS
+                Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + hashDb.getHashSetName() + " hash set when removing the hash set", ex); //NON-NLS
             }
         }
 
@@ -554,7 +554,7 @@ public class HashDbManager implements PropertyChangeListener {
      *
      * @param settings The settings to configure.
      */
-    @Messages({"# {0} - database name", "HashDbManager.noDbPath.message=Couldn't get valid database path for: {0}",
+    @Messages({"# {0} - hash set name", "HashDbManager.noDbPath.message=Couldn't get valid hash set path for: {0}",
             "HashDbManager.centralRepoLoadError.message=Error loading central repository hash sets"})
     private void configureSettings(HashLookupSettings settings) {
         allDatabasesLoadedCorrectly = true;

Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java

@@ -80,7 +80,7 @@ final class HashLookupSettings implements Serializable {
             try{
                 dbInfoList.add(new HashDbInfo(db));
             } catch (TskCoreException ex){
-                logger.log(Level.SEVERE, "Could not load database settings for {0}", db.getHashSetName());
+                logger.log(Level.SEVERE, "Could not load hash set settings for {0}", db.getHashSetName());
             }
         }
         return dbInfoList;

Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java

@@ -175,7 +175,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
         try {
             addHashesToDatabaseButton.setEnabled(!ingestIsRunning && db.isUpdateable());
         } catch (TskCoreException ex) {
-            Logger.getLogger(HashLookupSettingsPanel.class.getName()).log(Level.SEVERE, "Error identifying if the database is updateable.", ex); //NON-NLS
+            Logger.getLogger(HashLookupSettingsPanel.class.getName()).log(Level.SEVERE, "Error identifying if the hash set is updateable.", ex); //NON-NLS
             addHashesToDatabaseButton.setEnabled(false);
         }
 
@@ -192,7 +192,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
             try {
                 hashDbLocationLabel.setText(shortenPath(db.getDatabasePath()));
             } catch (TskCoreException ex) {
-                Logger.getLogger(HashLookupSettingsPanel.class.getName()).log(Level.SEVERE, "Error getting database path of " + db.getHashSetName() + " hash set", ex); //NON-NLS
+                Logger.getLogger(HashLookupSettingsPanel.class.getName()).log(Level.SEVERE, "Error getting hash set path of " + db.getHashSetName() + " hash set", ex); //NON-NLS
                 hashDbLocationLabel.setText(ERROR_GETTING_PATH_TEXT);
             }
 

Core/src/org/sleuthkit/autopsy/modules/hashdatabase/KdbHashSetParser.java

@@ -64,7 +64,7 @@ public class KdbHashSetParser implements HashSetParser {
                 totalHashes = resultSet.getLong("count");
             } else {
                 close();
-                throw new TskCoreException("Error getting hash count from database " + filename);
+                throw new TskCoreException("Error getting hash count from hash set " + filename);
             }
 
             // Get the hashes
@@ -72,7 +72,7 @@ public class KdbHashSetParser implements HashSetParser {
 
             // At this point, getNextHash can read each hash from the result set
         } catch (ClassNotFoundException | SQLException ex) {
-            throw new TskCoreException("Error opening/reading database " + filename, ex);
+            throw new TskCoreException("Error opening/reading hash set " + filename, ex);
         }
 
     }
@@ -101,10 +101,10 @@ public class KdbHashSetParser implements HashSetParser {
                 totalHashesRead++;
                 return sb.toString();
             } else {
-                throw new TskCoreException("Could not read expected number of hashes from database " + filename);
+                throw new TskCoreException("Could not read expected number of hashes from hash set " + filename);
             }
         } catch (SQLException ex) {
-            throw new TskCoreException("Error reading hash from result set for database " + filename, ex);
+            throw new TskCoreException("Error reading hash from result set for hash set " + filename, ex);
         }
     }