diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
index 5c071efe7b..fe1b6cd476 100644
--- a/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
@@ -1,6 +1,5 @@
 package org.zanata.action;
 
-import java.io.InputStream;
 import java.io.Serializable;
 
 import org.jboss.seam.ScopeType;
@@ -12,13 +11,9 @@
 import org.jboss.seam.annotations.security.Restrict;
 import org.jboss.seam.security.Identity;
 import org.zanata.ApplicationConfiguration;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 import org.zanata.async.tasks.ZipFileBuildTask;
 import org.zanata.dao.ProjectIterationDAO;
-import org.zanata.process.IterationZipFileBuildProcess;
-import org.zanata.process.IterationZipFileBuildProcessHandle;
-import org.zanata.process.ProcessHandle;
-import org.zanata.service.ProcessManagerService;
 import org.zanata.service.impl.AsyncTaskManagerServiceImpl;
 
 @Name("projectIterationZipFileAction")
@@ -43,7 +38,7 @@ public class ProjectIterationZipFileAction implements Serializable
 
    private String localeId;
 
-   private AsyncHandle<String> zipFilePrepHandle;
+   private AsyncTaskHandle<String> zipFilePrepHandle;
 
    @Begin(join = true)
    @Restrict("#{s:hasPermission(projectIterationZipFileAction.projectIteration, 'download-all')}")
@@ -104,12 +99,12 @@ public void setLocaleId(String localeId)
       this.localeId = localeId;
    }
 
-   public AsyncHandle<String> getZipFilePrepHandle()
+   public AsyncTaskHandle<String> getZipFilePrepHandle()
    {
       return zipFilePrepHandle;
    }
 
-   public void setZipFilePrepHandle(AsyncHandle<String> zipFilePrepHandle)
+   public void setZipFilePrepHandle(AsyncTaskHandle<String> zipFilePrepHandle)
    {
       this.zipFilePrepHandle = zipFilePrepHandle;
    }
diff --git a/zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java b/zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
index f9fc940cd9..3372eb048a 100644
--- a/zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
+++ b/zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
@@ -14,7 +14,7 @@
 import org.joda.time.Period;
 import org.joda.time.format.PeriodFormatter;
 import org.joda.time.format.PeriodFormatterBuilder;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 
 @Name("reindexAction")
 @Scope(ScopeType.APPLICATION)
