diff --git a/FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/property/type/TypeComplex.java b/FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/property/type/TypeComplex.java
index f846941d3..9db39da33 100644
--- a/FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/property/type/TypeComplex.java
+++ b/FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/property/type/TypeComplex.java
@@ -52,7 +52,9 @@ public class TypeComplex extends PropertyType {
     public static final String STA_MAP_NAME = "Object";
     public static final String STA_OBJECT_NAME = "ANY";
     public static final String STA_TIMEINTERVAL_NAME = "TM_Period";
+    public static final String STA_TIMEINTERVAL_ALIAS = "TimeInterval";
     public static final String STA_TIMEVALUE_NAME = "TM_Object";
+    public static final String STA_TIMEVALUE_ALIAS = "TimeValue";
     public static final String NAME_INTERVAL_START = "start";
     public static final String NAME_INTERVAL_END = "end";
 
@@ -95,6 +97,9 @@ public class TypeComplex extends PropertyType {
                 // It's not a TypeSimplePrimitive
             }
         }
+        TYPES.put(STA_TIMEINTERVAL_ALIAS, TYPES.get(STA_TIMEINTERVAL_NAME));
+        TYPES.put(STA_TIMEVALUE_ALIAS, TYPES.get(STA_TIMEVALUE_NAME));
+
     }
 
     public static TypeComplex getType(String name) {
diff --git a/FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/property/type/TypeSimpleCustom.java b/FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/property/type/TypeSimpleCustom.java
index 5214c422e..840b7c138 100644
--- a/FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/property/type/TypeSimpleCustom.java
+++ b/FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/property/type/TypeSimpleCustom.java
@@ -37,6 +37,7 @@ public class TypeSimpleCustom extends TypeSimple {
 
     public static final String STA_GEOJSON_NAME = "Geometry";
     public static final String STA_TM_INSTANT_NAME = "TM_Instant";
+    public static final String STA_TM_INSTANT_ALIAS = "TimeInstant";
     public static final PropertyType STA_LOCATION = new TypeSimpleCustom(STA_GEOJSON_NAME, "A Free Location object", EDM_GEOMETRY)
             .setDeserializer(ParserUtils.getLocationDeserializer());
     public static final PropertyType STA_TM_INSTANT = new TypeSimpleCustom(STA_TM_INSTANT_NAME, "A Time Instant", EDM_DATETIMEOFFSET);
@@ -62,6 +63,7 @@ public class TypeSimpleCustom extends TypeSimple {
                 // It's not a TypeSimplePrimitive
             }
         }
+        TYPES.put(STA_TM_INSTANT_ALIAS, TYPES.get(STA_TM_INSTANT_NAME));
     }
 
     public static TypeSimpleCustom getType(String name) {