diff --git a/EHEC_Server/EHEC_Server/Exam.cs b/EHEC_Server/EHEC_Server/Exam.cs
index a608b3f..7fab6a0 100644
--- a/EHEC_Server/EHEC_Server/Exam.cs
+++ b/EHEC_Server/EHEC_Server/Exam.cs
@@ -33,20 +33,20 @@ public partial class Exam
 
     public int PatientId { get; set; }
 
-    public int Result_ResultId { get; set; }
+    public int ResultId { get; set; }
 
 
 
     public virtual Doctor Doctor { get; set; }
 
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-
-    public virtual ICollection<Origin_Exam> Origin_Exam { get; set; }
-
     public virtual Patient Patient { get; set; }
 
     public virtual Result Result { get; set; }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+
+    public virtual ICollection<Origin_Exam> Origin_Exam { get; set; }
+
 }
 
 }
diff --git a/EHEC_Server/EHEC_Server/Model.Context.cs b/EHEC_Server/EHEC_Server/Model.Context.cs
index b11ebf6..47c4539 100644
--- a/EHEC_Server/EHEC_Server/Model.Context.cs
+++ b/EHEC_Server/EHEC_Server/Model.Context.cs
@@ -38,12 +38,12 @@ public partial class EHEC_DBEntities : DbContext
 
     public virtual DbSet<Origin> Origins { get; set; }
 
-    public virtual DbSet<Origin_Exam> Origin_Exam { get; set; }
-
     public virtual DbSet<Patient> Patients { get; set; }
 
     public virtual DbSet<Result> Results { get; set; }
 
+    public virtual DbSet<Origin_Exam> Origin_Exam { get; set; }
+
 }
 
 }
diff --git a/EHEC_Server/EHEC_Server/Model.edmx b/EHEC_Server/EHEC_Server/Model.edmx
index 66abcf9..43c4325 100644
--- a/EHEC_Server/EHEC_Server/Model.edmx
+++ b/EHEC_Server/EHEC_Server/Model.edmx
@@ -22,7 +22,7 @@
           <Property Name="ExamId" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="DoctorId" Type="int" Nullable="false" />
           <Property Name="PatientId" Type="int" Nullable="false" />
-          <Property Name="Result_ResultId" Type="int" Nullable="false" />
+          <Property Name="ResultId" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="Origin">
           <Key>
@@ -39,8 +39,8 @@
             <PropertyRef Name="Origin_ExamId" />
           </Key>
           <Property Name="Origin_ExamId" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="OriginOriginId" Type="int" Nullable="false" />
-          <Property Name="ExamExamId" Type="int" Nullable="false" />
+          <Property Name="OriginId" Type="int" Nullable="false" />
+          <Property Name="ExamId" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="Patient">
           <Key>
@@ -81,7 +81,7 @@
               <PropertyRef Name="ExamId" />
             </Principal>
             <Dependent Role="Origin_Exam">
-              <PropertyRef Name="ExamExamId" />
+              <PropertyRef Name="ExamId" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -93,7 +93,7 @@
               <PropertyRef Name="OriginId" />
             </Principal>
             <Dependent Role="Origin_Exam">
-              <PropertyRef Name="OriginOriginId" />
+              <PropertyRef Name="OriginId" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -117,7 +117,7 @@
               <PropertyRef Name="ResultId" />
             </Principal>
             <Dependent Role="Exam">
-              <PropertyRef Name="Result_ResultId" />
+              <PropertyRef Name="ResultId" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -157,17 +157,12 @@
           <EntitySet Name="Doctors" EntityType="EHEC_DBModel.Doctor" />
           <EntitySet Name="Exams" EntityType="EHEC_DBModel.Exam" />
           <EntitySet Name="Origins" EntityType="EHEC_DBModel.Origin" />
