diff --git a/libnymea/types/actiontype.cpp b/libnymea/types/actiontype.cpp
index 36bc5e39..9f7dc1c3 100644
--- a/libnymea/types/actiontype.cpp
+++ b/libnymea/types/actiontype.cpp
@@ -104,14 +104,14 @@ void ActionType::setParamTypes(const ParamTypes &paramTypes)
     m_paramTypes = paramTypes;
 }
 
-/*! Returns a list of all valid JSON properties a ActionType JSON definition can have. */
-QStringList ActionType::jsonProperties()
+/*! Returns a list of all valid properties a ActionType definition can have. */
+QStringList ActionType::typeProperties()
 {
     return QStringList() << "id" << "name" << "displayName" << "paramTypes";
 }
 
-/*! Returns a list of mandatory JSON properties a ActionType JSON definition must have. */
-QStringList ActionType::mandatoryJsonProperties()
+/*! Returns a list of mandatory properties a ActionType definition must have. */
+QStringList ActionType::mandatoryTypeProperties()
 {
     return QStringList() << "id" << "name" << "displayName";
 }
diff --git a/libnymea/types/actiontype.h b/libnymea/types/actiontype.h
index 67bf8bd7..09eb7a25 100644
--- a/libnymea/types/actiontype.h
+++ b/libnymea/types/actiontype.h
@@ -49,8 +49,8 @@ public:
     ParamTypes paramTypes() const;
     void setParamTypes(const ParamTypes &paramTypes);
 
-    static QStringList jsonProperties();
-    static QStringList mandatoryJsonProperties();
+    static QStringList typeProperties();
+    static QStringList mandatoryTypeProperties();
 
 private:
     ActionTypeId m_id;
diff --git a/libnymea/types/deviceclass.cpp b/libnymea/types/deviceclass.cpp
index 071af13a..912381da 100644
--- a/libnymea/types/deviceclass.cpp
+++ b/libnymea/types/deviceclass.cpp
@@ -472,7 +472,7 @@ bool DeviceClass::operator==(const DeviceClass &deviceClass) const
 }
 
 /*! Returns a list of all valid JSON properties a DeviceClass JSON definition can have. */
-QStringList DeviceClass::jsonProperties()
+QStringList DeviceClass::typeProperties()
 {
     return QStringList() << "id" << "name" << "displayName" << "createMethods" << "setupMethod" << "deviceIcon"
                          << "interfaces" << "basicTags" << "pairingInfo" << "criticalStateTypeId"
@@ -481,7 +481,7 @@ QStringList DeviceClass::jsonProperties()
 }
 
 /*! Returns a list of mandatory JSON properties a DeviceClass JSON definition must have. */
-QStringList DeviceClass::mandatoryJsonProperties()
+QStringList DeviceClass::mandatoryTypeProperties()
 {
     return QStringList() << "id" << "name" << "displayName";
 }
diff --git a/libnymea/types/deviceclass.h b/libnymea/types/deviceclass.h
index 88b94ca5..1e2171ea 100644
--- a/libnymea/types/deviceclass.h
+++ b/libnymea/types/deviceclass.h
@@ -180,8 +180,8 @@ public:
 
     bool operator==(const DeviceClass &device) const;
 
-    static QStringList jsonProperties();
-    static QStringList mandatoryJsonProperties();
+    static QStringList typeProperties();
+    static QStringList mandatoryTypeProperties();
 
 private:
     DeviceClassId m_id;
diff --git a/libnymea/types/eventtype.cpp b/libnymea/types/eventtype.cpp
index f66b607f..31468899 100644
--- a/libnymea/types/eventtype.cpp
+++ b/libnymea/types/eventtype.cpp
@@ -131,13 +131,13 @@ bool EventType::isValid() const
 }
 
 /*! Returns a list of all valid JSON properties a EventType JSON definition can have. */
-QStringList EventType::jsonProperties()
+QStringList EventType::typeProperties()
 {
     return QStringList() << "id" << "name" << "displayName" << "paramTypes" << "ruleRelevant" << "graphRelevant";
 }
 
 /*! Returns a list of mandatory JSON properties a EventType JSON definition must have. */
