Index: branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs
===================================================================
--- branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs	(revision 6721)
+++ branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs	(revision 6723)
@@ -49,7 +49,7 @@
     partial void UpdateDowntime(Downtime instance);
     partial void DeleteDowntime(Downtime instance);
-    partial void InsertHiveExperiment(HiveExperiment instance);
-    partial void UpdateHiveExperiment(HiveExperiment instance);
-    partial void DeleteHiveExperiment(HiveExperiment instance);
+    partial void InsertJob(Job instance);
+    partial void UpdateJob(Job instance);
+    partial void DeleteJob(Job instance);
     partial void InsertTaskData(TaskData instance);
     partial void UpdateTaskData(TaskData instance);
@@ -61,7 +61,7 @@
     partial void UpdateStateLog(StateLog instance);
     partial void DeleteStateLog(StateLog instance);
-    partial void InsertHiveExperimentPermission(HiveExperimentPermission instance);
-    partial void UpdateHiveExperimentPermission(HiveExperimentPermission instance);
-    partial void DeleteHiveExperimentPermission(HiveExperimentPermission instance);
+    partial void InsertJobPermission(JobPermission instance);
+    partial void UpdateJobPermission(JobPermission instance);
+    partial void DeleteJobPermission(JobPermission instance);
     partial void InsertLifecycle(Lifecycle instance);
     partial void UpdateLifecycle(Lifecycle instance);
@@ -159,9 +159,9 @@
 		}
 		
-		public System.Data.Linq.Table<HiveExperiment> HiveExperiments
-		{
-			get
-			{
-				return this.GetTable<HiveExperiment>();
+		public System.Data.Linq.Table<Job> Jobs
+		{
+			get
+			{
+				return this.GetTable<Job>();
 			}
 		}
@@ -191,9 +191,9 @@
 		}
 		
-		public System.Data.Linq.Table<HiveExperimentPermission> HiveExperimentPermissions
-		{
-			get
-			{
-				return this.GetTable<HiveExperimentPermission>();
+		public System.Data.Linq.Table<JobPermission> JobPermissions
+		{
+			get
+			{
+				return this.GetTable<JobPermission>();
 			}
 		}
@@ -1490,5 +1490,5 @@
 		private EntityRef<Task> _Job1;
 		
-		private EntityRef<HiveExperiment> _HiveExperiment;
+		private EntityRef<Job> _HiveExperiment;
 		
     #region Extensibility Method Definitions
@@ -1518,6 +1518,6 @@
     partial void OnCommandChanging(global::HeuristicLab.Services.Hive.DataAccess.Command? value);
     partial void OnCommandChanged();
-    partial void OnHiveExperimentIdChanging(System.Guid value);
-    partial void OnHiveExperimentIdChanged();
+    partial void OnJobIdChanging(System.Guid value);
+    partial void OnJobIdChanged();
     partial void OnIsPrivilegedChanging(bool value);
     partial void OnIsPrivilegedChanged();
@@ -1532,5 +1532,5 @@
 			this._StateLogs = new EntitySet<StateLog>(new Action<StateLog>(this.attach_StateLogs), new Action<StateLog>(this.detach_StateLogs));
 			this._Job1 = default(EntityRef<Task>);
-			this._HiveExperiment = default(EntityRef<HiveExperiment>);
+			this._HiveExperiment = default(EntityRef<Job>);
 			OnCreated();
 		}
@@ -1761,5 +1761,5 @@
 		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiveExperimentId", DbType="UniqueIdentifier NOT NULL")]
-		public System.Guid HiveExperimentId
+		public System.Guid JobId
 		{
 			get
@@ -1775,9 +1775,9 @@
 						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
 					}
-					this.OnHiveExperimentIdChanging(value);
+					this.OnJobIdChanging(value);
 					this.SendPropertyChanging();
 					this._HiveExperimentId = value;
-					this.SendPropertyChanged("HiveExperimentId");
-					this.OnHiveExperimentIdChanged();
+					this.SendPropertyChanged("JobId");
+					this.OnJobIdChanged();
 				}
 			}