-          <EntitySet Name="Origin_Exam" EntityType="EHEC_DBModel.Origin_Exam" />
           <EntitySet Name="Patients" EntityType="EHEC_DBModel.Patient" />
           <EntitySet Name="Results" EntityType="EHEC_DBModel.Result" />
           <AssociationSet Name="FK_DoctorExam" Association="EHEC_DBModel.FK_DoctorExam">
             <End Role="Doctor" EntitySet="Doctors" />
             <End Role="Exam" EntitySet="Exams" />
           </AssociationSet>
-          <AssociationSet Name="FK_Exam" Association="EHEC_DBModel.FK_Exam">
-            <End Role="Exam" EntitySet="Exams" />
-            <End Role="Origin_Exam" EntitySet="Origin_Exam" />
-          </AssociationSet>
           <AssociationSet Name="FK_PatientExam" Association="EHEC_DBModel.FK_PatientExam">
             <End Role="Patient" EntitySet="Patients" />
             <End Role="Exam" EntitySet="Exams" />
@@ -176,7 +171,12 @@
             <End Role="Result" EntitySet="Results" />
             <End Role="Exam" EntitySet="Exams" />
           </AssociationSet>
-          <AssociationSet Name="FK_Origin" Association="EHEC_DBModel.FK_Origin">
+          <EntitySet Name="Origin_Exam" EntityType="EHEC_DBModel.Origin_Exam" />
+          <AssociationSet Name="FK_Exam1" Association="EHEC_DBModel.FK_Exam1">
+            <End Role="Exam" EntitySet="Exams" />
+            <End Role="Origin_Exam" EntitySet="Origin_Exam" />
+          </AssociationSet>
+          <AssociationSet Name="FK_Origin1" Association="EHEC_DBModel.FK_Origin1">
             <End Role="Origin" EntitySet="Origins" />
             <End Role="Origin_Exam" EntitySet="Origin_Exam" />
           </AssociationSet>
@@ -199,11 +199,11 @@
           <Property Name="ExamId" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="DoctorId" Type="Int32" Nullable="false" />
           <Property Name="PatientId" Type="Int32" Nullable="false" />
-          <Property Name="Result_ResultId" Type="Int32" Nullable="false" />
+          <Property Name="ResultId" Type="Int32" Nullable="false" />
           <NavigationProperty Name="Doctor" Relationship="EHEC_DBModel.FK_DoctorExam" FromRole="Exam" ToRole="Doctor" />
-          <NavigationProperty Name="Origin_Exam" Relationship="EHEC_DBModel.FK_Exam" FromRole="Exam" ToRole="Origin_Exam" />
           <NavigationProperty Name="Patient" Relationship="EHEC_DBModel.FK_PatientExam" FromRole="Exam" ToRole="Patient" />
           <NavigationProperty Name="Result" Relationship="EHEC_DBModel.FK_ResultExam" FromRole="Exam" ToRole="Result" />
+          <NavigationProperty Name="Origin_Exam" Relationship="EHEC_DBModel.FK_Exam1" FromRole="Exam" ToRole="Origin_Exam" />
         </EntityType>
         <EntityType Name="Origin">
           <Key>
@@ -214,17 +214,7 @@
           <Property Name="Food" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="Street" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="City" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="Origin_Exam" Relationship="EHEC_DBModel.FK_Origin" FromRole="Origin" ToRole="Origin_Exam" />
-        </EntityType>
-        <EntityType Name="Origin_Exam">
-          <Key>
-            <PropertyRef Name="Origin_ExamId" />
-          </Key>
-          <Property Name="Origin_ExamId" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="OriginOriginId" Type="Int32" Nullable="false" />
-          <Property Name="ExamExamId" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="Exam" Relationship="EHEC_DBModel.FK_Exam" FromRole="Origin_Exam" ToRole="Exam" />
-          <NavigationProperty Name="Origin" Relationship="EHEC_DBModel.FK_Origin" FromRole="Origin_Exam" ToRole="Origin" />
+          <NavigationProperty Name="Origin_Exam" Relationship="EHEC_DBModel.FK_Origin1" FromRole="Origin" ToRole="Origin_Exam" />
         </EntityType>
         <EntityType Name="Patient">
           <Key>