-QStringList EventType::mandatoryJsonProperties()
+QStringList EventType::mandatoryTypeProperties()
 {
     return QStringList() << "id" << "name" << "displayName";
 }
diff --git a/libnymea/types/eventtype.h b/libnymea/types/eventtype.h
index 84799d52..e0a06162 100644
--- a/libnymea/types/eventtype.h
+++ b/libnymea/types/eventtype.h
@@ -57,8 +57,8 @@ public:
 
     bool isValid() const;
 
-    static QStringList jsonProperties();
-    static QStringList mandatoryJsonProperties();
+    static QStringList typeProperties();
+    static QStringList mandatoryTypeProperties();
 
 private:
     EventTypeId m_id;
diff --git a/libnymea/types/paramtype.cpp b/libnymea/types/paramtype.cpp
index 1bef2320..8d0ae2f6 100644
--- a/libnymea/types/paramtype.cpp
+++ b/libnymea/types/paramtype.cpp
@@ -212,14 +212,14 @@ bool ParamType::isValid() const
 }
 
 /*! Returns a list of all valid JSON properties a ParamType JSON definition can have. */
-QStringList ParamType::jsonProperties()
+QStringList ParamType::typeProperties()
 {
     return QStringList() << "id" << "name" << "displayName" << "type" << "defaultValue" << "inputType"
                          << "unit" << "minValue" << "maxValue" << "allowedValues" << "readOnly";
 }
 
 /*! Returns a list of mandatory JSON properties a ParamType JSON definition must have. */
-QStringList ParamType::mandatoryJsonProperties()
+QStringList ParamType::mandatoryTypeProperties()
 {
     return QStringList() << "id" << "name" << "displayName" << "type";
 }
diff --git a/libnymea/types/paramtype.h b/libnymea/types/paramtype.h
index 3ee871f8..ea80fc00 100644
--- a/libnymea/types/paramtype.h
+++ b/libnymea/types/paramtype.h
@@ -76,8 +76,8 @@ public:
 
     bool isValid() const;
 
-    static QStringList jsonProperties();
-    static QStringList mandatoryJsonProperties();
+    static QStringList typeProperties();
+    static QStringList mandatoryTypeProperties();
 
 private:
     ParamTypeId m_id;
diff --git a/libnymea/types/statetype.cpp b/libnymea/types/statetype.cpp
index 8f91e4dc..cad8e0d4 100644
--- a/libnymea/types/statetype.cpp
+++ b/libnymea/types/statetype.cpp
@@ -196,16 +196,16 @@ void StateType::setCached(bool cached)
     m_cached = cached;
 }
 
-/*! Returns a list of all valid JSON properties a DeviceClass JSON definition can have. */
-QStringList StateType::jsonProperties()
+/*! Returns a list of all valid properties a DeviceClass definition can have. */
+QStringList StateType::typeProperties()
 {
     return QStringList() << "id" << "name" << "displayName" << "displayNameEvent" << "type" << "defaultValue"
                          << "cached" << "ruleRelevant" << "eventRuleRelevant" << "graphRelevant" << "unit"
                          << "minValue" << "maxValue" << "possibleValues" << "writable" << "displayNameAction";
 }
 
-/*! Returns a list of mandatory JSON properties a DeviceClass JSON definition must have. */
-QStringList StateType::mandatoryJsonProperties()
+/*! Returns a list of mandatory properties a DeviceClass definition must have. */
+QStringList StateType::mandatoryTypeProperties()
 {
     return QStringList() << "id" << "name" << "displayName" << "displayNameEvent" << "type" << "defaultValue";
 }
diff --git a/libnymea/types/statetype.h b/libnymea/types/statetype.h
index 6c7b7d55..278c4ac3 100644
--- a/libnymea/types/statetype.h
+++ b/libnymea/types/statetype.h
@@ -73,8 +73,8 @@ public:
     bool cached() const;
     void setCached(bool cached);
 
-    static QStringList jsonProperties();
-    static QStringList mandatoryJsonProperties();
+    static QStringList typeProperties();
+    static QStringList mandatoryTypeProperties();
 
 private:
     StateTypeId m_id;