@@ -1919,6 +1919,6 @@
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Task", Storage="_HiveExperiment", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId", IsForeignKey=true)]
-		public HiveExperiment HiveExperiment
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Task", Storage="_HiveExperiment", ThisKey="JobId", OtherKey="JobId", IsForeignKey=true)]
+		public Job Job
 		{
 			get
@@ -1928,5 +1928,5 @@
 			set
 			{
-				HiveExperiment previousValue = this._HiveExperiment.Entity;
+				Job previousValue = this._HiveExperiment.Entity;
 				if (((previousValue != value) 
 							|| (this._HiveExperiment.HasLoadedOrAssignedValue == false)))
@@ -1942,5 +1942,5 @@
 					{
 						value.Tasks.Add(this);
-						this._HiveExperimentId = value.HiveExperimentId;
+						this._HiveExperimentId = value.JobId;
 					}
 					else
@@ -1948,5 +1948,5 @@
 						this._HiveExperimentId = default(System.Guid);
 					}
-					this.SendPropertyChanged("HiveExperiment");
+					this.SendPropertyChanged("Job");
 				}
 			}
@@ -2269,6 +2269,6 @@
 	}
 	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HiveExperiment")]
-	public partial class HiveExperiment : INotifyPropertyChanging, INotifyPropertyChanged
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Job")]
+	public partial class Job : INotifyPropertyChanging, INotifyPropertyChanged
 	{
 		
@@ -2293,5 +2293,5 @@
 		private EntitySet<Task> _Jobs;
 		
-		private EntitySet<HiveExperimentPermission> _HiveExperimentPermissions;
+		private EntitySet<JobPermission> _HiveExperimentPermissions;
 		
     #region Extensibility Method Definitions
@@ -2299,6 +2299,6 @@
     partial void OnValidate(System.Data.Linq.ChangeAction action);
     partial void OnCreated();
-    partial void OnHiveExperimentIdChanging(System.Guid value);
-    partial void OnHiveExperimentIdChanged();
+    partial void OnJobIdChanging(System.Guid value);
+    partial void OnJobIdChanged();
     partial void OnNameChanging(string value);
     partial void OnNameChanged();
@@ -2317,13 +2317,13 @@
     #endregion
 		
-		public HiveExperiment()
+		public Job()
 		{
 			this._Jobs = new EntitySet<Task>(new Action<Task>(this.attach_Jobs), new Action<Task>(this.detach_Jobs));
-			this._HiveExperimentPermissions = new EntitySet<HiveExperimentPermission>(new Action<HiveExperimentPermission>(this.attach_HiveExperimentPermissions), new Action<HiveExperimentPermission>(this.detach_HiveExperimentPermissions));
+			this._HiveExperimentPermissions = new EntitySet<JobPermission>(new Action<JobPermission>(this.attach_HiveExperimentPermissions), new Action<JobPermission>(this.detach_HiveExperimentPermissions));
 			OnCreated();
 		}
 		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiveExperimentId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
-		public System.Guid HiveExperimentId
+		public System.Guid JobId
 		{
 			get
@@ -2335,9 +2335,9 @@
 				if ((this._HiveExperimentId != value))
 				{
-					this.OnHiveExperimentIdChanging(value);
+					this.OnJobIdChanging(value);
 					this.SendPropertyChanging();
 					this._HiveExperimentId = value;
-					this.SendPropertyChanged("HiveExperimentId");
-					this.OnHiveExperimentIdChanged();
+					this.SendPropertyChanged("JobId");
+					this.OnJobIdChanged();
 				}
 			}
@@ -2484,5 +2484,5 @@
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Task", Storage="_Jobs", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId")]
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_Task", Storage="_Jobs", ThisKey="JobId", OtherKey="JobId")]
 		public EntitySet<Task> Tasks
 		{
@@ -2497,6 +2497,6 @@
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_HiveExperimentPermission", Storage="_HiveExperimentPermissions", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId")]
-		public EntitySet<HiveExperimentPermission> HiveExperimentPermissions
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_HiveExperimentPermission", Storage="_HiveExperimentPermissions", ThisKey="JobId", OtherKey="JobId")]
+		public EntitySet<JobPermission> JobPermissions
 		{
 			get
@@ -2533,5 +2533,5 @@
 		{
 			this.SendPropertyChanging();
-			entity.HiveExperiment = this;
+			entity.Job = this;
 		}
 		
@@ -2539,17 +2539,17 @@
 		{
 			this.SendPropertyChanging();
-			entity.HiveExperiment = null;
-		}
-		
-		private void attach_HiveExperimentPermissions(HiveExperimentPermission entity)
+			entity.Job = null;
+		}
+		
+		private void attach_HiveExperimentPermissions(JobPermission entity)
 		{
 			this.SendPropertyChanging();
-			entity.HiveExperiment = this;
-		}
-		
-		private void detach_HiveExperimentPermissions(HiveExperimentPermission entity)
+			entity.Job = this;
+		}
+		
+		private void detach_HiveExperimentPermissions(JobPermission entity)
 		{
 			this.SendPropertyChanging();
-			entity.HiveExperiment = null;
+			entity.Job = null;
 		}
 	}