@@ -259,18 +249,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_Exam">
-          <End Type="EHEC_DBModel.Exam" Role="Exam" Multiplicity="1" />
-          <End Type="EHEC_DBModel.Origin_Exam" Role="Origin_Exam" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="Exam">
-              <PropertyRef Name="ExamId" />
-            </Principal>
-            <Dependent Role="Origin_Exam">
-              <PropertyRef Name="ExamExamId" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_PatientExam">
           <End Type="EHEC_DBModel.Patient" Role="Patient" Multiplicity="1" />
           <End Type="EHEC_DBModel.Exam" Role="Exam" Multiplicity="*" />
@@ -291,11 +269,33 @@
               <PropertyRef Name="ResultId" />
             </Principal>
             <Dependent Role="Exam">
-              <PropertyRef Name="Result_ResultId" />
+              <PropertyRef Name="ResultId" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_Origin">
+        <EntityType Name="Origin_Exam">
+          <Key>
+            <PropertyRef Name="Origin_ExamId" />
+          </Key>
+          <Property Name="Origin_ExamId" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="OriginId" Type="Int32" Nullable="false" />
+          <Property Name="ExamId" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="Exam" Relationship="EHEC_DBModel.FK_Exam1" FromRole="Origin_Exam" ToRole="Exam" />
+          <NavigationProperty Name="Origin" Relationship="EHEC_DBModel.FK_Origin1" FromRole="Origin_Exam" ToRole="Origin" />
+        </EntityType>
+        <Association Name="FK_Exam1">
+          <End Type="EHEC_DBModel.Exam" Role="Exam" Multiplicity="1" />
+          <End Type="EHEC_DBModel.Origin_Exam" Role="Origin_Exam" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="Exam">
+              <PropertyRef Name="ExamId" />
+            </Principal>
+            <Dependent Role="Origin_Exam">
+              <PropertyRef Name="ExamId" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_Origin1">
           <End Type="EHEC_DBModel.Origin" Role="Origin" Multiplicity="1" />
           <End Type="EHEC_DBModel.Origin_Exam" Role="Origin_Exam" Multiplicity="*" />
           <ReferentialConstraint>
@@ -303,7 +303,7 @@
               <PropertyRef Name="OriginId" />
             </Principal>
             <Dependent Role="Origin_Exam">
-              <PropertyRef Name="OriginOriginId" />
+              <PropertyRef Name="OriginId" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -327,7 +327,7 @@
           <EntitySetMapping Name="Exams">
             <EntityTypeMapping TypeName="EHEC_DBModel.Exam">
               <MappingFragment StoreEntitySet="Exam">
-                <ScalarProperty Name="Result_ResultId" ColumnName="Result_ResultId" />
+                <ScalarProperty Name="ResultId" ColumnName="ResultId" />
                 <ScalarProperty Name="PatientId" ColumnName="PatientId" />
                 <ScalarProperty Name="DoctorId" ColumnName="DoctorId" />
                 <ScalarProperty Name="ExamId" ColumnName="ExamId" />
@@ -345,15 +345,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="Origin_Exam">
-            <EntityTypeMapping TypeName="EHEC_DBModel.Origin_Exam">
-              <MappingFragment StoreEntitySet="Origin_Exam">
-                <ScalarProperty Name="ExamExamId" ColumnName="ExamExamId" />
-                <ScalarProperty Name="OriginOriginId" ColumnName="OriginOriginId" />
-                <ScalarProperty Name="Origin_ExamId" ColumnName="Origin_ExamId" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="Patients">
             <EntityTypeMapping TypeName="EHEC_DBModel.Patient">
               <MappingFragment StoreEntitySet="Patient">
