Index: branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/JobManager.cs
===================================================================
--- branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/JobManager.cs	(revision 6701)
+++ branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/JobManager.cs	(revision 6721)
@@ -65,6 +65,6 @@
     }
 
-    #region Job Control methods
-    public void StartJobAsync(Job job, JobData jobData) {
+    #region Task Control methods
+    public void StartJobAsync(Task job, TaskData jobData) {
       SlaveJob slaveJob = null;
       slaveJobsLocker.EnterUpgradeableReadLock();
@@ -160,5 +160,5 @@
 
     #region Add/Remove SlaveJob
-    private void AddSlaveJob(Job job, SlaveJob slaveJob) {
+    private void AddSlaveJob(Task job, SlaveJob slaveJob) {
       slaveJobsLocker.EnterWriteLock();
       try {
@@ -217,5 +217,5 @@
       finally { slaveJobsLocker.ExitUpgradeableReadLock(); }
 
-      JobData jobData = null;
+      TaskData jobData = null;
       try {
         jobData = slaveJob.GetJobData();
@@ -240,5 +240,5 @@
       finally { slaveJobsLocker.ExitUpgradeableReadLock(); }
 
-      JobData jobData = null;
+      TaskData jobData = null;
       try {
         jobData = slaveJob.GetJobData();
@@ -263,5 +263,5 @@
       finally { slaveJobsLocker.ExitUpgradeableReadLock(); }
 
-      JobData jobData = null;
+      TaskData jobData = null;
       try {
         jobData = slaveJob.GetJobData();
@@ -294,20 +294,20 @@
     }
 
-    public event EventHandler<EventArgs<SlaveJob, JobData>> JobStopped;
-    private void OnJobStopped(SlaveJob slaveJob, JobData jobData) {
+    public event EventHandler<EventArgs<SlaveJob, TaskData>> JobStopped;
+    private void OnJobStopped(SlaveJob slaveJob, TaskData jobData) {
       var handler = JobStopped;
-      if (handler != null) handler(this, new EventArgs<SlaveJob, JobData>(slaveJob, jobData));
-    }
-
-    public event EventHandler<EventArgs<SlaveJob, JobData>> JobPaused;
-    private void OnJobPaused(SlaveJob slaveJob, JobData jobData) {
+      if (handler != null) handler(this, new EventArgs<SlaveJob, TaskData>(slaveJob, jobData));
+    }
+
+    public event EventHandler<EventArgs<SlaveJob, TaskData>> JobPaused;
+    private void OnJobPaused(SlaveJob slaveJob, TaskData jobData) {
       var handler = JobPaused;
-      if (handler != null) handler(this, new EventArgs<SlaveJob, JobData>(slaveJob, jobData));
-    }
-
-    public event EventHandler<EventArgs<Tuple<SlaveJob, JobData, Exception>>> JobFailed;
-    private void OnJobFailed(SlaveJob slaveJob, JobData jobData, Exception exception) {
+      if (handler != null) handler(this, new EventArgs<SlaveJob, TaskData>(slaveJob, jobData));
+    }
+
+    public event EventHandler<EventArgs<Tuple<SlaveJob, TaskData, Exception>>> JobFailed;
+    private void OnJobFailed(SlaveJob slaveJob, TaskData jobData, Exception exception) {
       var handler = JobFailed;
-      if (handler != null) handler(this, new EventArgs<Tuple<SlaveJob, JobData, Exception>>(new Tuple<SlaveJob, JobData, Exception>(slaveJob, jobData, exception)));
+      if (handler != null) handler(this, new EventArgs<Tuple<SlaveJob, TaskData, Exception>>(new Tuple<SlaveJob, TaskData, Exception>(slaveJob, jobData, exception)));
     }
 
Index: branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/PluginManager.cs
===================================================================
--- branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/PluginManager.cs	(revision 6701)
+++ branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/PluginManager.cs	(revision 6721)
@@ -135,5 +135,5 @@
     /// then copies the required plugins for the job.
     /// </summary>        
-    public void PreparePlugins(Job job, out string configFileName) {
+    public void PreparePlugins(Task job, out string configFileName) {
       lock (locker) {
         log.LogMessage("Fetching plugins for job " + job.Id);
