diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
index 1d2b1ce1e2..a095341c37 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
@@ -319,7 +319,7 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
 
         // Display warning if there is one (but don't disable "next" button)
         try {
-            if (false == PathValidator.isValid(path, Case.getCurrentCaseThrows().getCaseType())) {
+            if (false == PathValidator.isValidForMultiUserCase(path, Case.getCurrentCaseThrows().getCaseType())) {
                 pathErrorLabel.setVisible(true);
                 pathErrorLabel.setText(Bundle.ImageFilePanel_pathValidation_dataSourceOnCDriveError());
             }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
index ef985db2dd..6703b16dc5 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
@@ -290,7 +290,7 @@ final class LocalFilesPanel extends javax.swing.JPanel {
             final Case.CaseType currentCaseType = Case.getCurrentCaseThrows().getCaseType();
 
             for (String currentPath : pathsList) {
-                if (!PathValidator.isValid(currentPath, currentCaseType)) {
+                if (!PathValidator.isValidForMultiUserCase(currentPath, currentCaseType)) {
                     errorLabel.setVisible(true);
                     errorLabel.setText(Bundle.LocalFilesPanel_pathValidation_dataSourceOnCDriveError());
                     return;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LogicalEvidenceFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LogicalEvidenceFilePanel.java
index 5e11d5dfa0..103fd8fd6c 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LogicalEvidenceFilePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LogicalEvidenceFilePanel.java
@@ -191,7 +191,7 @@ final class LogicalEvidenceFilePanel extends javax.swing.JPanel implements Docum
         }
         // display warning if there is one (but don't disable "next" button)
         try {
-            if (!PathValidator.isValid(path, Case.getCurrentCaseThrows().getCaseType())) {
+            if (!PathValidator.isValidForMultiUserCase(path, Case.getCurrentCaseThrows().getCaseType())) {
                 errorLabel.setVisible(true);
                 errorLabel.setText(Bundle.LogicalEvidenceFilePanel_pathValidation_dataSourceOnCDriveError());
                 return false;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
index 2257573cb7..8b551ce4ec 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
@@ -152,7 +152,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
          */
         caseParentDirWarningLabel.setVisible(false);
         String parentDir = getCaseParentDir();
-        if (!PathValidator.isValid(parentDir, getCaseType())) {
+        if (!PathValidator.isValidForMultiUserCase(parentDir, getCaseType())) {
             caseParentDirWarningLabel.setVisible(true);
             caseParentDirWarningLabel.setText(NbBundle.getMessage(this.getClass(), "NewCaseVisualPanel1.CaseFolderOnCDriveError.text"));
         }
@@ -161,7 +161,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
          * Check the base case directory if it can persist data and show a 
          * warning if it is a wrong choice
          */
-        if(!PathValidator.isCasedataPersistable(parentDir)){
+        if(!PathValidator.isValidForRunningOnTarget(parentDir)){
             caseParentDirWarningLabel.setVisible(true);
             if(PlatformUtil.isWindowsOS()){
                 caseParentDirWarningLabel.setText(NbBundle.getMessage(this.getClass(), "NewCaseVisualPanel1.CaseFolderOnInternalDriveWindowsError.text" ));
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/PathValidator.java b/Core/src/org/sleuthkit/autopsy/coreutils/PathValidator.java
index 75f7fcc2a8..71c8ec292c 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/PathValidator.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/PathValidator.java
@@ -32,7 +32,7 @@ public final class PathValidator {
     private static final Pattern driveLetterPattern = Pattern.compile("^[Cc]:.*$");
     private static final Pattern unixMediaDrivePattern = Pattern.compile("^\\/(media|mnt)\\/.*$");
 
-    public static boolean isValid(String path, Case.CaseType caseType) {
+    public static boolean isValidForMultiUserCase(String path, Case.CaseType caseType) {
 
         if (caseType == Case.CaseType.MULTI_USER_CASE) {
             // check that path is not on "C:" drive
@@ -46,7 +46,7 @@ public final class PathValidator {
         return true;
     }
     
-    public static boolean isCasedataPersistable(String path) {
+    public static boolean isValidForRunningOnTarget(String path) {
         if(checkForLiveAutopsy()) {
             if(PlatformUtil.isWindowsOS()) {
                 if(pathOnCDrive(path)){
diff --git a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/RawDSInputPanel.java b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/RawDSInputPanel.java
index 431d71d19f..6bee921a91 100644
--- a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/RawDSInputPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/RawDSInputPanel.java
@@ -305,7 +305,7 @@ final class RawDSInputPanel extends JPanel implements DocumentListener {
         "RawDSInputPanel.noOpenCase.errMsg=Exception while getting open case."})
     private void warnIfPathIsInvalid(String path) {
         try {
-        if (!PathValidator.isValid(path, Case.getCurrentCaseThrows().getCaseType())) {
+        if (!PathValidator.isValidForMultiUserCase(path, Case.getCurrentCaseThrows().getCaseType())) {
             errorLabel.setVisible(true);
             errorLabel.setText(Bundle.RawDSInputPanel_error_text());
         }
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveFilePanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveFilePanel.java
index 3a8e844812..cbe39cac1b 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveFilePanel.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveFilePanel.java
@@ -218,7 +218,7 @@ class ArchiveFilePanel extends JPanel implements DocumentListener {
 
         // display warning if there is one (but don't disable "next" button)
         try {
-            if (false == PathValidator.isValid(path, Case.getCurrentCaseThrows().getCaseType())) {
+            if (false == PathValidator.isValidForMultiUserCase(path, Case.getCurrentCaseThrows().getCaseType())) {
                 errorLabel.setVisible(true);
                 errorLabel.setText(Bundle.DataSourceOnCDriveError_text());
             }
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/MemoryDSInputPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/MemoryDSInputPanel.java
index a26136fd1a..620c4ec49f 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/MemoryDSInputPanel.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/MemoryDSInputPanel.java
@@ -421,7 +421,7 @@ final class MemoryDSInputPanel extends JPanel implements DocumentListener {
     })
     private void warnIfPathIsInvalid(String path) {
         try {
-            if (!PathValidator.isValid(path, Case.getCurrentCaseThrows().getCaseType())) {
+            if (!PathValidator.isValidForMultiUserCase(path, Case.getCurrentCaseThrows().getCaseType())) {
                 errorLabel.setVisible(true);
                 errorLabel.setText(Bundle.MemoryDSInputPanel_errorMsg_dataSourcePathOnCdrive());
             }