@@ -375,6 +366,15 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="Origin_Exam">
+            <EntityTypeMapping TypeName="EHEC_DBModel.Origin_Exam">
+              <MappingFragment StoreEntitySet="Origin_Exam">
+                <ScalarProperty Name="ExamId" ColumnName="ExamId" />
+                <ScalarProperty Name="OriginId" ColumnName="OriginId" />
+                <ScalarProperty Name="Origin_ExamId" ColumnName="Origin_ExamId" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
         </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>
diff --git a/EHEC_Server/EHEC_Server/Model.edmx.diagram b/EHEC_Server/EHEC_Server/Model.edmx.diagram
index 6a9e88c..c12e960 100644
--- a/EHEC_Server/EHEC_Server/Model.edmx.diagram
+++ b/EHEC_Server/EHEC_Server/Model.edmx.diagram
@@ -6,16 +6,16 @@
     <edmx:Diagrams>
       <Diagram DiagramId="09c9d242de5f41b186b4e8e8af51e2a7" Name="Diagram1">
         <EntityTypeShape EntityType="EHEC_DBModel.Doctor" Width="1.5" PointX="0.5" PointY="0.5" />
-        <EntityTypeShape EntityType="EHEC_DBModel.Exam" Width="1.5" PointX="2.875" PointY="0.5" />
-        <EntityTypeShape EntityType="EHEC_DBModel.Origin" Width="1.5" PointX="5" PointY="3.25" />
-        <EntityTypeShape EntityType="EHEC_DBModel.Origin_Exam" Width="1.5" PointX="5" PointY="0.75" />
+        <EntityTypeShape EntityType="EHEC_DBModel.Exam" Width="1.5" PointX="2.5" PointY="0.5" />
+        <EntityTypeShape EntityType="EHEC_DBModel.Origin" Width="1.5" PointX="4.5" PointY="3" />
         <EntityTypeShape EntityType="EHEC_DBModel.Patient" Width="1.5" PointX="0.5" PointY="2.75" />
-        <EntityTypeShape EntityType="EHEC_DBModel.Result" Width="1.5" PointX="2.875" PointY="3.5" />
+        <EntityTypeShape EntityType="EHEC_DBModel.Result" Width="1.5" PointX="2.5" PointY="3.5" />
         <AssociationConnector Association="EHEC_DBModel.FK_DoctorExam" />
-        <AssociationConnector Association="EHEC_DBModel.FK_Exam" />
         <AssociationConnector Association="EHEC_DBModel.FK_PatientExam" />
         <AssociationConnector Association="EHEC_DBModel.FK_ResultExam" />
-        <AssociationConnector Association="EHEC_DBModel.FK_Origin" />
+        <EntityTypeShape EntityType="EHEC_DBModel.Origin_Exam" Width="1.5" PointX="4.5" PointY="0.5" />
+        <AssociationConnector Association="EHEC_DBModel.FK_Exam1" />
+        <AssociationConnector Association="EHEC_DBModel.FK_Origin1" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
diff --git a/EHEC_Server/EHEC_Server/Origin_Exam.cs b/EHEC_Server/EHEC_Server/Origin_Exam.cs
index 3dcb4f9..918d0df 100644
--- a/EHEC_Server/EHEC_Server/Origin_Exam.cs
+++ b/EHEC_Server/EHEC_Server/Origin_Exam.cs
@@ -20,9 +20,9 @@ public partial class Origin_Exam
 
     public int Origin_ExamId { get; set; }
 
-    public int OriginOriginId { get; set; }
+    public int OriginId { get; set; }
 
-    public int ExamExamId { get; set; }
+    public int ExamId { get; set; }
 
 
 
diff --git a/EHEC_Server/EHEC_Server/Patient.cs b/EHEC_Server/EHEC_Server/Patient.cs
index 1db28bf..27e8ba3 100644
--- a/EHEC_Server/EHEC_Server/Patient.cs
+++ b/EHEC_Server/EHEC_Server/Patient.cs
@@ -14,7 +14,8 @@ namespace EHEC_Server
 
 using System;
     using System.Collections.Generic;
-    public partial class Patient
+    
+public partial class Patient
 {
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]