@@ -114,7 +114,7 @@ public String getCurrentClass()
 
    public boolean isError()
    {
-      AsyncHandle<Boolean> taskHandle = reindexAsync.getProcessHandle();
+      AsyncTaskHandle<Boolean> taskHandle = reindexAsync.getProcessHandle();
       if( taskHandle == null )
       {
          return false;
diff --git a/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java b/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
index b8cd2e90c9..54af998e8a 100644
--- a/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
+++ b/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
@@ -18,9 +18,8 @@
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.Startup;
 import org.jboss.seam.log.Log;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 import org.zanata.async.AsyncTask;
-import org.zanata.async.SimpleAsyncTask;
 import org.zanata.model.HAccount;
 import org.zanata.model.HGlossaryEntry;
 import org.zanata.model.HGlossaryTerm;
@@ -34,8 +33,6 @@
 import org.zanata.search.SimpleClassIndexingStrategy;
 import org.zanata.service.impl.AsyncTaskManagerServiceImpl;
 
-import lombok.AllArgsConstructor;
-
 @Name("reindexAsync")
 @Scope(ScopeType.APPLICATION)
 @Startup
@@ -59,7 +56,7 @@ public class ReindexAsyncBean implements Serializable
    private LinkedHashMap<Class<?>, ReindexClassOptions> indexingOptions = new LinkedHashMap<Class<?>, ReindexClassOptions>();
    private Class<?> currentClass;
 
-   private AsyncHandle<Boolean> handle;
+   private AsyncTaskHandle<Boolean> handle;
 
    @Create
    public void create()
@@ -119,7 +116,7 @@ public List<ReindexClassOptions> getReindexOptions()
       return result;
    }
 
-   public AsyncHandle<Boolean> getProcessHandle()
+   public AsyncTaskHandle<Boolean> getProcessHandle()
    {
       return handle;
    }
@@ -192,16 +189,16 @@ ClassIndexer getIndexer(Class<?> clazz)
     * Private reindex Asynchronous task.
     * NB: Separate from the main Bean class as it is not recommended to reuse async tasks.
     */
-   private class ReindexTask implements AsyncTask<Boolean, AsyncHandle<Boolean>>
+   private class ReindexTask implements AsyncTask<Boolean, AsyncTaskHandle<Boolean>>
    {
-      private AsyncHandle<Boolean> handle;
+      private AsyncTaskHandle<Boolean> handle;
 
       @Override
-      public AsyncHandle<Boolean> getHandle()
+      public AsyncTaskHandle<Boolean> getHandle()
       {
          if( handle == null )
          {
-            handle = new AsyncHandle<Boolean>();
+            handle = new AsyncTaskHandle<Boolean>();
             handle.setMaxProgress( getTotalOperations() );
          }
          return handle;
diff --git a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
index 61e0b8716b..119daa6b32 100644
--- a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
@@ -31,12 +31,12 @@
 import org.jboss.seam.annotations.security.Restrict;
 import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.framework.EntityHome;
+import org.zanata.async.AsyncTaskHandle;
+import org.zanata.async.SimpleAsyncTask;
 import org.zanata.dao.TransMemoryDAO;
 import org.zanata.model.tm.TransMemory;
-import org.zanata.process.ProcessHandle;
-import org.zanata.process.RunnableProcess;
-import org.zanata.service.ProcessManagerService;
 import org.zanata.service.SlugEntityService;
+import org.zanata.service.impl.AsyncTaskManagerServiceImpl;
 import com.google.common.base.Optional;
 
 import lombok.AllArgsConstructor;
@@ -60,7 +60,7 @@ public class TranslationMemoryAction extends EntityHome<TransMemory>
    private SlugEntityService slugEntityServiceImpl;
 
    @In
-   private ProcessManagerService processManagerServiceImpl;
+   private AsyncTaskManagerServiceImpl asyncTaskManagerServiceImpl;
 
    private List<TransMemory> transMemoryList;
 
@@ -91,17 +91,17 @@ public boolean validateSlug(String slug, String componentId)
 
    public void clearTransMemory(final String transMemorySlug)
    {
-      processManagerServiceImpl.startProcess(
-            new RunnableProcess<ProcessHandle>()
+      asyncTaskManagerServiceImpl.startTask(
+            new SimpleAsyncTask<Void>()
             {
                @Override
-               protected void run(ProcessHandle handle) throws Throwable
+               public Void call() throws Exception
                {
                   TransMemoryDAO transMemoryDAO = (TransMemoryDAO) Component.getInstance(TransMemoryDAO.class);
                   transMemoryDAO.deleteTransMemoryContents(transMemorySlug);
+                  return null;
                }
             },
-            new ProcessHandle(),
             new ClearTransMemoryProcessKey(transMemorySlug)
       );
 
@@ -125,8 +125,9 @@ public void deleteTransMemory(String transMemorySlug)
 
    public boolean isTransMemoryBeingCleared(String transMemorySlug)
    {
-      ProcessHandle handle = processManagerServiceImpl.getProcessHandle( new ClearTransMemoryProcessKey(transMemorySlug) );
-      return handle != null && !handle.isFinished();
+      AsyncTaskHandle<Void> handle =
+            asyncTaskManagerServiceImpl.getHandleByKey(new ClearTransMemoryProcessKey(transMemorySlug));
+      return handle != null && !handle.isDone();
    }
 
    public boolean deleteTransMemoryDisabled(String transMemorySlug)
diff --git a/zanata-war/src/main/java/org/zanata/async/AsyncTask.java b/zanata-war/src/main/java/org/zanata/async/AsyncTask.java
index b8cb8fd904..b59c714b46 100644
--- a/zanata-war/src/main/java/org/zanata/async/AsyncTask.java
+++ b/zanata-war/src/main/java/org/zanata/async/AsyncTask.java
@@ -25,7 +25,7 @@
 /**
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
-public interface AsyncTask<V, H extends AsyncHandle<V>> extends Callable<V>
+public interface AsyncTask<V, H extends AsyncTaskHandle<V>> extends Callable<V>
 {
 
    H getHandle();
diff --git a/zanata-war/src/main/java/org/zanata/async/AsyncHandle.java b/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
similarity index 96%
rename from zanata-war/src/main/java/org/zanata/async/AsyncHandle.java
rename to zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
index b74430a3c1..dd8c7c5fb7 100644
--- a/zanata-war/src/main/java/org/zanata/async/AsyncHandle.java
+++ b/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
@@ -33,7 +33,7 @@
  *
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
-public class AsyncHandle<V> extends AbstractFuture<V>
+public class AsyncTaskHandle<V> extends AbstractFuture<V>
 {
    @Getter @Setter
    public int maxProgress = 100;
diff --git a/zanata-war/src/main/java/org/zanata/async/AsyncUtils.java b/zanata-war/src/main/java/org/zanata/async/AsyncUtils.java
index 2692ee246c..d1d33ea63e 100644
--- a/zanata-war/src/main/java/org/zanata/async/AsyncUtils.java
+++ b/zanata-war/src/main/java/org/zanata/async/AsyncUtils.java
@@ -39,7 +39,7 @@ public class AsyncUtils
 {
    private static final String ASYNC_HANDLE_NAME = "__ASYNC_HANDLE__";
 
-   public static final void outject( AsyncHandle<?> handle, ScopeType scopeType)
+   public static final void outject( AsyncTaskHandle<?> handle, ScopeType scopeType)
    {
       if(scopeType.isContextActive())
       {
@@ -51,12 +51,12 @@ public static final void outject( AsyncHandle<?> handle, ScopeType scopeType)
       }
    }
 
-   public static final <H extends AsyncHandle> Optional<H> getEventAsyncHandle( Class<H> type )
+   public static final <H extends AsyncTaskHandle> Optional<H> getEventAsyncHandle( Class<H> type )
    {
       return getAsyncHandle(ScopeType.EVENT, type);
    }
 
-   public static final <H extends AsyncHandle> Optional<H> getAsyncHandle(ScopeType scopeType, Class<H> type)
+   public static final <H extends AsyncTaskHandle> Optional<H> getAsyncHandle(ScopeType scopeType, Class<H> type)
    {
       if(scopeType.isContextActive())
       {
diff --git a/zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java b/zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
index a1dce06b9f..458a8d8b19 100644
--- a/zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
+++ b/zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
@@ -21,7 +21,6 @@
 package org.zanata.async;
 
 import java.security.Principal;
-import java.util.Collection;
 
 import javax.security.auth.Subject;
 
@@ -30,7 +29,6 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.async.Asynchronous;
-import org.jboss.seam.contexts.Context;
 import org.jboss.seam.security.Identity;
 import org.jboss.seam.security.RunAsOperation;
 
@@ -49,7 +47,7 @@
 public class AsynchronousTaskExecutor
 {
    @Asynchronous
-   public <V, H extends AsyncHandle<V>> void runAsynchronously(final AsyncTask<V, H> task, final Identity runAs)
+   public <V, H extends AsyncTaskHandle<V>> void runAsynchronously(final AsyncTask<V, H> task, final Identity runAs)
    {
       AsyncUtils.outject(task.getHandle(), ScopeType.EVENT);
 
diff --git a/zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java b/zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
index bac954cdb3..2fd957635d 100644
--- a/zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
+++ b/zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
@@ -24,12 +24,12 @@
 
 /**
  * Simple default partial implementation of an async task that produces a bare bones
- * {@link AsyncHandle} that tracks progress.
+ * {@link AsyncTaskHandle} that tracks progress.
  *
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
-public abstract class SimpleAsyncTask<V> implements AsyncTask<V, AsyncHandle<V>>
+public abstract class SimpleAsyncTask<V> implements AsyncTask<V, AsyncTaskHandle<V>>
 {
    @Getter
-   private final AsyncHandle<V> handle = new AsyncHandle<V>();
+   private final AsyncTaskHandle<V> handle = new AsyncTaskHandle<V>();
 }
diff --git a/zanata-war/src/main/java/org/zanata/async/TaskExecutor.java b/zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
index 441ed3c50e..b549db522d 100644
--- a/zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
+++ b/zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
@@ -20,18 +20,13 @@
  */
 package org.zanata.async;
 
-import java.util.Set;
-
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.contexts.Context;
 import org.jboss.seam.security.Identity;
 
-import com.google.common.collect.Sets;
-
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -53,7 +48,7 @@ public class TaskExecutor
     *
     * @param handle The handle to be used for the running process.
     */
-   public <V, H extends AsyncHandle<V>> AsyncHandle<V> startTask(AsyncTask<V, H> task)
+   public <V, H extends AsyncTaskHandle<V>> AsyncTaskHandle<V> startTask(AsyncTask<V, H> task)
    {
       H handle = task.getHandle();
       if( handle == null )
diff --git a/zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java b/zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
index fbea40fa81..dcf7fdb0bc 100644
--- a/zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
+++ b/zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
@@ -20,16 +20,14 @@
  */
 package org.zanata.async;
 
-import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.Setter;
 
 /**
  * An Asynchronous handle that has facility methods to time the duration of the task.
  *
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
-public class TimedAsyncHandle<V> extends AsyncHandle<V>
+public class TimedAsyncHandle<V> extends AsyncTaskHandle<V>
 {
    @Getter
    private long startTime;
diff --git a/zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java b/zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
index 24b6dc8c7a..d9d06ccb86 100644
--- a/zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
+++ b/zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
@@ -24,7 +24,6 @@
 
 import org.jboss.seam.Component;
 import org.jboss.seam.security.Identity;
-import org.zanata.async.AsyncHandle;
 import org.zanata.async.AsyncTask;
 import org.zanata.async.TimedAsyncHandle;
 import org.zanata.model.HCopyTransOptions;
@@ -36,7 +35,6 @@
 import org.zanata.service.impl.CopyTransServiceImpl;
 import org.zanata.service.impl.LocaleServiceImpl;
 
-import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java b/zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
index 6c38890579..e22a982ddb 100644
--- a/zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
+++ b/zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
@@ -21,11 +21,10 @@
 package org.zanata.async.tasks;
 
 import com.google.common.base.Optional;
-import lombok.AllArgsConstructor;
 import org.jboss.seam.Component;
 import org.zanata.ApplicationConfiguration;
 import org.zanata.adapter.po.PoWriter2;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 import org.zanata.async.AsyncTask;
 import org.zanata.common.LocaleId;
 import org.zanata.dao.DocumentDAO;
@@ -43,9 +42,7 @@
 import org.zanata.service.impl.FileSystemServiceImpl;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -59,7 +56,7 @@
  *
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
-public class ZipFileBuildTask implements AsyncTask<String, AsyncHandle<String>>
+public class ZipFileBuildTask implements AsyncTask<String, AsyncTaskHandle<String>>
 {
 
    private final String projectSlug;
@@ -68,7 +65,7 @@ public class ZipFileBuildTask implements AsyncTask<String, AsyncHandle<String>>
    private final String userName;
    private final boolean isOfflinePo;
 
-   private AsyncHandle<String> handle;
+   private AsyncTaskHandle<String> handle;
 
    public ZipFileBuildTask(String projectSlug, String iterationSlug, String localeId, String userName, boolean offlinePo)
    {
@@ -80,7 +77,7 @@ public ZipFileBuildTask(String projectSlug, String iterationSlug, String localeI
    }
 
    @Override
-   public AsyncHandle<String> getHandle()
+   public AsyncTaskHandle<String> getHandle()
    {
       if( handle == null )
       {
@@ -89,9 +86,9 @@ public AsyncHandle<String> getHandle()
       return handle;
    }
 
-   private AsyncHandle<String> buildHandle()
+   private AsyncTaskHandle<String> buildHandle()
    {
-      AsyncHandle<String> newHandle = new AsyncHandle<String>();
+      AsyncTaskHandle<String> newHandle = new AsyncTaskHandle<String>();
 
       // Max documents to process
       DocumentDAO documentDAO = (DocumentDAO) Component.getInstance(DocumentDAO.class);
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
index 205b743845..edc1308f1d 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
@@ -35,7 +35,7 @@
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Transactional;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 import org.zanata.async.SimpleAsyncTask;
 import org.zanata.common.EntityStatus;
 import org.zanata.common.LocaleId;
@@ -242,7 +242,7 @@ public List<String> call() throws Exception
    @Override
    public ProcessStatus getProcessStatus(@PathParam("processId") String processId)
    {
-      AsyncHandle handle = asyncTaskManagerServiceImpl.getHandle(processId);
+      AsyncTaskHandle handle = asyncTaskManagerServiceImpl.getHandle(processId);
 
       if( handle == null )
       {
diff --git a/zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java b/zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
index 3f49a7df0d..41c2721eb1 100644
--- a/zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
+++ b/zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
@@ -2,7 +2,7 @@
 
 import org.hibernate.ScrollableResults;
 import org.hibernate.search.FullTextSession;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -31,7 +31,7 @@ public AbstractIndexingStrategy(Class<T> entityType, FullTextSession session)
    /**
     * Performs the indexing.
     */
-   public void invoke(AsyncHandle handle)
+   public void invoke(AsyncTaskHandle handle)
    {
       int rowNum = 0;
       scrollableResults = queryResults(rowNum);
diff --git a/zanata-war/src/main/java/org/zanata/search/ClassIndexer.java b/zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
index d72f1ed886..bb9df2665b 100644
--- a/zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
+++ b/zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
@@ -27,7 +27,7 @@
 import org.hibernate.FlushMode;
 import org.hibernate.criterion.Projections;
 import org.hibernate.search.FullTextSession;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 
 /**
  * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
@@ -39,10 +39,10 @@ public class ClassIndexer<T>
 
    private final AbstractIndexingStrategy<T> indexingStrategy;
    private FullTextSession session;
-   private AsyncHandle handle;
+   private AsyncTaskHandle handle;
    private Class<?> entityType;
 
-   public ClassIndexer(FullTextSession session, AsyncHandle handle,
+   public ClassIndexer(FullTextSession session, AsyncTaskHandle handle,
          Class<?> entityType, AbstractIndexingStrategy<T> indexingStrategy)
    {
       this.session = session;
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
index b3306e5e4e..7517096ec0 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
@@ -28,14 +28,11 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.Startup;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 import org.zanata.async.AsyncTask;
 import org.zanata.async.TaskExecutor;
-import org.zanata.process.ProcessHandle;
 
 import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -57,20 +54,20 @@ public class AsyncTaskManagerServiceImpl
 
    // Collection of all managed task Handles. It's self pruned, and it is indexed by
    // long valued keys
-   private Cache<Long, AsyncHandle> taskHandles =
+   private Cache<Long, AsyncTaskHandle> taskHandles =
          CacheBuilder.newBuilder()
                .softValues()
                .expireAfterWrite(1, TimeUnit.HOURS)
                //.removalListener(new RecentlyFinishedRemovalListener())
                .build();
 
-   private ConcurrentMap<Serializable, AsyncHandle> keyedHandles =
+   private ConcurrentMap<Serializable, AsyncTaskHandle> keyedHandles =
          Maps.newConcurrentMap();
 
-   public <V, H extends AsyncHandle<V>> String startTask(AsyncTask<V,H> task)
+   public <V, H extends AsyncTaskHandle<V>> String startTask(AsyncTask<V,H> task)
    {
       TaskExecutor taskExecutor = (TaskExecutor) Component.getInstance(TaskExecutor.class);
-      AsyncHandle<V> handle = taskExecutor.startTask(task);
+      AsyncTaskHandle<V> handle = taskExecutor.startTask(task);
       Long taskKey;
       synchronized (taskHandles)
       {
@@ -80,28 +77,28 @@ public <V, H extends AsyncHandle<V>> String startTask(AsyncTask<V,H> task)
       return taskKey.toString();
    }
 
-   public <V, H extends AsyncHandle<V>> void startTask(AsyncTask<V,H> task, Serializable key)
+   public <V, H extends AsyncTaskHandle<V>> void startTask(AsyncTask<V,H> task, Serializable key)
    {
       String taskId = startTask(task);
       keyedHandles.put(key, getHandle(taskId));
    }
 
-   public AsyncHandle getHandle(String taskId)
+   public AsyncTaskHandle getHandle(String taskId)
    {
       return getHandle(taskId, false);
    }
 
-   public AsyncHandle getHandleByKey( Serializable key )
+   public AsyncTaskHandle getHandleByKey( Serializable key )
    {
       return keyedHandles.get(key);
    }
 
-   public AsyncHandle getHandle(String taskId, boolean removeIfFinished)
+   public AsyncTaskHandle getHandle(String taskId, boolean removeIfFinished)
    {
       try
       {
          Long taskKey = Long.parseLong(taskId);
-         AsyncHandle handle = taskHandles.getIfPresent(taskKey);
+         AsyncTaskHandle handle = taskHandles.getIfPresent(taskKey);
          if( removeIfFinished )
          {
             taskHandles.invalidate(taskKey);
@@ -118,7 +115,7 @@ public void clearInactive()
    {
       synchronized (taskHandles)
       {
-         for (Map.Entry<Long, AsyncHandle> entry : taskHandles.asMap().entrySet())
+         for (Map.Entry<Long, AsyncTaskHandle> entry : taskHandles.asMap().entrySet())
          {
             if( entry.getValue().isDone() )
             {
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
index 92bf816da0..383a542637 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
@@ -41,7 +41,7 @@
 import org.jboss.seam.core.Events;
 import org.jboss.seam.security.management.JpaIdentityStore;
 import org.jboss.seam.util.Work;
-import org.zanata.async.AsyncHandle;
+import org.zanata.async.AsyncTaskHandle;
 import org.zanata.async.AsyncUtils;
 import org.zanata.common.ContentState;
 import org.zanata.common.LocaleId;
@@ -65,7 +65,6 @@
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowTarget;
 import org.zanata.model.HTextFlowTargetHistory;
-import org.zanata.process.MessagesProcessHandle;
 import org.zanata.rest.dto.resource.TextFlowTarget;
 import org.zanata.rest.dto.resource.TranslationsResource;
 import org.zanata.rest.service.ResourceUtils;
@@ -477,7 +476,7 @@ public List<String> translateAllInDoc(final String projectSlug, final String ite
       boolean changed = false;
 
       final HLocale hLocale = localeServiceImpl.validateLocaleByProjectIteration(locale, projectSlug, iterationSlug);
-      final Optional<AsyncHandle> handleOp = AsyncUtils.getEventAsyncHandle(AsyncHandle.class);
+      final Optional<AsyncTaskHandle> handleOp = AsyncUtils.getEventAsyncHandle(AsyncTaskHandle.class);
 
       if( handleOp.isPresent() )
       {
diff --git a/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java b/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
index 410ea5dac4..5ffeb96720 100644
--- a/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
+++ b/zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
@@ -53,7 +53,7 @@ public void contextInheritance() throws Exception
       Contexts.getEventContext().set(compName, component);
 
       // Start an asynchronous process
-      AsyncHandle<String> handle =
+      AsyncTaskHandle<String> handle =
          taskExecutor.startTask(new SimpleAsyncTask<String>()
          {
             @Override
@@ -74,7 +74,7 @@ public String call() throws Exception
    public void executionError() throws Exception
    {
       // Start an asynchronous process that throws an exception
-      AsyncHandle<String> handle =
+      AsyncTaskHandle<String> handle =
          taskExecutor.startTask(new SimpleAsyncTask<String>()
          {
             @Override