diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java
index 1a6c65022c..b57f20abdf 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
index 8e966f1326..6ee8e785f8 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
@@ -100,4 +100,4 @@ IngestJobTableModel.colName.rootQueued=Root Queued
 IngestJobTableModel.colName.dsQueued=DS Queued
 ModuleTableModel.colName.module=Module
 ModuleTableModel.colName.duration=Duration
-UpdateIngestImages.menuItem.empty=-Empty-
+RunIngestSubMenu.menuItem.empty=-Empty-
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/RunIngestAction.java b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestAction.java
index e703de0704..0bcd23b8b9 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/RunIngestAction.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -72,14 +72,14 @@ public final class RunIngestAction extends CallableSystemAction implements Prese
     }
     
     /**
-     * Create a sublist of images updated by UpdateIngestImages
+     * Create a sublist of images updated by RunIngestSubMenu
      * Each has an action to perform Ingest Modules on it.
      *
      * @return the images sublist created.
      */
     @Override
     public JMenuItem getMenuPresenter() {
-        JMenuItem sublist = new UpdateIngestImages();
+        JMenuItem sublist = new RunIngestSubMenu();
         sublist.setVisible(true);
         return sublist;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/MenuImageAction.java b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesAction.java
similarity index 88%
rename from Core/src/org/sleuthkit/autopsy/ingest/MenuImageAction.java
rename to Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesAction.java
index bdcb1dd2d4..50a2319529 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/MenuImageAction.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,8 +19,8 @@
 package org.sleuthkit.autopsy.ingest;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.Collections;
+import javax.swing.AbstractAction;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.Image;
 
@@ -28,14 +28,14 @@ import org.sleuthkit.datamodel.Image;
  * This class is used to add the action to the run ingest modules menu item. 
  * When the image is pressed, it should open the wizard for ingest modules.
  */
-class MenuImageAction implements ActionListener {
+final class RunIngestModulesAction extends AbstractAction {
 
     Image image;
 
     /**
      * the constructor
      */
-    public MenuImageAction(Image image) {
+    public RunIngestModulesAction(Image image) {
         this.image = image;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesDialog.java b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesDialog.java
index 4b81506603..da491fd22a 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestModulesDialog.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2013-2014 Basis Technology Corp.
+ * Copyright 2013-2015 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/UpdateIngestImages.java b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestSubMenu.java
similarity index 90%
rename from Core/src/org/sleuthkit/autopsy/ingest/UpdateIngestImages.java
rename to Core/src/org/sleuthkit/autopsy/ingest/RunIngestSubMenu.java
index a21922ccfd..f4db5d47e8 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/UpdateIngestImages.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/RunIngestSubMenu.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2015 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 /**
  * This class is used to populate the list of open images to run ingest on them
  */
-class UpdateIngestImages extends JMenuItem implements DynamicMenuContent {
+final class RunIngestSubMenu extends JMenuItem implements DynamicMenuContent {
         
     /**
      * Creates main menu/popup menu items. It's called each time a popup menu 
@@ -44,7 +44,6 @@ class UpdateIngestImages extends JMenuItem implements DynamicMenuContent {
     @Override
     public JComponent[] getMenuPresenters() {
         List<Image> images = new ArrayList<>();
-        JComponent[] comps = new JComponent[1];
         
         try {
             SleuthkitCase sk = Case.getCurrentCase().getSleuthkitCase();    
@@ -55,14 +54,14 @@ class UpdateIngestImages extends JMenuItem implements DynamicMenuContent {
         } catch (TskCoreException e) {
             System.out.println("Exception getting images: " + e.getMessage());
 	}
-        comps = new JComponent[images.size()];
+        JComponent[] comps = new JComponent[images.size()];
 
         // Add Images to the component list
         for (int i = 0; i < images.size(); i++) {
             String action = images.get(i).getName();
             JMenuItem menuItem = new JMenuItem(action);
             menuItem.setActionCommand(action.toUpperCase());
-            menuItem.addActionListener(new MenuImageAction(images.get(i)));
+            menuItem.addActionListener(new RunIngestModulesAction(images.get(i)));
             comps[i] = menuItem;
         }
         // If no images are open, create a disabled empty menu
@@ -75,7 +74,7 @@ class UpdateIngestImages extends JMenuItem implements DynamicMenuContent {
     // returns a disabled empty menu
     private JComponent[] getEmpty() {
         JComponent[] comps = new JComponent[1];
-        JMenuItem emptyMenu = new JMenuItem(NbBundle.getMessage(UpdateIngestImages.class, "UpdateIngestImages.menuItem.empty"));
+        JMenuItem emptyMenu = new JMenuItem(NbBundle.getMessage(RunIngestSubMenu.class, "RunIngestSubMenu.menuItem.empty"));
         comps[0] = emptyMenu;
         comps[0].setEnabled(false);
         return comps;