diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
index 98959b35b5..cda1ec1503 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
@@ -84,13 +84,13 @@ IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.jobID=Job ID
 IngestJobTableModel.colName.jobID=Job ID
 IngestJobTableModel.colName.dataSource=Data Source
 IngestJobTableModel.colName.start=Start
-IngestJobTableModel.colName.numProcessed=Num Processed
+IngestJobTableModel.colName.numProcessed=Files Processed
 IngestJobTableModel.colName.filesPerSec=Files/Sec
 IngestJobTableModel.colName.inProgress=In Progress
 IngestJobTableModel.colName.filesQueued=Files Queued
-IngestJobTableModel.colName.dirQueued=Dir Queued
-IngestJobTableModel.colName.rootQueued=Root Queued
-IngestJobTableModel.colName.streamingQueued=Streaming Queued
+IngestJobTableModel.colName.dirQueued=Dirs Queued
+IngestJobTableModel.colName.rootQueued=Roots Queued
+IngestJobTableModel.colName.streamingQueued=Streamed Files Queued
 IngestJobTableModel.colName.dsQueued=DS Queued
 IngestJobTableModel.colName.artifactsQueued=Artifacts Queued
 ModuleTableModel.colName.module=Module
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED
index b6380f2ee5..9c1a1bfa5c 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED
@@ -100,13 +100,13 @@ IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.jobID=Job ID
 IngestJobTableModel.colName.jobID=Job ID
 IngestJobTableModel.colName.dataSource=Data Source
 IngestJobTableModel.colName.start=Start
-IngestJobTableModel.colName.numProcessed=Num Processed
+IngestJobTableModel.colName.numProcessed=Files Processed
 IngestJobTableModel.colName.filesPerSec=Files/Sec
 IngestJobTableModel.colName.inProgress=In Progress
 IngestJobTableModel.colName.filesQueued=Files Queued
-IngestJobTableModel.colName.dirQueued=Dir Queued
-IngestJobTableModel.colName.rootQueued=Root Queued
-IngestJobTableModel.colName.streamingQueued=Streaming Queued
+IngestJobTableModel.colName.dirQueued=Dirs Queued
+IngestJobTableModel.colName.rootQueued=Roots Queued
+IngestJobTableModel.colName.streamingQueued=Streamed Files Queued
 IngestJobTableModel.colName.dsQueued=DS Queued
 IngestJobTableModel.colName.artifactsQueued=Artifacts Queued
 ModuleTableModel.colName.module=Module
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java
index 850ff26294..4fd449ff47 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java
@@ -678,7 +678,12 @@ final class IngestJobPipeline {
              * GUI.
              */
             if (hasFileIngestModules()) {
-                long filesToProcess = dataSource.accept(new GetFilesCountVisitor());;
+                long filesToProcess;
+                if (files.isEmpty()) {
+                    filesToProcess = dataSource.accept(new GetFilesCountVisitor());
+                } else {
+                    filesToProcess = files.size();
+                }
                 synchronized (fileIngestProgressLock) {
                     estimatedFilesToProcess = filesToProcess;
                 }
@@ -777,20 +782,22 @@ final class IngestJobPipeline {
             stage = IngestJobPipeline.Stages.FIRST_STAGE;
             currentDataSourceIngestPipeline = firstStageDataSourceIngestPipeline;
 
-            /*
-             * Do a count of the files the data source processor has added to
-             * the case database. This estimate will be used for ingest progress
-             * snapshots and for the file ingest progress bar if running with a
-             * GUI.
-             */
-            long filesToProcess = dataSource.accept(new GetFilesCountVisitor()) - processedFiles;
-            synchronized (fileIngestProgressLock) {
-                if (processedFiles <= filesToProcess) {
-                    filesToProcess -= processedFiles;
-                }
-                estimatedFilesToProcess = filesToProcess;
-                if (doUI && fileIngestProgressBar != null) {
-                    fileIngestProgressBar.switchToDeterminate((int) estimatedFilesToProcess);
+            if (hasFileIngestModules()) {
+                /*
+                 * Do a count of the files the data source processor has added
+                 * to the case database. This estimate will be used for ingest
+                 * progress snapshots and for the file ingest progress bar if
+                 * running with a GUI.
+                 */
+                long filesToProcess = dataSource.accept(new GetFilesCountVisitor()) - processedFiles;
+                synchronized (fileIngestProgressLock) {
+                    if (processedFiles <= filesToProcess) {
+                        filesToProcess -= processedFiles;
+                    }
+                    estimatedFilesToProcess = filesToProcess;
+                    if (doUI && fileIngestProgressBar != null) {
+                        fileIngestProgressBar.switchToDeterminate((int) estimatedFilesToProcess);
+                    }
                 }
             }
 
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestProgressSnapshotPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestProgressSnapshotPanel.java
index eb3f7e614f..b15f5723b5 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestProgressSnapshotPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestProgressSnapshotPanel.java
@@ -167,28 +167,19 @@ class IngestProgressSnapshotPanel extends javax.swing.JPanel {
 
         private static final long serialVersionUID = 1L;
 
-        private final String[] columnNames = {NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.jobID"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.dataSource"),
+        private final String[] columnNames = {
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.jobID"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.dataSource"),
             NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.start"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.numProcessed"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.filesPerSec"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.inProgress"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.filesQueued"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.dirQueued"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.rootQueued"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.streamingQueued"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.dsQueued"),
-            NbBundle.getMessage(this.getClass(),
-            "IngestJobTableModel.colName.artifactsQueued")};
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.numProcessed"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.filesPerSec"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.inProgress"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.filesQueued"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.dirQueued"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.rootQueued"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.streamingQueued"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.dsQueued"),
+            NbBundle.getMessage(this.getClass(), "IngestJobTableModel.colName.artifactsQueued")};
 
         private List<Snapshot> jobSnapshots;