diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java
index d7eab67f14..ce1834ea66 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java
@@ -445,7 +445,7 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D
     }
 
     /**
-     * Query the CDB for artifact instances from other cases correlated to the
+     * Query the db for artifact instances from other cases correlated to the
      * given enterprise artifact manager artifact.
      *
      * @param eamArtifact The artifact to correlate against
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java
index ed8d117a19..529e0f2caf 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java
@@ -131,11 +131,11 @@ public class SqliteEamDb extends AbstractSqlEamDb {
     }
 
     /**
-     * Verify the CDB directory exists. If it doesn't, then create it.
+     * Verify the EAM db directory exists. If it doesn't, then create it.
      *
      * @throws EamDbException
      */
-    private void verifyCDBDirectory() throws EamDbException {
+    private void verifyDBDirectory() throws EamDbException {
         File dbDir = new File(dbSettings.getDbDirectory());
         if (!dbDir.exists()) {
             LOGGER.log(Level.INFO, "sqlite directory does not exist, creating it at {0}.", dbSettings.getDbDirectory()); // NON-NLS
@@ -339,7 +339,7 @@ public class SqliteEamDb extends AbstractSqlEamDb {
             }
 
             if (connectionPool == null) {
-                verifyCDBDirectory();
+                verifyDBDirectory();
                 setupConnectionPool();
                 confirmDatabaseSchema();
             }
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java
index 2168c72e72..9a73466f9d 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java
@@ -40,7 +40,7 @@ public final class SqliteEamDbSettings {
 
     private final static Logger LOGGER = Logger.getLogger(SqliteEamDbSettings.class.getName());
     private final String DEFAULT_DBNAME = "enterpriseartifactmanagerdb.db"; // NON-NLS
-    private final String DEFAULT_DBDIRECTORY = System.getProperty("user.home") + File.separator + "Autopsy" + File.separator + "cdb"; // NON-NLS
+    private final String DEFAULT_DBDIRECTORY = System.getProperty("user.home") + File.separator + "Autopsy" + File.separator + "eamdb"; // NON-NLS
     private final int DEFAULT_BULK_THRESHHOLD = 1000;
     private final String DEFAULT_BAD_TAGS = "Evidence"; // NON-NLS
     private final String JDBC_DRIVER = "org.sqlite.JDBC"; // NON-NLS
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java
index 7e9a90386f..fadbc33e13 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java
@@ -95,7 +95,7 @@ class IngestModule implements FileIngestModule {
 
         EamArtifact eamArtifact = new EamArtifact(filesType, md5);
 
-        // If unknown to both the hash module and as a globally known artifact in the CDB, correlate to other cases
+        // If unknown to both the hash module and as a globally known artifact in the EAM DB, correlate to other cases
         if (af.getKnown() == TskData.FileKnown.UNKNOWN) {
             // query db for artifact instances having this MD5 and knownStatus = "Bad".
             try {
@@ -194,7 +194,7 @@ class IngestModule implements FileIngestModule {
         // and image exist in the DB before we associate artifacts with it.
         if (refCounter.incrementAndGet(jobId)
                 == 1) {
-            // ensure we have this data source in the CDB
+            // ensure we have this data source in the EAM DB
             try {
                 if (null == dbManager.getDataSourceDetails(eamDataSource.getDeviceID())) {
                     dbManager.newDataSource(eamDataSource);
@@ -204,7 +204,7 @@ class IngestModule implements FileIngestModule {
                 throw new IngestModuleException("Error creating new data source in startUp.", ex); // NON-NLS
             }
 
-            // ensure we have this case defined in the CDB
+            // ensure we have this case defined in the EAM DB
             EamCase existingCase;
             Case curCase = Case.getCurrentCase();
             EamCase curCeCase = new EamCase(
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java
index bdeb79c0c7..614e1905d7 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java
@@ -91,7 +91,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog {
         bnTestDatabase.setEnabled(false);
     }
 
-    @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.fileNameExtFilter.text=CDB Database File"})
+    @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.fileNameExtFilter.text=SQLite Database File"})
     private void customizeFileChooser() {
         fcDatabasePath.setDragEnabled(false);
         fcDatabasePath.setFileSelectionMode(JFileChooser.FILES_ONLY);