diff --git a/src/main/kotlin/mobildata/model/MobilData.kt b/src/main/kotlin/mobildata/model/MobilData.kt
index e52620b853ec3794d60a0637882d947a7971b743..d94b6713d7c5a246d0198ab2846b99ee479719ed 100644
--- a/src/main/kotlin/mobildata/model/MobilData.kt
+++ b/src/main/kotlin/mobildata/model/MobilData.kt
@@ -23,7 +23,7 @@ data class MobilData(
         @Temporal(TemporalType.TIMESTAMP)
         var actualTime: Date?,
         @OneToMany(cascade=arrayOf(CascadeType.ALL), orphanRemoval = true)
-        @JoinColumn(name = "user_id")
+        @JoinColumn(name = "mobile_data_id")
         var processList: List<MobileProcess>?,
         @Id @GeneratedValue(strategy = GenerationType.AUTO)
         var id: Long = 0) {
diff --git a/src/main/kotlin/mobildata/model/MobileProcess.kt b/src/main/kotlin/mobildata/model/MobileProcess.kt
index b996b210c4171c5e13baed01ba799ada6ffed30f..f62b074f53551f1bf5f0072a4a9e542ba377a178 100644
--- a/src/main/kotlin/mobildata/model/MobileProcess.kt
+++ b/src/main/kotlin/mobildata/model/MobileProcess.kt
@@ -8,7 +8,7 @@ import javax.persistence.*
 data class MobileProcess(
         @Column(name="process")
         val process: String? = null,
-        @Column(name="user_id")
+        @Column(name="mobile_data_id")
         var user_id: Long,
         @Id @GeneratedValue(strategy = GenerationType.AUTO)
         var id: Long = 0
diff --git a/src/main/kotlin/mobildata/model/User.kt b/src/main/kotlin/mobildata/model/User.kt
index 695a435603e1df6258aa302c1eb78f60fac970d9..eb156ce9b6f836e0e1725b669bc83178c3dbbfcc 100644
--- a/src/main/kotlin/mobildata/model/User.kt
+++ b/src/main/kotlin/mobildata/model/User.kt
@@ -12,7 +12,7 @@ import javax.persistence.*
 
 @Entity
 //@JsonRootName("user")
-@Table(name = "\"user\"")
+@Table(name = "mobil_user")
 data class User(var email: String = "",
                 @JsonIgnore
                 var password: String = "",
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index f94c008011a895105435517a4dbaeecdf4f99aff..c4bac633b9d6a5f5fef1062aca7a4ecd4b8a0681 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,11 +1,11 @@
-drop table if exists "user" cascade;
+drop table if exists mobil_user cascade;
 drop table if exists mobil_data cascade;
 drop table if exists process cascade;
 
 drop sequence if exists hibernate_sequence;
 create sequence hibernate_sequence start 1 increment 1;
 
-create table "user" (
+create table mobil_user (
   id int8 not null,
   email varchar(255),
   password varchar(255),
@@ -18,12 +18,12 @@ create table "user" (
 
 create table process (
   id int8 not null,
-  user_id int8 not null,
+  mobile_data_id int8 not null,
   process VARCHAR(255)
 );
 
 create table mobil_data (
-  id int8 not null,
+  id int8 not null PRIMARY KEY,
   user_id int8 not null,
   location_lat DOUBLE PRECISION,
   location_long DOUBLE PRECISION,
@@ -44,6 +44,9 @@ create table mobil_data (
 alter table mobil_data
     add CONSTRAINT user_id_foreign_key
     FOREIGN KEY ("user_id")
-    REFERENCES "user"
+    REFERENCES mobil_user;
 
--- TODO process foreign key
\ No newline at end of file
+/*ALTER TABLE process
+    ADD CONSTRAINT mobile_data_id_foreign_key
+    FOREIGN KEY ("mobile_data_id")
+    REFERENCES mobil_data*/
\ No newline at end of file