diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
index 67fcdddef0..97f504c588 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
@@ -82,6 +82,7 @@ import org.alfresco.jlan.smb.server.SMBSrvSession;
 import org.alfresco.jlan.util.MemorySize;
 import org.alfresco.jlan.util.WildCard;
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.executer.ContentMetadataExtracter;
 import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.node.archive.NodeArchiveService;
@@ -4267,7 +4268,7 @@ public class ContentDiskDriver extends AlfrescoTxDiskDriver implements DiskInter
         }
 
         // Extract metadata pending change for ALF-5082
-        Action action = getActionService().createAction("extract-metadata");
+        Action action = getActionService().createAction(ContentMetadataExtracter.EXECUTOR_NAME);
         if(action != null)
         {
             getActionService().executeAction(action, toNode);
diff --git a/source/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java b/source/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
index 12910d11f8..023501108b 100644
--- a/source/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
@@ -55,6 +55,8 @@ public class ContentMetadataExtracter extends ActionExecuterAbstractBase
 {
     private static Log logger = LogFactory.getLog(ContentMetadataExtracter.class);
     
+    public static final String EXECUTOR_NAME = "extract-metadata";
+    
     private NodeService nodeService;
     private ContentService contentService;
     private DictionaryService dictionaryService;
diff --git a/source/java/org/alfresco/repo/imap/ImapContentPolicy.java b/source/java/org/alfresco/repo/imap/ImapContentPolicy.java
index 0e02370dd9..0ddf71aca1 100644
--- a/source/java/org/alfresco/repo/imap/ImapContentPolicy.java
+++ b/source/java/org/alfresco/repo/imap/ImapContentPolicy.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.Map;
 
 import org.alfresco.model.ImapModel;
+import org.alfresco.repo.action.executer.ContentMetadataExtracter;
 import org.alfresco.repo.copy.CopyBehaviourCallback;
 import org.alfresco.repo.copy.CopyDetails;
 import org.alfresco.repo.copy.CopyServicePolicies.OnCopyNodePolicy;
@@ -78,7 +79,7 @@ public class ImapContentPolicy
         // ensure the aspect is the one we expect
         if (aspectTypeQName.equals(ImapModel.ASPECT_IMAP_CONTENT))
         {
-            Action action = getActionService().createAction("extract-metadata");
+            Action action = getActionService().createAction(ContentMetadataExtracter.EXECUTOR_NAME);
             if(action != null)
             {
                 getActionService().executeAction(action, nodeRef);