@@ -3169,6 +3169,6 @@
 	}
 	
-	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HiveExperimentPermission")]
-	public partial class HiveExperimentPermission : INotifyPropertyChanging, INotifyPropertyChanged
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JobPermission")]
+	public partial class JobPermission : INotifyPropertyChanging, INotifyPropertyChanged
 	{
 		
@@ -3183,5 +3183,5 @@
 		private global::HeuristicLab.Services.Hive.DataAccess.Permission _Permission;
 		
-		private EntityRef<HiveExperiment> _HiveExperiment;
+		private EntityRef<Job> _HiveExperiment;
 		
     #region Extensibility Method Definitions
@@ -3189,6 +3189,6 @@
     partial void OnValidate(System.Data.Linq.ChangeAction action);
     partial void OnCreated();
-    partial void OnHiveExperimentIdChanging(System.Guid value);
-    partial void OnHiveExperimentIdChanged();
+    partial void OnJobIdChanging(System.Guid value);
+    partial void OnJobIdChanged();
     partial void OnGrantedUserIdChanging(System.Guid value);
     partial void OnGrantedUserIdChanged();
@@ -3199,12 +3199,12 @@
     #endregion
 		
-		public HiveExperimentPermission()
-		{
-			this._HiveExperiment = default(EntityRef<HiveExperiment>);
+		public JobPermission()
+		{
+			this._HiveExperiment = default(EntityRef<Job>);
 			OnCreated();
 		}
 		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiveExperimentId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-		public System.Guid HiveExperimentId
+		public System.Guid JobId
 		{
 			get
@@ -3220,9 +3220,9 @@
 						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
 					}
-					this.OnHiveExperimentIdChanging(value);
+					this.OnJobIdChanging(value);
 					this.SendPropertyChanging();
 					this._HiveExperimentId = value;
-					this.SendPropertyChanged("HiveExperimentId");
-					this.OnHiveExperimentIdChanged();
+					this.SendPropertyChanged("JobId");
+					this.OnJobIdChanged();
 				}
 			}
@@ -3289,6 +3289,6 @@
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_HiveExperimentPermission", Storage="_HiveExperiment", ThisKey="HiveExperimentId", OtherKey="HiveExperimentId", IsForeignKey=true)]
-		public HiveExperiment HiveExperiment
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="HiveExperiment_HiveExperimentPermission", Storage="_HiveExperiment", ThisKey="JobId", OtherKey="JobId", IsForeignKey=true)]
+		public Job Job
 		{
 			get
@@ -3298,5 +3298,5 @@
 			set
 			{
-				HiveExperiment previousValue = this._HiveExperiment.Entity;
+				Job previousValue = this._HiveExperiment.Entity;
 				if (((previousValue != value) 
 							|| (this._HiveExperiment.HasLoadedOrAssignedValue == false)))
@@ -3306,11 +3306,11 @@
 					{
 						this._HiveExperiment.Entity = null;
-						previousValue.HiveExperimentPermissions.Remove(this);
+						previousValue.JobPermissions.Remove(this);
 					}
 					this._HiveExperiment.Entity = value;
 					if ((value != null))
 					{
-						value.HiveExperimentPermissions.Add(this);
-						this._HiveExperimentId = value.HiveExperimentId;
+						value.JobPermissions.Add(this);
+						this._HiveExperimentId = value.JobId;
 					}
 					else
@@ -3318,5 +3318,5 @@
 						this._HiveExperimentId = default(System.Guid);
 					}
-					this.SendPropertyChanged("HiveExperiment");
+					this.SendPropertyChanged("Job");
 				}
 			}
