Index: branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/DaoTests.cs
===================================================================
--- branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/DaoTests.cs	(revision 6721)
+++ branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/DaoTests.cs	(revision 6723)
@@ -44,5 +44,5 @@
       IHiveDao dao = ServiceLocator.Instance.HiveDao;
 
-      DT.HiveExperiment he = new DT.HiveExperiment();
+      DT.Job he = new DT.Job();
       he.DateCreated = DateTime.Now;
       he.Name = "TestExperiment";
@@ -55,5 +55,5 @@
       job1.StateLog.Add(new DT.StateLog { State = DT.TaskState.Offline, DateTime = DateTime.Now });
       job1.Command = DT.Command.Pause;
-      job1.HiveExperimentId = he.Id;
+      job1.JobId = he.Id;
       job1.IsPrivileged = true;
 
@@ -92,5 +92,5 @@
       Assert.AreEqual(job1.StateLog.Count, job1loaded.StateLog.Count);
       Assert.AreEqual(job1.Command, job1loaded.Command);
-      Assert.AreEqual(job1.HiveExperimentId, job1loaded.HiveExperimentId);
+      Assert.AreEqual(job1.JobId, job1loaded.JobId);
       Assert.AreEqual(job1.IsPrivileged, job1loaded.IsPrivileged);
       Assert.IsTrue(Math.Abs((job1loaded.LastJobDataUpdate - jobData1.LastUpdate).TotalSeconds) < 1);
@@ -215,5 +215,5 @@
       IHiveDao dao = ServiceLocator.Instance.HiveDao;
 
-      DT.HiveExperiment he = new DT.HiveExperiment();
+      DT.Job he = new DT.Job();
       he.DateCreated = DateTime.Now;
       he.Name = "TestExperiment";
@@ -225,9 +225,9 @@
       job.State = DT.TaskState.Offline;
       job.StateLog.Add(new DT.StateLog { State = DT.TaskState.Offline, DateTime = DateTime.Now });
-      job.HiveExperimentId = he.Id;
+      job.JobId = he.Id;
       job.Id = dao.AddJob(job);
 
-      DT.HiveExperimentPermission perm = new DT.HiveExperimentPermission();
-      perm.HiveExperimentId = he.Id;
+      DT.JobPermission perm = new DT.JobPermission();
+      perm.JobId = he.Id;
       perm.GrantedByUserId = he.OwnerUserId;
       perm.GrantedUserId = Guid.NewGuid();
@@ -235,5 +235,5 @@
       dao.AddHiveExperimentPermission(perm);
 
-      DT.HiveExperiment heLoaded = dao.GetHiveExperiment(he.Id);
+      DT.Job heLoaded = dao.GetHiveExperiment(he.Id);
       Assert.AreEqual(he.Id, heLoaded.Id);
       Assert.AreEqual(he.Name, heLoaded.Name);
@@ -245,8 +245,8 @@
       Assert.AreEqual(job.Id, jobLoaded.Id);
       Assert.AreEqual(job.State, jobLoaded.State);
-      Assert.AreEqual(job.HiveExperimentId, jobLoaded.HiveExperimentId);
-
-      DT.HiveExperimentPermission permLoaded = dao.GetHiveExperimentPermission(he.Id, perm.GrantedUserId);
-      Assert.AreEqual(perm.HiveExperimentId, permLoaded.HiveExperimentId);
+      Assert.AreEqual(job.JobId, jobLoaded.JobId);
+
+      DT.JobPermission permLoaded = dao.GetHiveExperimentPermission(he.Id, perm.GrantedUserId);
+      Assert.AreEqual(perm.JobId, permLoaded.JobId);
       Assert.AreEqual(perm.GrantedUserId, permLoaded.GrantedUserId);
       Assert.AreEqual(perm.GrantedByUserId, permLoaded.GrantedByUserId);
@@ -256,5 +256,5 @@
       Assert.AreEqual(null, dao.GetHiveExperiment(he.Id));
       Assert.AreEqual(null, dao.GetJob(job.Id));
