--- a/src/main/java/de/intevation/lada/rest/MesswertService.java	Mon Jul 04 14:31:18 2016 +0200
+++ b/src/main/java/de/intevation/lada/rest/MesswertService.java	Fri Jul 08 15:32:36 2016 +0200
@@ -31,8 +31,8 @@
 import de.intevation.lada.lock.LockConfig;
 import de.intevation.lada.lock.LockType;
 import de.intevation.lada.lock.ObjectLocker;
-import de.intevation.lada.model.land.LMessung;
-import de.intevation.lada.model.land.LMesswert;
+import de.intevation.lada.model.land.Messung;
+import de.intevation.lada.model.land.Messwert;
 import de.intevation.lada.util.annotation.AuthorizationConfig;
 import de.intevation.lada.util.annotation.RepositoryConfig;
 import de.intevation.lada.util.auth.Authorization;
@@ -151,27 +151,27 @@
         catch(NumberFormatException nfe) {
             return new Response(false, 698, null);
         }
-        LMessung messung = defaultRepo.getByIdPlain(
-            LMessung.class,
+        Messung messung = defaultRepo.getByIdPlain(
+            Messung.class,
             id,
             "land");
         if (!authorization.isAuthorized(
                 request,
                 messung,
                 RequestMethod.GET,
-                LMessung.class)
+                Messung.class)
         ) {
             return new Response(false, 697, null);
         }
-        QueryBuilder<LMesswert> builder =
-            new QueryBuilder<LMesswert>(
+        QueryBuilder<Messwert> builder =
+            new QueryBuilder<Messwert>(
                 defaultRepo.entityManager("land"),
-                LMesswert.class);
+                Messwert.class);
         builder.and("messungsId", messungId);
         return authorization.filter(
             request,
             defaultRepo.filter(builder.getQuery(), "land"),
-            LMesswert.class);
+            Messwert.class);
     }
 
     /**
@@ -192,17 +192,17 @@
         @PathParam("id") String id
     ) {
         Response response =
-            defaultRepo.getById(LMesswert.class, Integer.valueOf(id), "land");
-        LMesswert messwert = (LMesswert)response.getData();
-        LMessung messung = defaultRepo.getByIdPlain(
-            LMessung.class,
+            defaultRepo.getById(Messwert.class, Integer.valueOf(id), "land");
+        Messwert messwert = (Messwert)response.getData();
+        Messung messung = defaultRepo.getByIdPlain(
+            Messung.class,
             messwert.getMessungsId(),
             "land");
         if (!authorization.isAuthorized(
             request,
             messung,
             RequestMethod.GET,
-            LMessung.class)
+            Messung.class)
         ) {
             return new Response(false, 699, null);
         }
@@ -214,7 +214,7 @@
         return authorization.filter(
             request,
             response,
-            LMesswert.class);
+            Messwert.class);
     }
 
     /**
@@ -249,13 +249,13 @@
     public Response create(
         @Context HttpHeaders headers,
         @Context HttpServletRequest request,
-        LMesswert messwert
+        Messwert messwert
     ) {
         if (!authorization.isAuthorized(
                 request,
                 messwert,
                 RequestMethod.POST,
-                LMesswert.class)
+                Messwert.class)
         ) {
             return new Response(false, 699, null);
         }
@@ -275,7 +275,7 @@
         return authorization.filter(
             request,
             response,
-            LMesswert.class);
+            Messwert.class);
     }
 
     /**
@@ -310,13 +310,13 @@
     public Response update(
         @Context HttpHeaders headers,
         @Context HttpServletRequest request,
-        LMesswert messwert
+        Messwert messwert
     ) {
         if (!authorization.isAuthorized(
                 request,
                 messwert,
                 RequestMethod.PUT,
-                LMesswert.class)
+                Messwert.class)
         ) {
             return new Response(false, 699, null);
         }
@@ -336,8 +336,8 @@
             return response;
         }
         Response updated = defaultRepo.getById(
-            LMesswert.class,
-            ((LMesswert)response.getData()).getId(), "land");
+            Messwert.class,
+            ((Messwert)response.getData()).getId(), "land");
         if(violation.hasWarnings()) {
             updated.setWarnings(violation.getWarnings());
         }
@@ -345,7 +345,7 @@
         return authorization.filter(
             request,
             updated,
-            LMesswert.class);
+            Messwert.class);
     }
 
     /**
@@ -367,13 +367,13 @@
     ) {
         /* Get the messwert object by id*/
         Response messwert =
-            defaultRepo.getById(LMesswert.class, Integer.valueOf(id), "land");
-        LMesswert messwertObj = (LMesswert)messwert.getData();
+            defaultRepo.getById(Messwert.class, Integer.valueOf(id), "land");
+        Messwert messwertObj = (Messwert)messwert.getData();
         if (!authorization.isAuthorized(
                 request,
                 messwertObj,
                 RequestMethod.DELETE,
-                LMesswert.class)
+                Messwert.class)
         ) {
             return new Response(false, 699, null);
         }