renamed package to have plural 'Artifact(s)' in the name. updated resource bundle keys, message, and other fields to use the plural form.

Experimental/manifest.mf

@@ -4,4 +4,4 @@ OpenIDE-Module: org.sleuthkit.autopsy.experimental
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/experimental/autoingest/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
-OpenIDE-Module-Install: org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.class
+OpenIDE-Module-Install: org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/Installer.class

Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java

@@ -79,7 +79,7 @@ public class SharedConfiguration {
     private static final String HASHDB_CONFIG_FILE_NAME = "hashLookup.settings"; //NON-NLS
     private static final String HASHDB_CONFIG_FILE_NAME_LEGACY = "hashsets.xml"; //NON-NLS
     public static final String FILE_EXPORTER_SETTINGS_FILE = "fileexporter.settings"; //NON-NLS
-    private static final String ENTERPRISE_ARTIFACTS_MANAGER_PROPERTIES_FILE = "EnterpriseArtifactManager.properties"; //NON-NLS
+    private static final String ENTERPRISE_ARTIFACTS_MANAGER_PROPERTIES_FILE = "EnterpriseArtifactsManager.properties"; //NON-NLS
     private static final String SHARED_CONFIG_VERSIONS = "SharedConfigVersions.txt"; //NON-NLS
 
     // Folders

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/Bundle.properties

@@ -1 +0,0 @@
-OpenIDE-Module-Name=Enterprise Artifact Manager

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/Bundle.properties

@@ -0,0 +1 @@
+OpenIDE-Module-Name=Enterprise Artifacts Manager

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamCaseEditDetailsPanel.form

@@ -60,14 +60,14 @@
     <Component class="javax.swing.JButton" name="bnClose">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.bnClose.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.bnClose.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="bnApply">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.bnApply.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.bnApply.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -79,7 +79,7 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
             <TitledBorder title="Case Metadata">
-              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.pnCaseMetadata.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.pnCaseMetadata.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
               <Font PropertyName="font" name="Tahoma" size="12" style="0"/>
             </TitledBorder>
           </Border>
@@ -139,56 +139,56 @@
         <Component class="javax.swing.JLabel" name="lbCaseNameLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbCreationDateLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCreationDateLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCreationDateLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbCaseNumberLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseNumberLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseNumberLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbCaseUUIDLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseUUIDLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseUUIDLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbCaseUUIDText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseUUIDText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseUUIDText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbCaseNameText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseNameText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseNameText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbCeationDateText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCeationDateText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCeationDateText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbCaseNumberText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseNumberText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbCaseNumberText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -198,8 +198,8 @@
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="Organization Details">
+            <TitledBorder title="Organization">
-              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.pnOrganization.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.pnOrganization.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
               <Font PropertyName="font" name="Tahoma" size="12" style="0"/>
             </TitledBorder>
           </Border>
@@ -282,7 +282,7 @@
         <Component class="javax.swing.JLabel" name="lbOrganizationNameLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbOrganizationNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbOrganizationNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -307,56 +307,56 @@
         <Component class="javax.swing.JLabel" name="lbPointOfContactGroupLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactGroupLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactGroupLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbPointOfContactNameLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbPointOfContactEmailLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactEmailLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactEmailLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbPointOfContactPhoneLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactPhoneLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactPhoneLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbPointOfContactNameText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactNameText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactNameText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbPointOfContactEmailText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactEmailText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactEmailText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbPointOfContactPhoneText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactPhoneText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbPointOfContactPhoneText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JButton" name="bnNewOrganization">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.bnNewOrganization.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.bnNewOrganization.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -369,8 +369,8 @@
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="Examiner Details">
+            <TitledBorder title="Examiner">
-              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.pnExaminer.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.pnExaminer.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
               <Font PropertyName="font" name="Tahoma" size="12" style="0"/>
             </TitledBorder>
           </Border>
@@ -441,49 +441,49 @@
         <Component class="javax.swing.JLabel" name="lbExaminerNameLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbExaminerNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbExaminerNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JTextField" name="tfExaminerNameText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.tfExaminerNameText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.tfExaminerNameText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbExaminerEmailLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbExaminerEmailLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbExaminerEmailLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JTextField" name="tfExaminerEmailText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.tfExaminerEmailText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.tfExaminerEmailText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbExaminerPhoneLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbExaminerPhoneLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbExaminerPhoneLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JTextField" name="tfExaminerPhoneText">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.tfExaminerPhoneText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.tfExaminerPhoneText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="lbNotesLabel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbNotesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.lbNotesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -499,7 +499,7 @@
                 <Property name="columns" type="int" value="20"/>
                 <Property name="rows" type="int" value="5"/>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.taNotesText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties" key="EamCaseEditDetailsPanel.taNotesText.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamCaseEditDetailsPanel.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.actions;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.actions;
 
 import java.awt.Cursor;
 import java.awt.event.ActionListener;
@@ -31,14 +31,14 @@ import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel.AddNewOrganizationDialog;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel.AddNewOrganizationDialog;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
- * Handle editing details of cases within the Enterprise Artifact Manager
+ * Handle editing details of cases within the Enterprise Artifacts Manager
  */
 public class EamCaseEditDetailsPanel extends JPanel {
 
@@ -53,7 +53,7 @@ public class EamCaseEditDetailsPanel extends JPanel {
     private List<EamOrganization> orgs = null;
 
     /**
-     * Creates new form EnterpriseArtifactManagerCasedEditDetailsForm
+     * Creates new form EnterpriseArtifactsManagerCasedEditDetailsForm
      */
     public EamCaseEditDetailsPanel(EamCase eamCase) {
         this.eamCase = eamCase;
@@ -410,7 +410,7 @@ public class EamCaseEditDetailsPanel extends JPanel {
     private void bnApplyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnApplyActionPerformed
         // write content to db
         if (contentChanged) {
-            updateEnterpriseArtifactManagerCase();
+            updateEnterpriseArtifactsManagerCase();
             updateDb();
             contentChanged = false;
         }
@@ -504,7 +504,7 @@ public class EamCaseEditDetailsPanel extends JPanel {
      * Save changed value from text fields and text areas into the EamCase
      * object.
      */
-    private void updateEnterpriseArtifactManagerCase() {
+    private void updateEnterpriseArtifactsManagerCase() {
         eamCase.setOrg(selectedOrg);
         eamCase.setExaminerName(tfExaminerNameText.getText());
         eamCase.setExaminerEmail(tfExaminerEmailText.getText());
@@ -516,14 +516,14 @@ public class EamCaseEditDetailsPanel extends JPanel {
         setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 
         if (!dbManager.isEnabled()) {
-            LOGGER.log(Level.SEVERE, "Enteprise artifact manager database not enabled"); // NON-NLS
+            LOGGER.log(Level.SEVERE, "Enteprise artifacts manager database not enabled"); // NON-NLS
             return;
         }
 
         try {
             dbManager.updateCase(eamCase);
         } catch (IllegalArgumentException | EamDbException ex) {
-            LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database", ex); // NON-NLS
+            LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database", ex); // NON-NLS
         } finally {
             setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         }

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamEditCaseInfoAction.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.actions;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.actions;
 
 import java.awt.Dimension;
 import java.awt.HeadlessException;
@@ -39,23 +39,23 @@ import org.openide.util.actions.CallableSystemAction;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
- * Action to update case details in enterprise artifact manager database
+ * Action to update case details in enterprise artifacts manager database
  */
 @ActionID(
         category = "Case",
-        id = "org.sleuthkit.enterpriseartifactmanager.actions.EnterpriseArtifactManagerCaseEditCaseInfoAction"
+        id = "org.sleuthkit.enterpriseartifactsmanager.actions.EnterpriseArtifactsManagerCaseEditCaseInfoAction"
 )
 @ActionRegistration(
-        displayName = "#CTL_EnterpriseArtifactManagerCaseEditCaseInfo",
+        displayName = "#CTL_EnterpriseArtifactsManagerCaseEditCaseInfo",
         lazy = false
 )
 @ActionReference(path = "Menu/Case", position = 650, separatorAfter = 824)
-@Messages("CTL_EnterpriseArtifactManagerCaseEditCaseInfo=Enterprise Artifact Manager Case Details")
+@Messages("CTL_EnterpriseArtifactsManagerCaseEditCaseInfo=Enterprise Artifacts Manager Case Details")
 public final class EamEditCaseInfoAction extends CallableSystemAction implements ActionListener {
 
     private final static Logger LOGGER = Logger.getLogger(EamEditCaseInfoAction.class.getName());
@@ -63,7 +63,7 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements
     private static JDialog popUpWindow;
 
     EamEditCaseInfoAction() {
-        putValue(Action.NAME, Bundle.CTL_EnterpriseArtifactManagerCaseEditCaseInfo()); // put the action Name
+        putValue(Action.NAME, Bundle.CTL_EnterpriseArtifactsManagerCaseEditCaseInfo()); // put the action Name
         this.setEnabled(true);
         Case.addEventSubscriber(Case.Events.CURRENT_CASE.toString(), new PropertyChangeListener() {
             @Override
@@ -75,7 +75,7 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements
 
     @Override
     public boolean isEnabled() {
-        boolean enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")); // NON-NLS
+        boolean enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")); // NON-NLS
         return enabled && Case.isCaseOpen();
     }
 
@@ -85,14 +85,14 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements
     }
 
     @Override
-    @Messages({"EnterpriseArtifactManagerCaseEditDetails.window.title=Edit Case Details"})
+    @Messages({"EnterpriseArtifactsManagerCaseEditDetails.window.title=Edit Case Details"})
     public void performAction() {
 
         if (popUpWindow == null) {
             String curCaseUUID = Case.getCurrentCase().getName();
 
             // create the popUp window for it
-            String title = Bundle.EnterpriseArtifactManagerCaseEditDetails_window_title();
+            String title = Bundle.EnterpriseArtifactsManagerCaseEditDetails_window_title();
             popUpWindow = new JDialog((JFrame) WindowManager.getDefault().getMainWindow(), title, false);
             try {
                 // query case details
@@ -115,9 +115,9 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements
 
                 popUpWindow.setVisible(true);
             } catch (HeadlessException ex) {
-                LOGGER.log(Level.WARNING, "Error displaying Enterprise Artifact Manager Case Properties window.", ex); //NON-NLS
+                LOGGER.log(Level.WARNING, "Error displaying Enterprise Artifacts Manager Case Properties window.", ex); //NON-NLS
             } catch (EamDbException ex) {
-                LOGGER.log(Level.WARNING, "Error connecting to Enterprise Artifact Manager databaes.", ex); // NON-NLS
+                LOGGER.log(Level.WARNING, "Error connecting to Enterprise Artifacts Manager databaes.", ex); // NON-NLS
             }
         }
         popUpWindow.setVisible(true);
@@ -127,7 +127,7 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements
 
     @Override
     public String getName() {
-        return Bundle.CTL_EnterpriseArtifactManagerCaseEditCaseInfo();
+        return Bundle.CTL_EnterpriseArtifactsManagerCaseEditCaseInfo();
     }
 
     @Override

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.form

@@ -11,28 +11,28 @@
         <MenuItem class="javax.swing.JMenuItem" name="selectAllMenuItem">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.selectAllMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.selectAllMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </MenuItem>
         <MenuItem class="javax.swing.JMenuItem" name="exportToCSVMenuItem">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.exportToCSVMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.exportToCSVMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </MenuItem>
         <MenuItem class="javax.swing.JMenuItem" name="showCaseDetailsMenuItem">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.showCaseDetailsMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.showCaseDetailsMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </MenuItem>
         <MenuItem class="javax.swing.JMenuItem" name="showCommonalityMenuItem">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.showCommonalityMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.showCommonalityMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </MenuItem>
@@ -122,7 +122,7 @@
                       <Connection code="tableModel" type="code"/>
                     </Property>
                     <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.table.toolTip.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/Bundle.properties" key="DataContentViewerOtherCases.table.toolTip.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                     <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
                       <TableColumnModel selectionModel="0"/>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.contentviewer;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.contentviewer;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -47,12 +47,13 @@ import org.openide.util.NbBundle.Messages;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.contentviewer.Bundle;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactUtil;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactUtil;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamGlobalFileInstance;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamGlobalFileInstance;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifactTag;
@@ -60,7 +61,7 @@ import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
  * View correlation results from other cases
@@ -358,12 +359,12 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D
 
     /**
      * Scan a Node for blackboard artifacts / content that we can correlate on
-     * and create the corresponding enterprise artifact manager artifacts for
+     * and create the corresponding enterprise artifacts manager artifacts for
      * display
      *
      * @param node The node to view
      *
-     * @return A collection of enterprise artifact manager artifacts to display
+     * @return A collection of enterprise artifacts manager artifacts to display
      */
     private Collection<EamArtifact> getArtifactsFromCorrelatableAttributes(Node node) {
         Collection<EamArtifact> ret = new ArrayList<>();
@@ -446,7 +447,7 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D
 
     /**
      * Query the db for artifact instances from other cases correlated to the
-     * given enterprise artifact manager artifact.
+     * given enterprise artifacts manager artifact.
      *
      * @param eamArtifact The artifact to correlate against
      *
@@ -471,11 +472,11 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D
 
     /**
      * Get the Global File Instances matching the given eamArtifact and convert
-     * them to Enterprise Artifact Manager Artifact Instancess.
+     * them to Enterprise Artifacts Manager Artifact Instancess.
      *
      * @param eamArtifact Artifact to use for ArtifactTypeEnum matching
      *
-     * @return List of Enterprise Artifact Manager Artifact Instances, empty
+     * @return List of Enterprise Artifacts Manager Artifact Instances, empty
      *         list if none found
      */
     public Collection<EamArtifactInstance> getGlobalFileInstancesAsArtifactInstances(EamArtifact eamArtifact) {
@@ -513,7 +514,7 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D
     }
 
     @Override
-    @Messages({"DataContentViewerOtherCases.table.nodbconnection=Cannot connect to enterprise artifact manager database."})
+    @Messages({"DataContentViewerOtherCases.table.nodbconnection=Cannot connect to enterprise artifacts manager database."})
     public void setNode(Node node) {
         EamDb dbManager = EamDb.getInstance();
         if (!dbManager.isEnabled()) {

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableCellRenderer.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.contentviewer;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.contentviewer;
 
 import java.awt.Color;
 import java.awt.Component;

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.contentviewer;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.contentviewer;
 
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.table.AbstractTableModel;
 import org.openide.util.NbBundle.Messages;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance;
 
 /**
  * Model for cells in data content viewer table
@@ -34,8 +34,8 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
         "DataContentViewerOtherCasesTableModel.device=Device",
         "DataContentViewerOtherCasesTableModel.dataSource=Data Source",
         "DataContentViewerOtherCasesTableModel.path=Path",
-        "DataContentViewerOtherCasesTableModel.type=Correlation Type",
+        "DataContentViewerOtherCasesTableModel.type=Artifact Type",
-        "DataContentViewerOtherCasesTableModel.value=Correlation Value",
+        "DataContentViewerOtherCasesTableModel.value=Artifact Value",
         "DataContentViewerOtherCasesTableModel.scope=Scope", // was globalStatus
         "DataContentViewerOtherCasesTableModel.known=Known", // was knownStatus
         "DataContentViewerOtherCasesTableModel.comment=Comment",
@@ -169,9 +169,9 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
     }
 
     /**
-     * Add one local Enterprise Artifact Manager Artifact to the table.
+     * Add one local Enterprise Artifacts Manager Artifact to the table.
      *
-     * @param eamArtifact Enterprise Artifact Manager Artifact to add to the
+     * @param eamArtifact Enterprise Artifacts Manager Artifact to add to the
      *                   table
      */
     public void addEnterpriseArtifactManagerArtifact(EamArtifact eamArtifact) {

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifact.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifactInstance.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.io.Serializable;
 import org.openide.util.NbBundle.Messages;
@@ -26,16 +26,16 @@ import org.openide.util.NbBundle.Messages;
  * Used to store info about a specific Artifact Instance.
  *
  */
-@Messages({"enterpriseartifactmanagerartifactinstances.globalStatus.local=Local",
+@Messages({"EnterpriseArtifactsManagerArtifactInstances.globalStatus.local=Local",
-    "enterpriseartifactmanagerartifactinstances.globalStatus.global=Global",
+    "EnterpriseArtifactsManagerArtifactInstances.globalStatus.global=Global",
-    "enterpriseartifactmanagerartifactinstances.knownStatus.bad=Bad",
+    "EnterpriseArtifactsManagerArtifactInstances.knownStatus.bad=Bad",
-    "enterpriseartifactmanagerartifactinstances.knownStatus.known=Known",
+    "EnterpriseArtifactsManagerArtifactInstances.knownStatus.known=Known",
-    "enterpriseartifactmanagerartifactinstances.knownStatus.unknown=Unknown"})
+    "EnterpriseArtifactsManagerArtifactInstances.knownStatus.unknown=Unknown"})
 public class EamArtifactInstance implements Serializable {
 
     public enum GlobalStatus {
-        LOCAL(Bundle.enterpriseartifactmanagerartifactinstances_globalStatus_local()),
+        LOCAL(Bundle.EnterpriseArtifactsManagerArtifactInstances_globalStatus_local()),
-        GLOBAL(Bundle.enterpriseartifactmanagerartifactinstances_globalStatus_global());
+        GLOBAL(Bundle.EnterpriseArtifactsManagerArtifactInstances_globalStatus_global());
 
         private final String globalStatus;
 
@@ -50,9 +50,9 @@ public class EamArtifactInstance implements Serializable {
     }
 
     public enum KnownStatus {
-        UNKNOWN(Bundle.enterpriseartifactmanagerartifactinstances_knownStatus_unknown()),
+        UNKNOWN(Bundle.EnterpriseArtifactsManagerArtifactInstances_knownStatus_unknown()),
-        KNOWN(Bundle.enterpriseartifactmanagerartifactinstances_knownStatus_known()),
+        KNOWN(Bundle.EnterpriseArtifactsManagerArtifactInstances_knownStatus_known()),
-        BAD(Bundle.enterpriseartifactmanagerartifactinstances_knownStatus_bad());
+        BAD(Bundle.EnterpriseArtifactsManagerArtifactInstances_knownStatus_bad());
 
         private final String knownStatus;
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifactUtil.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.util.List;
 import java.util.logging.Level;
@@ -40,9 +40,9 @@ public class EamArtifactUtil {
     public EamArtifactUtil() {
     }
 
-    @Messages({"enterpriseartifactmanagerartifact.emailaddresses.text=Email Addresses"})
+    @Messages({"enterpriseartifactsmanagerartifact.emailaddresses.text=Email Addresses"})
     public static String getEmailAddressAttrString() {
-        return Bundle.enterpriseartifactmanagerartifact_emailaddresses_text();
+        return Bundle.enterpriseartifactsmanagerartifact_emailaddresses_text();
     }
 
     /*
@@ -104,7 +104,7 @@ public class EamArtifactUtil {
     /**
      * Convert a blackboard artifact to an EamArtifact
      *
-     * @param aType      The enterprise artifact manager artifact type to create
+     * @param aType      The enterprise artifacts manager artifact type to create
      * @param bbArtifact The blackboard artifact to convert
      *
      * @return

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamCase.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.io.Serializable;
 import java.text.DateFormat;
@@ -89,49 +89,49 @@ public class EamCase implements Serializable {
         return str.toString();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.caseUUID=Case UUID: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.caseUUID=Case UUID: "})
     public String getTitleCaseUUID() {
-        return Bundle.EnterpriseArtifactManagerCase_title_caseUUID();
+        return Bundle.EnterpriseArtifactsManagerCase_title_caseUUID();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.creationDate=Creation Date: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.creationDate=Creation Date: "})
     public String getTitleCreationDate() {
-        return Bundle.EnterpriseArtifactManagerCase_title_creationDate();
+        return Bundle.EnterpriseArtifactsManagerCase_title_creationDate();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.caseDisplayName=Case Name: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.caseDisplayName=Case Name: "})
     public String getTitleCaseDisplayName() {
-        return Bundle.EnterpriseArtifactManagerCase_title_caseDisplayName();
+        return Bundle.EnterpriseArtifactsManagerCase_title_caseDisplayName();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.caseNumber=Case Number: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.caseNumber=Case Number: "})
     public String getTitleCaseNumber() {
-        return Bundle.EnterpriseArtifactManagerCase_title_caseNumber();
+        return Bundle.EnterpriseArtifactsManagerCase_title_caseNumber();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.examinerName=Examiner Name: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.examinerName=Examiner Name: "})
     public String getTitleExaminerName() {
-        return Bundle.EnterpriseArtifactManagerCase_title_examinerName();
+        return Bundle.EnterpriseArtifactsManagerCase_title_examinerName();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.examinerEmail=Examiner Email: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.examinerEmail=Examiner Email: "})
     public String getTitleExaminerEmail() {
-        return Bundle.EnterpriseArtifactManagerCase_title_examinerEmail();
+        return Bundle.EnterpriseArtifactsManagerCase_title_examinerEmail();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.examinerPhone=Examiner Phone: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.examinerPhone=Examiner Phone: "})
     public String getTitleExaminerPhone() {
-        return Bundle.EnterpriseArtifactManagerCase_title_examinerPhone();
+        return Bundle.EnterpriseArtifactsManagerCase_title_examinerPhone();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.org=Organization: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.org=Organization: "})
     public String getTitleOrganization() {
-        return Bundle.EnterpriseArtifactManagerCase_title_org();
+        return Bundle.EnterpriseArtifactsManagerCase_title_org();
     }
 
-    @Messages({"EnterpriseArtifactManagerCase.title.notes=Notes: "})
+    @Messages({"EnterpriseArtifactsManagerCase.title.notes=Notes: "})
     public String getTitleNotes() {
-        return Bundle.EnterpriseArtifactManagerCase_title_notes();
+        return Bundle.EnterpriseArtifactsManagerCase_title_notes();
     }
 
     public String getCaseDetailsOptionsPaneDialog() {

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDataSource.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.io.Serializable;
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDb.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.util.List;
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDbException.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 /*
  * An exception to be thrown by an artifact manager.

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDbPlatformEnum.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 
@@ -40,7 +40,7 @@ public enum EamDbPlatformEnum {
      * Load the selectedPlatform boolean from the config file, if it is set.
      */
     private void loadSettings() {
-        String selectedPlatformString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.selectedPlatform"); // NON-NLS
+        String selectedPlatformString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.selectedPlatform"); // NON-NLS
 
         if (null != selectedPlatformString) {
             selected = this.toString().equalsIgnoreCase(selectedPlatformString);
@@ -83,7 +83,7 @@ public enum EamDbPlatformEnum {
                 selectedPlatform = p;
             }
         }
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.selectedPlatform", selectedPlatform.name()); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.selectedPlatform", selectedPlatform.name()); // NON-NLS
     }
 
     /**

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamGlobalFileInstance.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance.KnownStatus;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance.KnownStatus;
 
 /**
  * Global file hash instance

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamGlobalSet.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.time.LocalDate;
 
 /**
- * A global set in the enterprise artifact manager database
+ * A global set in the enterprise artifacts manager database
  */
 public class EamGlobalSet {
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamOrganization.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 /**
- * An organization in the enterprise artifact manager database
+ * An organization in the enterprise artifacts manager database
  */
 public class EamOrganization {
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/PostgresEamDb.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -26,7 +26,7 @@ import org.apache.commons.dbcp2.BasicDataSource;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
- * Enterprise artifact manager database implementation using Postgres as a
+ * Enterprise artifacts manager database implementation using Postgres as a
  * backend
  */
 public class PostgresEamDb extends AbstractSqlEamDb {
@@ -306,7 +306,7 @@ public class PostgresEamDb extends AbstractSqlEamDb {
     protected Connection connect() throws EamDbException {
         synchronized (this) {
             if (!dbSettings.isEnabled()) {
-                throw new EamDbException("Enterprise artifact manager is not enabled"); // NON-NLS
+                throw new EamDbException("Enterprise artifacts manager is not enabled"); // NON-NLS
             }
 
             if (connectionPool == null) {

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/PostgresEamDbSettings.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 
 /**
- * Settings for the Postgres implementation of the enterprise artifact manager
+ * Settings for the Postgres implementation of the enterprise artifacts manager
  * database
  */
 public final class PostgresEamDbSettings {
@@ -62,15 +62,15 @@ public final class PostgresEamDbSettings {
     }
 
     public void loadSettings() {
-        enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")); // NON-NLS
+        enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")); // NON-NLS
 
-        host = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.host"); // NON-NLS
+        host = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.host"); // NON-NLS
         if (host == null || host.isEmpty()) {
             host = DEFAULT_HOST;
         }
 
         try {
-            String portString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.port"); // NON-NLS
+            String portString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.port"); // NON-NLS
             if (portString == null || portString.isEmpty()) {
                 port = DEFAULT_PORT;
             } else {
@@ -83,13 +83,13 @@ public final class PostgresEamDbSettings {
             port = DEFAULT_PORT;
         }
 
-        dbName = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.dbName"); // NON-NLS
+        dbName = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.dbName"); // NON-NLS
         if (dbName == null || dbName.isEmpty()) {
             dbName = DEFAULT_DBNAME;
         }
 
         try {
-            String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.bulkThreshold"); // NON-NLS
+            String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.bulkThreshold"); // NON-NLS
             if (bulkThresholdString == null || bulkThresholdString.isEmpty()) {
                 this.bulkThreshold = DEFAULT_BULK_THRESHHOLD;
             } else {
@@ -102,17 +102,17 @@ public final class PostgresEamDbSettings {
             this.bulkThreshold = DEFAULT_BULK_THRESHHOLD;
         }
 
-        userName = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.user"); // NON-NLS
+        userName = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.user"); // NON-NLS
         if (userName == null || userName.isEmpty()) {
             userName = DEFAULT_USERNAME;
         }
 
-        password = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.password"); // NON-NLS
+        password = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.password"); // NON-NLS
         if (password == null || password.isEmpty()) {
             password = DEFAULT_PASSWORD;
         }
 
-        String badTagsStr = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.badTags"); // NON-NLS
+        String badTagsStr = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.badTags"); // NON-NLS
         if (badTagsStr == null || badTagsStr.isEmpty()) {
             badTagsStr = DEFAULT_BAD_TAGS;
         }
@@ -120,14 +120,14 @@ public final class PostgresEamDbSettings {
     }
 
     public void saveSettings() {
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.enabled", Boolean.toString(isEnabled())); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.enabled", Boolean.toString(isEnabled())); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.host", getHost()); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.host", getHost()); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.port", Integer.toString(port)); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.port", Integer.toString(port)); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.dbName", getDbName()); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.dbName", getDbName()); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.bulkThreshold", Integer.toString(getBulkThreshold())); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.bulkThreshold", Integer.toString(getBulkThreshold())); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.user", getUserName()); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.user", getUserName()); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.password", getPassword()); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.password", getPassword()); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.badTags", String.join(",", badTags)); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.badTags", String.join(",", badTags)); // NON-NLS
     }
 
     /**
@@ -186,12 +186,12 @@ public final class PostgresEamDbSettings {
     }
 
     public boolean isChanged() {
-        String hostString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.host"); // NON-NLS
+        String hostString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.host"); // NON-NLS
-        String portString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.port"); // NON-NLS
+        String portString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.port"); // NON-NLS
-        String dbNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.dbName"); // NON-NLS
+        String dbNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.dbName"); // NON-NLS
-        String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.bulkThreshold"); // NON-NLS
+        String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.bulkThreshold"); // NON-NLS
-        String userNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.user"); // NON-NLS
+        String userNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.user"); // NON-NLS
-        String userPasswordString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.password"); // NON-NLS
+        String userPasswordString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.password"); // NON-NLS
 
         return !host.equals(hostString) || !Integer.toString(port).equals(portString)
                 || !dbName.equals(dbNameString) || !Integer.toString(bulkThreshold).equals(bulkThresholdString)

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/SqliteEamDb.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,7 +30,7 @@ import org.apache.commons.dbcp2.BasicDataSource;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
- * Sqlite implementation of the enterprise artifact manager database
+ * Sqlite implementation of the enterprise artifacts manager database
  */
 public class SqliteEamDb extends AbstractSqlEamDb {
 
@@ -337,7 +337,7 @@ public class SqliteEamDb extends AbstractSqlEamDb {
     protected Connection connect() throws EamDbException {
         synchronized (this) {
             if (!dbSettings.isEnabled()) {
-                throw new EamDbException("Enterprise artifact manager is not enabled"); // NON-NLS
+                throw new EamDbException("Enterprise artifacts manager is not enabled"); // NON-NLS
             }
 
             if (connectionPool == null) {

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/SqliteEamDbSettings.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,7 +35,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 
 /**
- * Settings for the sqlite implementation of the enterprise artifact manager database
+ * Settings for the sqlite implementation of the enterprise artifacts manager database
  */
 public final class SqliteEamDbSettings {
 
@@ -59,20 +59,20 @@ public final class SqliteEamDbSettings {
     }
 
     public void loadSettings() {
-        enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")); // NON-NLS
+        enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")); // NON-NLS
 
-        dbName = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbName"); // NON-NLS
+        dbName = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbName"); // NON-NLS
         if (dbName == null || dbName.isEmpty()) {
             dbName = DEFAULT_DBNAME;
         }
 
-        dbDirectory = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbDirectory"); // NON-NLS
+        dbDirectory = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbDirectory"); // NON-NLS
         if (dbDirectory == null || dbDirectory.isEmpty()) {
             dbDirectory = DEFAULT_DBDIRECTORY;
         }
 
         try {
-            String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.bulkThreshold"); // NON-NLS
+            String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.bulkThreshold"); // NON-NLS
             if (bulkThresholdString == null || bulkThresholdString.isEmpty()) {
                 this.bulkThreshold = DEFAULT_BULK_THRESHHOLD;
             } else {
@@ -85,7 +85,7 @@ public final class SqliteEamDbSettings {
             this.bulkThreshold = DEFAULT_BULK_THRESHHOLD;
         }
 
-        String badTagsStr = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.badTags"); // NON-NLS
+        String badTagsStr = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.badTags"); // NON-NLS
         if (badTagsStr == null || badTagsStr.isEmpty()) {
             badTagsStr = DEFAULT_BAD_TAGS;
         }
@@ -95,11 +95,11 @@ public final class SqliteEamDbSettings {
     public void saveSettings() {
         createAndVerifyDirectory();
 
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.enabled", Boolean.toString(isEnabled())); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.enabled", Boolean.toString(isEnabled())); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbName", getDbName()); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbName", getDbName()); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbDirectory", getDbDirectory()); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbDirectory", getDbDirectory()); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.sqlite.bulkThreshold", Integer.toString(getBulkThreshold())); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.sqlite.bulkThreshold", Integer.toString(getBulkThreshold())); // NON-NLS
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.badTags", String.join(",", badTags)); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.badTags", String.join(",", badTags)); // NON-NLS
     }
 
     public boolean createAndVerifyDirectory() {
@@ -175,9 +175,9 @@ public final class SqliteEamDbSettings {
     }
 
     public boolean isChanged() {
-        String dbNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbName"); // NON-NLS
+        String dbNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbName"); // NON-NLS
-        String dbDirectoryString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbDirectory"); // NON-NLS
+        String dbDirectoryString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbDirectory"); // NON-NLS
-        String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.bulkThreshold"); // NON-NLS
+        String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.bulkThreshold"); // NON-NLS
 
         return !dbName.equals(dbNameString)
                 || !dbDirectory.equals(dbDirectoryString)

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/BadFileTagRunner.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,13 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners;
 
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
  * Thread to send info to remote DB that tags a file as known bad.
@@ -43,14 +43,14 @@ public class BadFileTagRunner implements Runnable {
     @Override
     public void run() {
         if (!dbManager.isEnabled()) {
-            LOGGER.log(Level.WARNING, "Enterprise artifact manager database not configured"); // NON-NLS
+            LOGGER.log(Level.WARNING, "Enterprise artifacts manager database not configured"); // NON-NLS
             return;
         }
 
         try {
             dbManager.setArtifactInstanceKnownBad(this.artifact);
         } catch (EamDbException ex) {
-            LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database.", ex); //NON-NLS
+            LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database.", ex); //NON-NLS
         }
     }
 }

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -29,13 +29,13 @@ import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
 import org.sleuthkit.autopsy.casemodule.events.DataSourceAddedEvent;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactUtil;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactUtil;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDataSource;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDataSource;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifactTag;
@@ -45,10 +45,10 @@ import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.datamodel.TskDataException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
- * Listen for case events and update entries in the enterprise artifact manager
+ * Listen for case events and update entries in the enterprise artifacts manager
  * database accordingly
  */
 @Messages({"caseeventlistener.evidencetag=Evidence"})
@@ -108,13 +108,13 @@ public class CaseEventListener implements PropertyChangeListener {
                                 EamArtifactInstance.GlobalStatus.LOCAL
                         );
                         eamArtifact.addInstance(cei);
-                        // send update to enterprise artifact manager db
+                        // send update to enterprise artifacts manager db
                         Runnable r = new BadFileTagRunner(eamArtifact);
                         // TODO: send r into a thread pool instead
                         Thread t = new Thread(r);
                         t.start();
                     } catch (EamDbException ex) {
-                        LOGGER.log(Level.SEVERE, "Error, unable to get correlation artifact type MD5 during CONTENT_TAG_ADDED event.", ex);
+                        LOGGER.log(Level.SEVERE, "Error, unable to get FILES artifact type during CONTENT_TAG_ADDED event.", ex);
                     }
                 }
             } // CONTENT_TAG_ADDED
@@ -142,7 +142,7 @@ public class CaseEventListener implements PropertyChangeListener {
                             t.start();
                         }
                     } catch (EamDbException ex) {
-                        LOGGER.log(Level.SEVERE, "Error, unable to get correlation artifact types during BLACKBOARD_ARTIFACT_TAG_ADDED event.", ex);
+                        LOGGER.log(Level.SEVERE, "Error, unable to get artifact types during BLACKBOARD_ARTIFACT_TAG_ADDED event.", ex);
                     }
                 }
             } // BLACKBOARD_ARTIFACT_TAG_ADDED
@@ -162,7 +162,7 @@ public class CaseEventListener implements PropertyChangeListener {
                         dbManager.newDataSource(new EamDataSource(deviceId, newDataSource.getName()));
                     }
                 } catch (EamDbException ex) {
-                    LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database.", ex); //NON-NLS
+                    LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database.", ex); //NON-NLS
                 } catch (TskCoreException | TskDataException ex) {
                     LOGGER.log(Level.SEVERE, "Error getting data source from DATA_SOURCE_ADDED event content.", ex); //NON-NLS
                 }
@@ -218,7 +218,7 @@ public class CaseEventListener implements PropertyChangeListener {
                             dbManager.newCase(curCeCase);
                         }
                     } catch (EamDbException ex) {
-                        LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database.", ex); //NON-NLS
+                        LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database.", ex); //NON-NLS
                     }
                 }
             } // CURRENT_CASE

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -34,17 +34,17 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactUtil;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactUtil;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
- * Listen for ingest events and update entries in the enterprise artifact manager database accordingly
+ * Listen for ingest events and update entries in the enterprise artifacts manager database accordingly
  */
 public class IngestEventsListener {
 
@@ -92,7 +92,7 @@ public class IngestEventsListener {
                     List<EamArtifact> eamArtifacts = new ArrayList<>();
                     try {
                         for (BlackboardArtifact bbArtifact : bbArtifacts) {
-                            // eamArtifact will be null OR a EamArtifact containing one EnterpriseArtifactManagerArtifactInstance.
+                            // eamArtifact will be null OR a EamArtifact containing one EnterpriseArtifactsManagerArtifactInstance.
                             EamArtifact eamArtifact = EamArtifactUtil.fromBlackboardArtifact(bbArtifact, true, dbManager.getCorrelationArtifactTypes(), true);
                             if (null != eamArtifact) {
 
@@ -116,7 +116,7 @@ public class IngestEventsListener {
                             }
                         }
                     } catch (EamDbException ex) {
-                        LOGGER.log(Level.SEVERE, "Error getting enterprise artifact manager artifact types.", ex);
+                        LOGGER.log(Level.SEVERE, "Error getting enterprise artifacts manager artifact types.", ex);
                     }
                     if (FALSE == eamArtifacts.isEmpty()) {
                         // send update to entperirse artifact manager db
@@ -148,17 +148,17 @@ public class IngestEventsListener {
         }
     }
 
-    @NbBundle.Messages({"enterpriseartifactmanager.prevcases.text=Previous Cases",
+    @NbBundle.Messages({"EnterpriseArtifactsManager.prevcases.text=Previous Cases",
-        "enterpriseartifactmanager.ingestmodule.name=Enterprise Artifact Manager"})
+        "EnterpriseArtifactsManager.ingestmodule.name=Enterprise Artifacts Manager"})
     private void postCorrelatedBadArtifactToBlackboard(BlackboardArtifact bbArtifact, List<String> caseDisplayNames) {
 
         try {
             AbstractFile af = bbArtifact.getSleuthkitCase().getAbstractFileById(bbArtifact.getObjectID());
         
-            String MODULE_NAME = Bundle.enterpriseartifactmanager_ingestmodule_name();
+            String MODULE_NAME = Bundle.EnterpriseArtifactsManager_ingestmodule_name();
             BlackboardArtifact tifArtifact = af.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT);
             BlackboardAttribute att = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME,
-                    Bundle.enterpriseartifactmanager_prevcases_text());
+                    Bundle.EnterpriseArtifactsManager_prevcases_text());
             BlackboardAttribute att2 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT, MODULE_NAME,
                     "Previous Case: " + caseDisplayNames.stream().distinct().collect(Collectors.joining(",", "", "")));
             tifArtifact.addAttribute(att);

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/Installer.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners;
 
 import java.beans.PropertyChangeListener;
 import org.openide.modules.ModuleInstall;
 import org.openide.util.actions.CallableSystemAction;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.actions.EamEditCaseInfoAction;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.actions.EamEditCaseInfoAction;
 
 /**
  * Install event listeners during module initialization

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/NewArtifactsRunner.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,15 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
  * Thread to insert a new artifact into remote DB.
@@ -46,7 +46,7 @@ public class NewArtifactsRunner implements Runnable {
     @Override
     public void run() {
         if (!dbManager.isEnabled()) {
-            LOGGER.log(Level.WARNING, "Enterprise artifact manager database not configured"); // NON-NLS
+            LOGGER.log(Level.WARNING, "Enterprise artifacts manager database not configured"); // NON-NLS
             return;
         }
 
@@ -55,7 +55,7 @@ public class NewArtifactsRunner implements Runnable {
                 dbManager.addArtifact(eamArtifact);
             }
         } catch (EamDbException ex) {
-            LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database.", ex); //NON-NLS
+            LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database.", ex); //NON-NLS
         }
 
     }

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/ingestmodule/IngestModule.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.ingestmodule;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.ingestmodule;
 
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
@@ -36,25 +36,25 @@ import org.sleuthkit.autopsy.ingest.IngestMessage;
 import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDataSource;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDataSource;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.HashUtility;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization;
 import org.sleuthkit.datamodel.TskDataException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
- * Ingest module for inserting entries into the enterprise artifact manager
+ * Ingest module for inserting entries into the enterprise artifacts manager
  * database on ingest of a data source
  */
-@Messages({"enterpriseartifactmanager.prevcases.text=Previous Cases",
+@Messages({"enterpriseartifactsmanager.prevcases.text=Previous Cases",
-    "enterpriseartifactmanager.ingestmodule.name=Enterprise Artifact Manager"})
+    "enterpriseartifactsmanager.ingestmodule.name=Enterprise Artifacts Manager"})
 class IngestModule implements FileIngestModule {
 
     private final static Logger LOGGER = Logger.getLogger(IngestModule.class.getName());
@@ -69,7 +69,7 @@ class IngestModule implements FileIngestModule {
 
     @Override
     public ProcessResult process(AbstractFile af) {
-        if (Boolean.parseBoolean(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")) == false
+        if (Boolean.parseBoolean(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")) == false
                 || EamDb.getInstance().isEnabled() == false) {
             /*
              * Not signaling an error for now. This is a workaround for the way
@@ -171,12 +171,12 @@ class IngestModule implements FileIngestModule {
 
     // see ArtifactManagerTimeTester for details
     @Messages({
-        "EnterpriseArtifactManager.notfyBubble.title=Enterprise Artifact Manager Not Initialized",
+        "EnterpriseArtifactsManager.notfyBubble.title=Enterprise Artifacts Manager Not Initialized",
-        "EnterpriseArtifactManager.errorMessage.isNotEnabled=Enterprise artifact manager settings are not initialized, cannot run enteprise artifact manager ingest module."
+        "EnterpriseArtifactsManager.errorMessage.isNotEnabled=Enterprise artifacts manager settings are not initialized, cannot run enteprise artifact manager ingest module."
     })
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
-        if (Boolean.parseBoolean(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")) == false
+        if (Boolean.parseBoolean(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")) == false
                 || EamDb.getInstance().isEnabled() == false) {
             /*
              * Not throwing the customary exception for now. This is a
@@ -187,7 +187,7 @@ class IngestModule implements FileIngestModule {
              */
             if (RuntimeProperties.runningWithGUI()) {
                 if (1L == warningMsgRefCounter.incrementAndGet(jobId)) {
-                    MessageNotifyUtil.Notify.warn(Bundle.EnterpriseArtifactManager_notfyBubble_title(), Bundle.EnterpriseArtifactManager_errorMessage_isNotEnabled());
+                    MessageNotifyUtil.Notify.warn(Bundle.EnterpriseArtifactsManager_notfyBubble_title(), Bundle.EnterpriseArtifactsManager_errorMessage_isNotEnabled());
                 }
             }
             return;
@@ -257,10 +257,10 @@ class IngestModule implements FileIngestModule {
     private void postCorrelatedBadFileToBlackboard(AbstractFile abstractFile, List<String> caseDisplayNames) {
 
         try {
-            String MODULE_NAME = Bundle.enterpriseartifactmanager_ingestmodule_name();
+            String MODULE_NAME = Bundle.enterpriseartifactsmanager_ingestmodule_name();
             BlackboardArtifact tifArtifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT);
             BlackboardAttribute att = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME,
-                    Bundle.enterpriseartifactmanager_prevcases_text());
+                    Bundle.enterpriseartifactsmanager_prevcases_text());
             BlackboardAttribute att2 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT, MODULE_NAME,
                     "Previous Case: " + caseDisplayNames.stream().distinct().collect(Collectors.joining(",", "", "")));
             tifArtifact.addAttribute(att);
@@ -287,10 +287,10 @@ class IngestModule implements FileIngestModule {
 
     private void postCorrelatedHashHitToBlackboard(AbstractFile abstractFile) {
         try {
-            String MODULE_NAME = Bundle.enterpriseartifactmanager_ingestmodule_name();
+            String MODULE_NAME = Bundle.enterpriseartifactsmanager_ingestmodule_name();
             BlackboardArtifact tifArtifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT);
             BlackboardAttribute att = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME,
-                    Bundle.enterpriseartifactmanager_prevcases_text());
+                    Bundle.enterpriseartifactsmanager_prevcases_text());
             tifArtifact.addAttribute(att);
 
             try {
@@ -323,7 +323,7 @@ class IngestModule implements FileIngestModule {
     @Messages({"IngestModule.postToBB.fileName=File Name",
         "IngestModule.postToBB.md5Hash=MD5 Hash",
         "IngestModule.postToBB.hashSetSource=Source of Hash",
-        "IngestModule.postToBB.eamHit=Enterprise Artifact Manager",
+        "IngestModule.postToBB.eamHit=Enterprise Artifacts Manager",
         "# {0} - Name of file that is Known Bad",
         "IngestModule.postToBB.knownBadMsg=Known Bad: {0}"})
     public void sendBadFileInboxMessage(BlackboardArtifact artifact, String name, String md5Hash) {

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/ingestmodule/IngestModuleFactory.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,17 +16,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.ingestmodule;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.ingestmodule;
 
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.ingest.FileIngestModule;
 import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
 import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel.GlobalSettingsPanel;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel.GlobalSettingsPanel;
 
 /**
- * Factory for enterprise artifact manager ingest modules
+ * Factory for enterprise artifacts manager ingest modules
  */
 @ServiceProvider(service = org.sleuthkit.autopsy.ingest.IngestModuleFactory.class)
 public class IngestModuleFactory extends IngestModuleFactoryAdapter {
@@ -34,7 +34,7 @@ public class IngestModuleFactory extends IngestModuleFactoryAdapter {
     private static final String VERSION_NUMBER = "0.8.0";
 
     static String getModuleName() {
-        return java.util.ResourceBundle.getBundle("org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/Bundle")
+        return java.util.ResourceBundle.getBundle("org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/Bundle")
                 .getString("OpenIDE-Module-Name");
     }
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/license-enterpriseartifactmanager.txt

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/AddNewOrganizationDialog.form

@@ -104,7 +104,7 @@
     <Component class="javax.swing.JButton" name="bnOK">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.bnOK.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.bnOK.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -114,7 +114,7 @@
     <Component class="javax.swing.JButton" name="bnCancel">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.bnCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.bnCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -124,42 +124,42 @@
     <Component class="javax.swing.JLabel" name="lbOrganizationName">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbOrganizationName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbOrganizationName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbPocHeading">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbPocHeading.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbPocHeading.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbPocName">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbPocName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbPocName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbPocEmail">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbPocEmail.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbPocEmail.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbPocPhone">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbPocPhone.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.lbPocPhone.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="tfPocName">
       <Properties>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.tfName.tooltip" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="AddNewOrganizationDialog.tfName.tooltip" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/AddNewOrganizationDialog.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
@@ -31,12 +31,12 @@ import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
- * Dialog to add a new organization to the enterprise artifact manager database
+ * Dialog to add a new organization to the enterprise artifacts manager database
  */
 public class AddNewOrganizationDialog extends javax.swing.JDialog {
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties

@@ -1,5 +1,5 @@
-OptionsCategory_Name_Enterprise_Artifact_Manager_Options=Enterprise Artifact Manager
+OptionsCategory_Name_Enterprise_Artifacts_Manager_Options=Enterprise Artifacts Manager
-OptionsCategory_Keywords_Enterprise_Artifact_Manager_Options=Enterprise Artifact Manager Settings
+OptionsCategory_Keywords_Enterprise_Artifacts_Manager_Options=Enterprise Artifacts Manager Settings
 ImportHashDatabaseDialog.known.text=Known
 ImportHashDatabaseDialog.knownBad.text=Known Bad
 ImportHashDatabaseDialog.importHashDbMsg=Import Hash Database
@@ -44,7 +44,7 @@ ImportHashDatabaseDialog.bnNewOrganization.text=Add New Organization
 ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this database
 ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Database Version Number
 GlobalSettingsPanel.bnImportDatabase.actionCommand=
-GlobalSettingsPanel.cbEnableEnterpriseArtifactManager.text=Enable Enterprise Artifact Manager
+GlobalSettingsPanel.cbEnableEnterpriseArtifactsManager.text=Enable Enterprise Artifacts Manager
 GlobalSettingsPanel.bnManageTypes.text=Manage Artifact Types
 GlobalSettingsPanel.bnManageTags.actionCommand=
 GlobalSettingsPanel.bnManageTags.toolTipText=

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamOptionsPanelController.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -33,11 +33,11 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 /**
  * Controller for the main settings panel
  */
-@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_Enterprise_Artifact_Manager_Options",
+@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_Enterprise_Artifacts_Manager_Options",
         iconBase = "org/sleuthkit/autopsy/experimental/images/options-icon.png",
         position = 14,
-        keywords = "#OptionsCategory_Keywords_Enterprise_Artifact_Manager_Options",
+        keywords = "#OptionsCategory_Keywords_Enterprise_Artifacts_Manager_Options",
-        keywordsCategory = "EnterpriseArtifactManager")
+        keywordsCategory = "EnterpriseArtifactsManager")
 public final class EamOptionsPanelController extends OptionsPanelController {
 
     private GlobalSettingsPanel panel;
@@ -111,8 +111,8 @@ public final class EamOptionsPanelController extends OptionsPanelController {
         return panel;
     }
 
-    @Messages({"EnterpriseArtifactManagerOptionsController.moduleErr=Error processing value changes.",
+    @Messages({"EnterpriseArtifactsManagerOptionsController.moduleErr=Error processing value changes.",
-                "EnterpriseArtifactManagerOptionsController.moduleErr.msg=Value change processing failed."})
+                "EnterpriseArtifactsManagerOptionsController.moduleErr.msg=Value change processing failed."})
     void changed() {
         if (!changed) {
             changed = true;
@@ -122,8 +122,8 @@ public final class EamOptionsPanelController extends OptionsPanelController {
             } catch (Exception ex) {
                 LOGGER.log(Level.SEVERE, "Error processing property change", ex); //NON-NLS
                 MessageNotifyUtil.Notify.show(
-                        Bundle.EnterpriseArtifactManagerOptionsController_moduleErr(),
+                        Bundle.EnterpriseArtifactsManagerOptionsController_moduleErr(),
-                        Bundle.EnterpriseArtifactManagerOptionsController_moduleErr_msg(),
+                        Bundle.EnterpriseArtifactsManagerOptionsController_moduleErr_msg(),
                         MessageNotifyUtil.MessageType.ERROR);
             }
         }
@@ -133,8 +133,8 @@ public final class EamOptionsPanelController extends OptionsPanelController {
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Error processing property change validation.", e); //NON-NLS
             MessageNotifyUtil.Notify.show(
-                    Bundle.EnterpriseArtifactManagerOptionsController_moduleErr(),
+                    Bundle.EnterpriseArtifactsManagerOptionsController_moduleErr(),
-                    Bundle.EnterpriseArtifactManagerOptionsController_moduleErr_msg(),
+                    Bundle.EnterpriseArtifactsManagerOptionsController_moduleErr_msg(),
                     MessageNotifyUtil.MessageType.ERROR);
         }
     }

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamPostgresSettingsDialog.form

@@ -152,35 +152,35 @@
                 <Component class="javax.swing.JLabel" name="lbHostName">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbHostName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbHostName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JLabel" name="lbPort">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbPort.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbPort.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JLabel" name="lbUserName">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbUserName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbUserName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JLabel" name="lbUserPassword">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbUserPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbUserPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JLabel" name="lbDatabaseName">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbDatabaseName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.lbDatabaseName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
@@ -197,7 +197,7 @@
                 <Component class="javax.swing.JButton" name="bnTestConnection">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.bnTestConnection.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.bnTestConnection.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
@@ -207,7 +207,7 @@
                 <Component class="javax.swing.JButton" name="bnSave">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.bnSave.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.bnSave.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
@@ -217,7 +217,7 @@
                 <Component class="javax.swing.JButton" name="bnCancel">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.bnCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamPostgresSettingsDialog.bnCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamPostgresSettingsDialog.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel;
 
 import java.awt.Color;
 import java.awt.Cursor;
@@ -36,8 +36,8 @@ import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.corecomponents.TextPrompt;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.PostgresEamDbSettings;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.PostgresEamDbSettings;
 
 /**
  * Settings panel for the postgres-specific options
@@ -54,12 +54,12 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog {
     private Boolean hasChanged;
 
     /**
-     * Creates new form EnterpriseArtifactManagerPostgresSettingsDialog
+     * Creates new form EnterpriseArtifactsManagerPostgresSettingsDialog
      */
-    @NbBundle.Messages({"EnterpriseArtifactManagerPostgresSettingsDialog.postgresSettingsMessage.text=PostgreSQL Database Settings"})
+    @NbBundle.Messages({"EnterpriseArtifactsManagerPostgresSettingsDialog.postgresSettingsMessage.text=PostgreSQL Database Settings"})
     public EamPostgresSettingsDialog() {
         super((JFrame) WindowManager.getDefault().getMainWindow(),
-                Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_postgresSettingsMessage_text(),
+                Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_postgresSettingsMessage_text(),
                 true); // NON-NLS
 
         textBoxes = new ArrayList<>();
@@ -108,18 +108,18 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog {
     /**
      * Add text prompts to all of the text fields.
      */
-    @Messages({"EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.hostnameOrIP=Hostname or IP Address",
+    @Messages({"EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.hostnameOrIP=Hostname or IP Address",
-        "EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.port=Port Number",
+        "EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.port=Port Number",
-        "EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.dbName=Database Name",
+        "EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.dbName=Database Name",
-        "EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.user=Database User",
+        "EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.user=Database User",
-        "EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.password=Database User's Password"})
+        "EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.password=Database User's Password"})
     private void setTextPrompts() {
         Collection<TextPrompt> textPrompts = new ArrayList<>();
-        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_hostnameOrIP(), tbDbHostname));
+        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_hostnameOrIP(), tbDbHostname));
-        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_port(), tbDbPort));
+        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_port(), tbDbPort));
-        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_dbName(), tbDbName));
+        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_dbName(), tbDbName));
-        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_user(), tbDbUsername));
+        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_user(), tbDbUsername));
-        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_password(), tbDbPassword));
+        textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_password(), tbDbPassword));
         configureTextPrompts(textPrompts);
     }
 
@@ -192,7 +192,7 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog {
      *
      * @return True or false.
      */
-    @Messages({"EnterpriseArtifactManagerPostgresSettingsDialog.validation.incompleteFields=Fill in all values"})
+    @Messages({"EnterpriseArtifactsManagerPostgresSettingsDialog.validation.incompleteFields=Fill in all values"})
     private boolean checkFields() {
         boolean result = true;
 
@@ -201,7 +201,7 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog {
         if (!dbPopulated) {
             // We don't even have everything filled out
             result = false;
-            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_incompleteFields());
+            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_incompleteFields());
         }
         return result;
     }
@@ -211,45 +211,45 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog {
      *
      * @return True or false.
      */
-    @Messages({"EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidHost=Invalid database hostname.",
+    @Messages({"EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidHost=Invalid database hostname.",
-        "EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidPort=Invalid database port number.",
+        "EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidPort=Invalid database port number.",
-        "EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidDbName=Invalid database name.",
+        "EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidDbName=Invalid database name.",
-        "EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidDbUser=Invalid database username.",
+        "EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidDbUser=Invalid database username.",
-        "EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidDbPassword=Invalid database password.",})
+        "EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidDbPassword=Invalid database password.",})
     private boolean databaseSettingsAreValid() {
 
         try {
             dbSettings.setHost(tbDbHostname.getText().trim());
         } catch (EamDbException ex) {
-            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidHost());
+            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidHost());
             return false;
         }
 
         try {
             dbSettings.setPort(Integer.valueOf(tbDbPort.getText().trim()));
         } catch (NumberFormatException | EamDbException ex) {
-            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidPort());
+            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidPort());
             return false;
         }
 
         try {
             dbSettings.setDbName(tbDbName.getText().trim());
         } catch (EamDbException ex) {
-            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidDbName());
+            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidDbName());
             return false;
         }
 
         try {
             dbSettings.setUserName(tbDbUsername.getText().trim());
         } catch (EamDbException ex) {
-            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidDbUser());
+            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidDbUser());
             return false;
         }
 
         try {
             dbSettings.setPassword(tbDbPassword.getText().trim());
         } catch (EamDbException ex) {
-            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidDbPassword());
+            lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidDbPassword());
             return false;
         }
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamSqliteSettingsDialog.form

@@ -136,24 +136,24 @@
                 <Component class="javax.swing.JLabel" name="lbDatabasePath">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.lbDatabasePath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.lbDatabasePath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JTextField" name="tfDatabasePath">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.tfDatabasePath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.tfDatabasePath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                     <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.tfDatabasePath.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.tfDatabasePath.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JButton" name="bnDatabasePathFileOpen">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.bnDatabasePathFileOpen.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.bnDatabasePathFileOpen.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
@@ -166,14 +166,14 @@
                       <Color blue="33" green="33" red="ff" type="rgb"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.lbTestDatabaseWarning.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.lbTestDatabaseWarning.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
                 <Component class="javax.swing.JButton" name="bnTestDatabase">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.bnTestDatabase.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.bnTestDatabase.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
@@ -183,7 +183,7 @@
                 <Component class="javax.swing.JLabel" name="lbTestDatabase">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.lbTestDatabase.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.lbTestDatabase.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="" noResource="true"/>
                   </Properties>
@@ -191,7 +191,7 @@
                 <Component class="javax.swing.JButton" name="bnCancel">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.bnCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.bnCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
@@ -201,7 +201,7 @@
                 <Component class="javax.swing.JButton" name="bnSave">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.bnSave.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="EamSqliteSettingsDialog.bnSave.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamSqliteSettingsDialog.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel;
 
 import java.awt.Cursor;
 import java.awt.Dimension;
@@ -36,8 +36,8 @@ import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.SqliteEamDbSettings;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.SqliteEamDbSettings;
 
 /**
  * Settings panel for the sqlite-specific options
@@ -53,12 +53,12 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog {
     private Boolean hasChanged;
 
     /**
-     * Creates new form EnterpriseArtifactManagerSQLiteSettingsDialog
+     * Creates new form EnterpriseArtifactsManagerSQLiteSettingsDialog
      */
-    @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.sqliteSettingsMessage.text=SQLite Database Settings"})
+    @Messages({"EnterpriseArtifactsManagerSQLiteSettingsDialog.sqliteSettingsMessage.text=SQLite Database Settings"})
     public EamSqliteSettingsDialog() {
         super((JFrame) WindowManager.getDefault().getMainWindow(),
-                Bundle.EnterpriseArtifactManagerSQLiteSettingsDialog_sqliteSettingsMessage_text(),
+                Bundle.EnterpriseArtifactsManagerSQLiteSettingsDialog_sqliteSettingsMessage_text(),
                 true); // NON-NLS
 
         this.dbSettings = new SqliteEamDbSettings();
@@ -91,12 +91,12 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog {
         bnTestDatabase.setEnabled(false);
     }
 
-    @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.fileNameExtFilter.text=SQLite Database File"})
+    @Messages({"EnterpriseArtifactsManagerSQLiteSettingsDialog.fileNameExtFilter.text=SQLite Database File"})
     private void customizeFileChooser() {
         fcDatabasePath.setDragEnabled(false);
         fcDatabasePath.setFileSelectionMode(JFileChooser.FILES_ONLY);
         String[] EXTENSION = new String[]{"db"}; //NON-NLS
-        FileNameExtensionFilter filter = new FileNameExtensionFilter(Bundle.EnterpriseArtifactManagerSQLiteSettingsDialog_fileNameExtFilter_text(), EXTENSION); // NON-NLS
+        FileNameExtensionFilter filter = new FileNameExtensionFilter(Bundle.EnterpriseArtifactsManagerSQLiteSettingsDialog_fileNameExtFilter_text(), EXTENSION); // NON-NLS
         fcDatabasePath.setFileFilter(filter);
         fcDatabasePath.setMultiSelectionEnabled(false);
     }
@@ -150,7 +150,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog {
      * Get the db file name and directory path from the file chooser and store
      * in dbSettings.
      */
-    @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.storeDbNameAndDirectory.failedToSetDbNamePathMsg=Database filename or directory path is missing. Try again."})
+    @Messages({"EnterpriseArtifactsManagerSQLiteSettingsDialog.storeDbNameAndDirectory.failedToSetDbNamePathMsg=Database filename or directory path is missing. Try again."})
     private void storeDbNameAndDirectory() {
         File databasePath = new File(tfDatabasePath.getText());
         try {
@@ -158,7 +158,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog {
             dbSettings.setDbDirectory(databasePath.getParent());
         } catch (EamDbException ex) {
             LOGGER.log(Level.SEVERE, "Failed to set database name or directory path.", ex); // NON-NLS
-            JOptionPane.showMessageDialog(this, Bundle.EnterpriseArtifactManagerSQLiteSettingsDialog_storeDbNameAndDirectory_failedToSetDbNamePathMsg());
+            JOptionPane.showMessageDialog(this, Bundle.EnterpriseArtifactsManagerSQLiteSettingsDialog_storeDbNameAndDirectory_failedToSetDbNamePathMsg());
         }
     }
 
@@ -309,7 +309,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog {
         pack();
     }// </editor-fold>//GEN-END:initComponents
 
-    @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.chooserPath.failedToGetDbPathMsg=Selected database path is invalid. Try again."})
+    @Messages({"EnterpriseArtifactsManagerSQLiteSettingsDialog.chooserPath.failedToGetDbPathMsg=Selected database path is invalid. Try again."})
     private void bnDatabasePathFileOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnDatabasePathFileOpenActionPerformed
         if (fcDatabasePath.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
             File databaseFile = fcDatabasePath.getSelectedFile();
@@ -319,7 +319,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog {
 
             } catch (IOException ex) {
                 LOGGER.log(Level.SEVERE, "Failed to get path of selected database file", ex); // NON-NLS
-                JOptionPane.showMessageDialog(this, Bundle.EnterpriseArtifactManagerSQLiteSettingsDialog_chooserPath_failedToGetDbPathMsg());
+                JOptionPane.showMessageDialog(this, Bundle.EnterpriseArtifactsManagerSQLiteSettingsDialog_chooserPath_failedToGetDbPathMsg());
             }
         }
     }//GEN-LAST:event_bnDatabasePathFileOpenActionPerformed

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/GlobalSettingsPanel.form

@@ -50,7 +50,7 @@
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
-                              <Component id="cbEnableEnterpriseArtifactManager" min="-2" pref="215" max="-2" attributes="0"/>
+                              <Component id="cbEnableEnterpriseArtifactsManager" min="-2" pref="215" max="-2" attributes="0"/>
                               <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                           </Group>
                           <Component id="pnSettings" alignment="1" max="32767" attributes="0"/>
@@ -61,7 +61,7 @@
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="1" attributes="0">
-                      <Component id="cbEnableEnterpriseArtifactManager" min="-2" max="-2" attributes="0"/>
+                      <Component id="cbEnableEnterpriseArtifactsManager" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="pnSettings" max="32767" attributes="0"/>
                   </Group>
@@ -121,10 +121,10 @@
                       <Image iconType="3" name="/org/sleuthkit/autopsy/experimental/images/import16.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnImportDatabase.label" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnImportDatabase.label" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                     <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnImportDatabase.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnImportDatabase.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
@@ -136,7 +136,7 @@
                     <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                       <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
                         <TitledBorder title="Database Settings">
-                          <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.lbDatabaseSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                          <ResourceString PropertyName="titleX" bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.lbDatabaseSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                           <Font PropertyName="font" name="Tahoma" size="12" style="0"/>
                         </TitledBorder>
                       </Border>
@@ -191,14 +191,14 @@
                     <Component class="javax.swing.JLabel" name="lbDatabasePlatform">
                       <Properties>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.lbDatabasePlatform.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.lbDatabasePlatform.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                         </Property>
                       </Properties>
                     </Component>
                     <Component class="javax.swing.JButton" name="bnConfigureDatabaseSettings">
                       <Properties>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnConfigureDatabaseSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnConfigureDatabaseSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                         </Property>
                       </Properties>
                       <Events>
@@ -219,7 +219,7 @@
                       <Color blue="0" green="0" red="ff" type="rgb"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.tbOops.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.tbOops.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                     <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
                       <Border info="null"/>
@@ -229,13 +229,13 @@
                 <Component class="javax.swing.JButton" name="bnManageTags">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnManageTags.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnManageTags.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                     <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnManageTags.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnManageTags.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                     <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnManageTags.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnManageTags.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
@@ -245,7 +245,7 @@
                 <Component class="javax.swing.JButton" name="bnManageTypes">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnManageTypes.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.bnManageTypes.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                   <Events>
@@ -254,19 +254,19 @@
                 </Component>
               </SubComponents>
             </Container>
-            <Component class="javax.swing.JCheckBox" name="cbEnableEnterpriseArtifactManager">
+            <Component class="javax.swing.JCheckBox" name="cbEnableEnterpriseArtifactsManager">
               <Properties>
                 <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
                   <FontInfo relative="true">
-                    <Font bold="false" component="cbEnableEnterpriseArtifactManager" property="font" relativeSize="false" size="11"/>
+                    <Font bold="false" component="cbEnableEnterpriseArtifactsManager" property="font" relativeSize="false" size="11"/>
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.cbEnableEnterpriseArtifactManager.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="GlobalSettingsPanel.cbEnableEnterpriseArtifactsManager.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
-                <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="cbEnableEnterpriseArtifactManagerItemStateChanged"/>
+                <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="cbEnableEnterpriseArtifactsManagerItemStateChanged"/>
               </Events>
             </Component>
           </SubComponents>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/GlobalSettingsPanel.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel;
 
 import org.sleuthkit.autopsy.coreutils.Logger;
 import java.beans.PropertyChangeEvent;
@@ -31,11 +31,11 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.events.AutopsyEvent;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbPlatformEnum;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbPlatformEnum;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
- * Main settings panel for the enterprise artifact manager
+ * Main settings panel for the enterprise artifacts manager
  */
 public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel {
 
@@ -49,7 +49,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
     private boolean comboboxSelectDatabaseTypeActionListenerActive;
 
     /**
-     * Creates new form EnterpriseArtifactManagerOptionsPanel
+     * Creates new form EnterpriseArtifactsManagerOptionsPanel
      */
     public GlobalSettingsPanel() {
         ingestJobEventListener = new IngestJobEventPropertyChangeListener();
@@ -59,7 +59,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
         addIngestJobEventsListener();
     }
 
-    @Messages({"GlobalSettingsPanel.title=Global Enterprise Artifact Manager Settings"})
+    @Messages({"GlobalSettingsPanel.title=Global Enterprise Artifacts Manager Settings"})
     private void customizeComponents() {
         setName(Bundle.GlobalSettingsPanel_title());
         comboboxSelectDatabaseTypeActionListenerActive = false; // don't fire action listener while loading combobox content
@@ -95,7 +95,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
         tbOops = new javax.swing.JTextField();
         bnManageTags = new javax.swing.JButton();
         bnManageTypes = new javax.swing.JButton();
-        cbEnableEnterpriseArtifactManager = new javax.swing.JCheckBox();
+        cbEnableEnterpriseArtifactsManager = new javax.swing.JCheckBox();
 
         setName(""); // NOI18N
 
@@ -209,11 +209,11 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
                 .addGap(34, 34, 34))
         );
 
-        cbEnableEnterpriseArtifactManager.setFont(cbEnableEnterpriseArtifactManager.getFont().deriveFont(cbEnableEnterpriseArtifactManager.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        cbEnableEnterpriseArtifactsManager.setFont(cbEnableEnterpriseArtifactsManager.getFont().deriveFont(cbEnableEnterpriseArtifactsManager.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
-        org.openide.awt.Mnemonics.setLocalizedText(cbEnableEnterpriseArtifactManager, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.cbEnableEnterpriseArtifactManager.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(cbEnableEnterpriseArtifactsManager, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.cbEnableEnterpriseArtifactsManager.text")); // NOI18N
-        cbEnableEnterpriseArtifactManager.addItemListener(new java.awt.event.ItemListener() {
+        cbEnableEnterpriseArtifactsManager.addItemListener(new java.awt.event.ItemListener() {
             public void itemStateChanged(java.awt.event.ItemEvent evt) {
-                cbEnableEnterpriseArtifactManagerItemStateChanged(evt);
+                cbEnableEnterpriseArtifactsManagerItemStateChanged(evt);
             }
         });
 
@@ -225,14 +225,14 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
                 .addContainerGap()
                 .addGroup(pnOverallPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(pnOverallPanelLayout.createSequentialGroup()
-                        .addComponent(cbEnableEnterpriseArtifactManager, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(cbEnableEnterpriseArtifactsManager, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addGap(0, 0, Short.MAX_VALUE))
                     .addComponent(pnSettings, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
         );
         pnOverallPanelLayout.setVerticalGroup(
             pnOverallPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnOverallPanelLayout.createSequentialGroup()
-                .addComponent(cbEnableEnterpriseArtifactManager)
+                .addComponent(cbEnableEnterpriseArtifactsManager)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(pnSettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
@@ -253,16 +253,16 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
         );
     }// </editor-fold>//GEN-END:initComponents
 
-    private void cbEnableEnterpriseArtifactManagerItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cbEnableEnterpriseArtifactManagerItemStateChanged
+    private void cbEnableEnterpriseArtifactsManagerItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cbEnableEnterpriseArtifactsManagerItemStateChanged
         tbOops.setText("");
-        if (!cbEnableEnterpriseArtifactManager.isSelected()) {
+        if (!cbEnableEnterpriseArtifactsManager.isSelected()) {
             enableAllSubComponents(false);
             firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
         } else {
             enableDatabaseSubComponents(true);
             validateDatabaseSettings();
         }
-    }//GEN-LAST:event_cbEnableEnterpriseArtifactManagerItemStateChanged
+    }//GEN-LAST:event_cbEnableEnterpriseArtifactsManagerItemStateChanged
 
     private void bnImportDatabaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnImportDatabaseActionPerformed
         ImportHashDatabaseDialog dialog = new ImportHashDatabaseDialog();
@@ -337,9 +337,9 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
 
         enableAllSubComponents(false);
 
-        initiallyEnabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")); // NON-NLS
+        initiallyEnabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")); // NON-NLS
-        cbEnableEnterpriseArtifactManager.setSelected(initiallyEnabled); // NON-NLS
+        cbEnableEnterpriseArtifactsManager.setSelected(initiallyEnabled); // NON-NLS
-        String selectedPlatformString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.selectedPlatform"); // NON-NLS
+        String selectedPlatformString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.selectedPlatform"); // NON-NLS
         dbConfigured = selectedPlatformString != null;
 
         if (dbConfigured) {
@@ -366,7 +366,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
     boolean valid() {
         tbOops.setText("");
 
-        if (cbEnableEnterpriseArtifactManager.isSelected()) {
+        if (cbEnableEnterpriseArtifactsManager.isSelected()) {
             return validateDatabaseSettings();
         } else {
             return true;
@@ -390,8 +390,8 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
 
     @Override
     public void saveSettings() { // Click OK on Global Settings Panel
-        ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.enabled", Boolean.toString(cbEnableEnterpriseArtifactManager.isSelected())); // NON-NLS
+        ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.enabled", Boolean.toString(cbEnableEnterpriseArtifactsManager.isSelected())); // NON-NLS
-        if (cbEnableEnterpriseArtifactManager.isSelected()) {
+        if (cbEnableEnterpriseArtifactsManager.isSelected()) {
             EamDbPlatformEnum.saveSelectedPlatform();
             EamDb dbManager = EamDb.getInstance();
             dbManager.updateSettings();
@@ -437,13 +437,13 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
         }
 
         if (IngestManager.getInstance().isIngestRunning()) {
-            cbEnableEnterpriseArtifactManager.setEnabled(false);
+            cbEnableEnterpriseArtifactsManager.setEnabled(false);
             tbOops.setText(Bundle.GlobalSettingsPanel_validationErrMsg_ingestRunning());
             enableAllSubComponents(false);
         } else {
-            cbEnableEnterpriseArtifactManager.setEnabled(true);
+            cbEnableEnterpriseArtifactsManager.setEnabled(true);
             tbOops.setText("");
-            enableAllSubComponents(cbEnableEnterpriseArtifactManager.isSelected());
+            enableAllSubComponents(cbEnableEnterpriseArtifactsManager.isSelected());
         }
     }
 
@@ -527,7 +527,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
     }
 
     /**
-     * Enables the "Manage Correlation Types" button.
+     * Enables the "Manage Artifact Types" button.
      *
      * @param enable
      *
@@ -555,7 +555,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i
     private javax.swing.JButton bnImportDatabase;
     private javax.swing.JButton bnManageTags;
     private javax.swing.JButton bnManageTypes;
-    private javax.swing.JCheckBox cbEnableEnterpriseArtifactManager;
+    private javax.swing.JCheckBox cbEnableEnterpriseArtifactsManager;
     private javax.swing.JComboBox<String> comboboxSelectDatabaseType;
     private javax.swing.JScrollPane jScrollPane;
     private javax.swing.JLabel lbDatabasePlatform;

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.form

@@ -144,7 +144,7 @@
     <Component class="javax.swing.JButton" name="okButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -154,7 +154,7 @@
     <Component class="javax.swing.JButton" name="cancelButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -164,14 +164,14 @@
     <Component class="javax.swing.JTextField" name="databasePathTextField">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.databasePathTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.databasePathTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="openButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.openButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.openButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -184,7 +184,7 @@
           <ComponentRef name="buttonGroup1"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.knownRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.knownRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -195,49 +195,49 @@
         </Property>
         <Property name="selected" type="boolean" value="true"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.knownBadRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.knownBadRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbDatabaseType">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabaseType.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabaseType.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbDatabasePath">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabasePath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabasePath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbDatabaseAttribution">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabaseAttribution.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabaseAttribution.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbSourceOrganization">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbSourceOrganization.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbSourceOrganization.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbDatabaseName">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabaseName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabaseName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="lbDatabaseVersion">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabaseVersion.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.lbDatabaseVersion.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -262,21 +262,21 @@
     <Component class="javax.swing.JTextField" name="tfDatabaseName">
       <Properties>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.tfDatabaseName.tooltip" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.tfDatabaseName.tooltip" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JTextField" name="tfDatabaseVersion">
       <Properties>
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="bnNewOrganization">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.bnNewOrganization.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ImportHashDatabaseDialog.bnNewOrganization.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
@@ -47,12 +47,12 @@ import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamGlobalFileInstance;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamGlobalFileInstance;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamGlobalSet;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamGlobalSet;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
  * Instances of this class allow a user to select an existing hash database and
@@ -63,7 +63,7 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog {
     private static final Logger LOGGER = Logger.getLogger(ImportHashDatabaseDialog.class.getName());
 
     private final JFileChooser fileChooser = new JFileChooser();
-    private final static String LAST_FILE_PATH_KEY = "EnterpriseArtifactManagerImport_Path"; // NON-NLS
+    private final static String LAST_FILE_PATH_KEY = "EnterpriseArtifactsManagerImport_Path"; // NON-NLS
     private EamOrganization selectedOrg = null;
     private List<EamOrganization> orgs = null;
     private final Collection<JTextField> textBoxes;
@@ -562,7 +562,7 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog {
             this.globalSetID = globalSetID;
 
             if (!dbManager.isEnabled()) {
-                throw new EamDbException("Enterprise artifact manager database settings were not properly initialized"); // NON-NLS
+                throw new EamDbException("Enterprise artifacts manager database settings were not properly initialized"); // NON-NLS
             }
         }
 

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageArtifactTypesDialog.form

@@ -67,7 +67,7 @@
     <Component class="javax.swing.JButton" name="okButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ManageArtifactTypesDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ManageArtifactTypesDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -77,7 +77,7 @@
     <Component class="javax.swing.JButton" name="cancelButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ManageArtifactTypesDialog.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ManageArtifactTypesDialog.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -123,7 +123,7 @@
           <Color blue="0" green="0" red="ff" type="rgb"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ManageArtifactTypesDialog.lbWarningMsg.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ManageArtifactTypesDialog.lbWarningMsg.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -140,7 +140,7 @@
         <Property name="lineWrap" type="boolean" value="true"/>
         <Property name="rows" type="int" value="5"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ManageArtifactTypesDialog.taInstructionsMsg.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ManageArtifactTypesDialog.taInstructionsMsg.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="wrapStyleWord" type="boolean" value="true"/>
         <Property name="autoscrolls" type="boolean" value="false"/>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageArtifactTypesDialog.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
@@ -32,13 +32,13 @@ import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
- * Dialog to handle management of correlation types handled by the enterprise
+ * Dialog to handle management of artifact types handled by the enterprise
- * artifact manager
+ * artifacts manager
  */
 final class ManageArtifactTypesDialog extends javax.swing.JDialog {
 
@@ -251,7 +251,7 @@ final class ManageArtifactTypesDialog extends javax.swing.JDialog {
                     dbManager.updateCorrelationArtifactType(aType);
                     dispose();
                 } catch (EamDbException ex) {
-                    LOGGER.log(Level.SEVERE, "Failed to updated Enterprise Artifact Manager artifact types with selections from dialog.", ex); // NON-NLS
+                    LOGGER.log(Level.SEVERE, "Failed to updated Enterprise Artifacts Manager artifact types with selections from dialog.", ex); // NON-NLS
                     lbWarningMsg.setText(Bundle.ManageArtifactTypesDialog_okbutton_failure());
                 }
             });

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageTagsDialog.form

@@ -59,7 +59,7 @@
     <Component class="javax.swing.JButton" name="okButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ManageTagsDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ManageTagsDialog.okButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -69,7 +69,7 @@
     <Component class="javax.swing.JButton" name="cancelButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties" key="ManageTagsDialog.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties" key="ManageTagsDialog.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>

Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageTagsDialog.java

@@ -1,5 +1,5 @@
 /*
- * Enterprise Artifact Manager
+ * Enterprise Artifacts Manager
  *
  * Copyright 2015-2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel;
+package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
@@ -32,7 +32,7 @@ import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb;
+import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb;
 
 /**
  * Instances of this class allow a user to select an existing hash database and