-      Assert.AreEqual(null, dao.GetHiveExperimentPermission(perm.HiveExperimentId, perm.GrantedUserId));
+      Assert.AreEqual(null, dao.GetHiveExperimentPermission(perm.JobId, perm.GrantedUserId));
 
     }
Index: branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs
===================================================================
--- branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs	(revision 6721)
+++ branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/ServiceTests.cs	(revision 6723)
@@ -49,5 +49,5 @@
 
       // create hive experiment
-      DT.HiveExperiment experiment = new DT.HiveExperiment() { Name = "TestExperiment", Description = "" };
+      DT.Job experiment = new DT.Job() { Name = "TestExperiment", Description = "" };
 
       // create job
@@ -101,5 +101,5 @@
 
       // add job
-      job.HiveExperimentId = experiment.Id;
+      job.JobId = experiment.Id;
       job.Id = service.AddJob(job, jobData, new List<Guid> { slave.Id });
 
@@ -112,5 +112,5 @@
       Assert.AreEqual(DT.TaskState.Waiting, jobLoaded.State);
       Assert.IsTrue(job.PluginsNeededIds.SequenceEqual(jobLoaded.PluginsNeededIds));
-      Assert.AreEqual(job.HiveExperimentId, jobLoaded.HiveExperimentId);
+      Assert.AreEqual(job.JobId, jobLoaded.JobId);
 
       DT.TaskData jobDataLoaded = service.GetJobData(job.Id);
@@ -119,5 +119,5 @@
 
       // test hive experiment
-      DT.HiveExperiment experimentLoaded = service.GetHiveExperiment(experiment.Id);
+      DT.Job experimentLoaded = service.GetHiveExperiment(experiment.Id);
       Assert.AreEqual(experiment.Id, experimentLoaded.Id);
       Assert.AreEqual(experiment.Name, experimentLoaded.Name);
@@ -201,5 +201,5 @@
 
       // create hive experiment
-      DT.HiveExperiment experiment = new DT.HiveExperiment() { Name = "TestExperiment", Description = "" };
+      DT.Job experiment = new DT.Job() { Name = "TestExperiment", Description = "" };
 
       // create parent job
@@ -244,9 +244,9 @@
 
       // add parent job
-      parentJob.HiveExperimentId = experiment.Id;
+      parentJob.JobId = experiment.Id;
       parentJob.Id = service.AddJob(parentJob, parentJobData, new List<Guid> { slave.Id });
 
       // add child job
-      childJob.HiveExperimentId = experiment.Id;
+      childJob.JobId = experiment.Id;
       childJob.Id = service.AddChildJob(parentJob.Id, childJob, childJobData);
       childJob.ParentTaskId = parentJob.Id;
@@ -255,5 +255,5 @@
       var childJobLoaded = service.GetJob(childJob.Id);
       Assert.AreEqual(childJob.ParentTaskId, childJobLoaded.ParentTaskId);
-      Assert.AreEqual(childJob.HiveExperimentId, childJobLoaded.HiveExperimentId);
+      Assert.AreEqual(childJob.JobId, childJobLoaded.JobId);
       Assert.AreEqual(DT.TaskState.Waiting, childJobLoaded.State);
       Assert.AreEqual(false, childJobLoaded.FinishWhenChildJobsFinished);
@@ -262,5 +262,5 @@
       // test parent job
       var parentJobLoaded = service.GetJob(parentJob.Id);
-      Assert.AreEqual(parentJob.HiveExperimentId, parentJobLoaded.HiveExperimentId);
+      Assert.AreEqual(parentJob.JobId, parentJobLoaded.JobId);
       Assert.AreEqual(TaskState.Waiting, parentJobLoaded.State);
       Assert.AreEqual(true, parentJobLoaded.FinishWhenChildJobsFinished);
@@ -304,5 +304,5 @@
 
       // create hive experiment
-      DT.HiveExperiment e1 = new DT.HiveExperiment() { Name = "TestExperiment", Description = "" };
+      DT.Job e1 = new DT.Job() { Name = "TestExperiment", Description = "" };
       e1.Id = service.AddHiveExperiment(e1);
 
