diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
index 3cbd8996e48b6bc0736285f5257f8e8a4f35af12..df63e98d2e1d8443a51f2fa45a72ae31a33b9d5c 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
@@ -44,8 +44,8 @@ FilesSetRulePanel.mimeCheck.text=MIME Type:
 FilesSetRulePanel.fileSizeCheck.text=File Size:
 FilesSetRulePanel.filesRadioButton.text=Files
 FilesSetRulePanel.dirsRadioButton.text=Directories
-FilesSetDefsPanel.interesting.setsListLabel.text=Rule Sets
-FilesSetDefsPanel.ingest.setsListLabel.text=File Ingest Filters
+FilesSetDefsPanel.interesting.setsListLabel.text=Rule Sets:
+FilesSetDefsPanel.ingest.setsListLabel.text=File Ingest Filters:
 FilesSetDefsPanel.interesting.jTextArea1.text=This module allows you to find files that match specified criteria. Each set has a list of rules, which will match on their chosen file characteristics. A file need only match one rule to be found.
 FilesSetDefsPanel.ingest.jTextArea1.text=Add rules so that only a subset of the files in a data source are analyzed. Rules are organized into sets and only one set can be used at a time. A file need only match one rule to be analyzed.
 FilesSetDefsPanel.interesting.editSetButton.text=Edit Set
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index 408ac811c8162b182f5d9d662c3a38889c5e2df4..e784e4888a6ba0106e1650eb1aea3519af38103e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -20,9 +20,9 @@ ExtractedContentPanel.copyMenuItem.text=Copy
 ExtractedContentPanel.selectAllMenuItem.text=Select All
 KeywordSearchEditListPanel.saveListButton.text=Copy List
 KeywordSearchEditListPanel.addWordField.text=
-KeywordSearchEditListPanel.addWordButton.text=New keyword
+KeywordSearchEditListPanel.addWordButton.text=New Keyword
 KeywordSearchEditListPanel.chRegex.text=Regular Expression
-KeywordSearchEditListPanel.deleteWordButton.text=Delete keywords
+KeywordSearchEditListPanel.deleteWordButton.text=Delete Keywords
 KeywordSearchEditListPanel.cutMenuItem.text=Cut
 KeywordSearchEditListPanel.selectAllMenuItem.text=Select All
 KeywordSearchEditListPanel.pasteMenuItem.text=Paste
@@ -46,7 +46,7 @@ ExtractedContentPanel.pageCurLabel.text=-
 ExtractedContentPanel.pageTotalLabel.text=-
 ExtractedContentPanel.hitLabel.toolTipText=
 KeywordSearchEditListPanel.ingestMessagesCheckbox.text=Send ingest inbox messages for each hit
-KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=Send messages during ingest when hits on keyword from this list occur
+KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=Send messages during ingest when hits on keywords from this list occur
 KeywordSearchEditListPanel.keywordOptionsLabel.text=Keyword Options
 KeywordSearchEditListPanel.listOptionsLabel.text=List Options
 KeywordSearchListsManagementPanel.keywordListsLabel.text=Keyword Lists:
@@ -79,7 +79,7 @@ KeywordSearchConfigurationPanel.customizeComponents.genTabTitle=General
 KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip=List configuration
 KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip=String extraction configuration for Keyword Search Ingest
 KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip=General configuration
-KeywordSearchConfigurationPanel1.customizeComponents.title=Delete a keyword list
+KeywordSearchConfigurationPanel1.customizeComponents.title=Delete a Keyword List
 KeywordSearchConfigurationPanel1.customizeComponents.body=This will delete the keyword list globally (for all Cases). Do you want to proceed with the deletion?
 KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr=Keyword List is empty and cannot be saved
 KeywordSearch.newKwListTitle=New keyword list name\:
@@ -99,12 +99,12 @@ KeywordSearchEditListPanel.addWordButtonAction.kwAlreadyExistsMsg=Keyword alread
 KeywordSearchEditListPanel.invalidKwMsg=Invalid keyword pattern.  Use words or a correct regex pattern.
 KeywordSearchEditListPanel.removeKwMsg=Removing a keyword
 KeywordSearchEditListPanel.deleteWordButtonActionPerformed.delConfirmMsg=This will remove a keyword from the list globally (for all Cases). Do you want to proceed?
-KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=Keyword List XML file
+KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=Keyword List XML Files
 KeywordSearchEditListPanel.exportButtonActionPerformed.fileExistPrompt=File {0} exists, overwrite?
 KeywordSearchEditListPanel.exportButtonActionPerformed.kwListExportedMsg=Keyword lists exported
 KeywordSearchEditListPanel.kwColName=Keyword
 KeywordSearchEditListPanel.addKeyword.message=Add a new word to the keyword search list\:
-KeywordSearchEditListPanel.addKeyword.title=New keyword
+KeywordSearchEditListPanel.addKeyword.title=New Keyword
 KeywordSearchFilterNode.getFileActions.openExternViewActLbl=Open in External Viewer
 KeywordSearchFilterNode.getFileActions.searchSameMd5=Search for files with the same MD5 hash
 KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=View in New Window
@@ -273,8 +273,8 @@ KeywordSearchListsAbstract.saveList.errMsg2.msg=A module caused an error listeni
 KeywordSearchListsAbstract.writeLists.errMsg1.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
 KeywordSearchListsAbstract.writeLists.errMsg2.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
 KeywordSearchListsAbstract.deleteList.errMsg1.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchListsManagementPanel.newKeywordListDescription=Keyword List <{0}> already exists as a read-only list. Do you want to replace it for the duration of the program (the change will not be persistent).
-KeywordSearchListsManagementPanel.newKeywordListDescription2=Keyword List <{0}> already exists, do you want to replace it?
+KeywordSearchListsManagementPanel.newKeywordListDescription=Keyword list <{0}> already exists as a read-only list. Do you want to replace it for the duration of the program (the change will not be persistent).
+KeywordSearchListsManagementPanel.newKeywordListDescription2=Keyword list <{0}> already exists, do you want to replace it?
 KeywordSearchModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof KeywordSearchJobSettings
 KeywordSearchModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof KeywordSearchJobSettings
 SearchRunner.Searcher.done.err.msg=Error performing keyword search
@@ -300,9 +300,9 @@ AddKeywordsDialog.enterKeywordsLabel.text=Enter keywords (one per line) below:
 AddKeywordsDialog.pasteButton.text=Paste From Clipboard
 AddKeywordsDialog.addButton.text=OK
 AddKeywordsDialog.cancelButton.text=Cancel
-AddKeywordsDialog.addKeywordsTitle.text=New keywords
-GlobalEditListPanel.newKeywordsButton.text=New keywords
-GlobalEditListPanel.addKeywordResults.text=Add keyword results
+AddKeywordsDialog.addKeywordsTitle.text=New Keywords
+GlobalEditListPanel.newKeywordsButton.text=New Keywords
+GlobalEditListPanel.addKeywordResults.text=Add Keyword Results
 GlobalEditListPanel.keywordsAdded.text={0} keyword was successfully added.
 GlobalEditListPanel.keywordsAddedPlural.text={0} keywords were successfully added.
 GlobalEditListPanel.keywordDupesSkipped.text={0} keyword was already in the list.
@@ -312,8 +312,8 @@ GlobalEditListPanel.keywordErrorsPlural.text={0} keywords could not be parsed. P
 GlobalListsManagementPanel.exportButton.text=Export List
 GlobalListsManagementPanel.deleteListButton.text=Delete List
 GlobalListsManagementPanel.copyListButton.text=Copy List
-GlobalListsManagementPanel.renameListButton.text=Rename List
-GlobalEditListPanel.editWordButton.text=Edit keyword
+GlobalListsManagementPanel.renameListButton.text=Edit List
+GlobalEditListPanel.editWordButton.text=Edit Keyword
 SolrSearchService.ServiceName=Solr Keyword Search Service
 SolrSearchService.IndexUpgradeDialog.title=Text Index Upgrade Required In Order To Open Case
 SolrSearchService.IndexUpgradeDialog.msg=<html>The text index upgrade can take some time. <br />When completed, you will be able to see existing keyword search results and perform literal keyword searches,<br />but you will not be able to add new text to the index or perform regex searches. You may instead open the case<br /> with your previous version of this application. Do you wish to proceed with the index upgrade?</html>