diff --git a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED
index a964a1826e..c0d9ef6975 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED
@@ -1,6 +1,6 @@
 CTL_OpenDiscoveryAction=Discovery
 # {0} - dataSourceName
-DataSourceModuleWrapper.exifModule.text=Exif Parser module was not run on data source: {0}\n
+DataSourceModuleWrapper.exifModule.text=Picture Analyzer module was not run on data source: {0}\n
 # {0} - dataSourceName
 DataSourceModuleWrapper.fileTypeModule.text=File Type Identification module was not run on data source: {0}\n
 # {0} - dataSourceName
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java b/Core/src/org/sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java
index 9d48827b30..2f0e30a6f0 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DataSourceModulesWrapper.java
@@ -49,7 +49,7 @@ class DataSourceModulesWrapper {
         "# {0} - dataSourceName",
         "DataSourceModuleWrapper.fileTypeModule.text=File Type Identification module was not run on data source: {0}\n",
         "# {0} - dataSourceName",
-        "DataSourceModuleWrapper.exifModule.text=Exif Parser module was not run on data source: {0}\n"
+        "DataSourceModuleWrapper.exifModule.text=Picture Analyzer module was not run on data source: {0}\n"
     })
     /**
      * Get the message which indicates which modules were not run on this data
diff --git a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED
index 349e005b1b..569370ec6e 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/Bundle.properties-MERGED
@@ -1,3 +1,2 @@
 ExifProcessor.indexError.message=Failed to post EXIF Metadata artifact(s).
-ExifProcessor.module_name=Exif Parser
-ExifProcessor.userContent.description=EXIF metadata exists for this file.
+ExifProcessor.userContent.description=EXIF metadata data exists for this file.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java
index c2c5051050..5a48fcf7bf 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/EXIFProcessor.java
@@ -44,6 +44,7 @@ import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
+import org.sleuthkit.autopsy.modules.pictureanalyzer.PictureAnalyzerIngestModuleFactory;
 import org.sleuthkit.datamodel.Blackboard;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF;
@@ -70,11 +71,10 @@ public class EXIFProcessor implements PictureProcessor {
     @Override
     @NbBundle.Messages({
         "ExifProcessor.indexError.message=Failed to post EXIF Metadata artifact(s).",
-        "ExifProcessor.userContent.description=EXIF metadata exists for this file.",
-        "ExifProcessor.module_name=Exif Parser"
+        "ExifProcessor.userContent.description=EXIF metadata data exists for this file."
     })
     public void process(IngestJobContext context, AbstractFile file) {
-        final String MODULE_NAME = Bundle.ExifProcessor_module_name();
+        final String MODULE_NAME = PictureAnalyzerIngestModuleFactory.getModuleName();
 
         try (BufferedInputStream bin = new BufferedInputStream(new ReadContentInputStream(file));) {