diff --git a/Client/Client/Connected Services/EHEC_Service/Reference.cs b/Client/Client/Connected Services/EHEC_Service/Reference.cs
index 77c4a65..c283a80 100644
--- a/Client/Client/Connected Services/EHEC_Service/Reference.cs	
+++ b/Client/Client/Connected Services/EHEC_Service/Reference.cs	
@@ -169,7 +169,7 @@ namespace Client.EHEC_Service {
         private Client.EHEC_Service.Result ResultField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int Result_ResultIdField;
+        private int ResultIdField;
         
         [global::System.ComponentModel.BrowsableAttribute(false)]
         public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
@@ -273,14 +273,14 @@ namespace Client.EHEC_Service {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int Result_ResultId {
+        public int ResultId {
             get {
-                return this.Result_ResultIdField;
+                return this.ResultIdField;
             }
             set {
-                if ((this.Result_ResultIdField.Equals(value) != true)) {
-                    this.Result_ResultIdField = value;
-                    this.RaisePropertyChanged("Result_ResultId");
+                if ((this.ResultIdField.Equals(value) != true)) {
+                    this.ResultIdField = value;
+                    this.RaisePropertyChanged("ResultId");
                 }
             }
         }
@@ -542,13 +542,13 @@ namespace Client.EHEC_Service {
         private Client.EHEC_Service.Exam ExamField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int ExamExamIdField;
+        private int ExamIdField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private Client.EHEC_Service.Origin OriginField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int OriginOriginIdField;
+        private int OriginIdField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private int Origin_ExamIdField;
@@ -577,14 +577,14 @@ namespace Client.EHEC_Service {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int ExamExamId {
+        public int ExamId {
             get {
-                return this.ExamExamIdField;
+                return this.ExamIdField;
             }
             set {
-                if ((this.ExamExamIdField.Equals(value) != true)) {
-                    this.ExamExamIdField = value;
-                    this.RaisePropertyChanged("ExamExamId");
+                if ((this.ExamIdField.Equals(value) != true)) {
+                    this.ExamIdField = value;
+                    this.RaisePropertyChanged("ExamId");
                 }
             }
         }
@@ -603,14 +603,14 @@ namespace Client.EHEC_Service {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int OriginOriginId {
+        public int OriginId {
             get {
-                return this.OriginOriginIdField;
+                return this.OriginIdField;
             }
             set {
-                if ((this.OriginOriginIdField.Equals(value) != true)) {
-                    this.OriginOriginIdField = value;
-                    this.RaisePropertyChanged("OriginOriginId");
+                if ((this.OriginIdField.Equals(value) != true)) {
+                    this.OriginIdField = value;
+                    this.RaisePropertyChanged("OriginId");
                 }
             }
         }
diff --git a/Client/Client/Connected Services/EHEC_Service/Service3.xsd b/Client/Client/Connected Services/EHEC_Service/Service3.xsd
index 7b6194a..489018f 100644
--- a/Client/Client/Connected Services/EHEC_Service/Service3.xsd	
+++ b/Client/Client/Connected Services/EHEC_Service/Service3.xsd	
@@ -26,7 +26,7 @@
       <xs:element minOccurs="0" name="Patient" nillable="true" type="tns:Patient" />
       <xs:element minOccurs="0" name="PatientId" type="xs:int" />
       <xs:element minOccurs="0" name="Result" nillable="true" type="tns:Result" />
-      <xs:element minOccurs="0" name="Result_ResultId" type="xs:int" />
+      <xs:element minOccurs="0" name="ResultId" type="xs:int" />
     </xs:sequence>
   </xs:complexType>
   <xs:element name="Exam" nillable="true" type="tns:Exam" />
@@ -39,9 +39,9 @@
   <xs:complexType name="Origin_Exam">
     <xs:sequence>
       <xs:element minOccurs="0" name="Exam" nillable="true" type="tns:Exam" />
-      <xs:element minOccurs="0" name="ExamExamId" type="xs:int" />
+      <xs:element minOccurs="0" name="ExamId" type="xs:int" />
       <xs:element minOccurs="0" name="Origin" nillable="true" type="tns:Origin" />
-      <xs:element minOccurs="0" name="OriginOriginId" type="xs:int" />
+      <xs:element minOccurs="0" name="OriginId" type="xs:int" />
       <xs:element minOccurs="0" name="Origin_ExamId" type="xs:int" />
     </xs:sequence>
   </xs:complexType>
diff --git a/Client/Client/Models/Exam.cs b/Client/Client/Models/Exam.cs
index d47d3a0..d555586 100644
--- a/Client/Client/Models/Exam.cs
+++ b/Client/Client/Models/Exam.cs
@@ -28,7 +28,7 @@ namespace Client
             {
                 DoctorId = DoctorID,
                 PatientId = PatientID,
-                Result_ResultId = ResultID
+                ResultId = ResultID
             };
             Global.GlobalInstance.Service.WriteExam(myExam);
             return Mapper.Map<Exam>(myExam);
diff --git a/Client/Client/Models/Origin_Exam.cs b/Client/Client/Models/Origin_Exam.cs
index 24e4c2d..6b1a6b2 100644
--- a/Client/Client/Models/Origin_Exam.cs
+++ b/Client/Client/Models/Origin_Exam.cs
@@ -28,8 +28,8 @@ namespace Client
         {
             EHEC_Service.Origin_Exam myorigin_Exam = new EHEC_Service.Origin_Exam
             {
-                OriginOriginId = OriginOriginId,
-                ExamExamId = ExamExamId
+                OriginId = OriginOriginId,
+                ExamId = ExamExamId
             };
             Global.GlobalInstance.Service.WriteOrigin_Exam(myorigin_Exam);
             return Mapper.Map<Origin_Exam>(myorigin_Exam);