diff --git a/libs/indidevice/property/indipropertybasic.cpp b/libs/indidevice/property/indipropertybasic.cpp
index c47a577cfc..0eaf8070b6 100644
--- a/libs/indidevice/property/indipropertybasic.cpp
+++ b/libs/indidevice/property/indipropertybasic.cpp
@@ -76,6 +76,20 @@ PropertyBasic<T>::PropertyBasic(const std::shared_ptr<PropertyBasicPrivate> &dd)
     : Property(std::static_pointer_cast<PropertyPrivate>(dd))
 { }
 
+template <typename T>
+void PropertyBasic<T>::setDeviceName(const char *name)
+{
+    D_PTR(PropertyBasic);
+    d->typedProperty.setDeviceName(name);
+}
+
+template <typename T>
+void PropertyBasic<T>::setDeviceName(const std::string &name)
+{
+    D_PTR(PropertyBasic);
+    d->typedProperty.setDeviceName(name);
+}
+
 template <typename T>
 void PropertyBasic<T>::setName(const char *name)
 {
@@ -153,6 +167,13 @@ void PropertyBasic<T>::setTimestamp(const std::string &timestamp)
     d->typedProperty.setTimestamp(timestamp);
 }
 
+template <typename T>
+const char *PropertyBasic<T>::getDeviceName() const
+{
+    D_PTR(const PropertyBasic);
+    return d->typedProperty.getDeviceName();
+}
+
 template <typename T>
 const char *PropertyBasic<T>::getName() const
 {
diff --git a/libs/indidevice/property/indipropertybasic.h b/libs/indidevice/property/indipropertybasic.h
index 055d5e061b..955a86acab 100644
--- a/libs/indidevice/property/indipropertybasic.h
+++ b/libs/indidevice/property/indipropertybasic.h
@@ -46,6 +46,9 @@ class PropertyBasic : public INDI::Property
         ~PropertyBasic();
 
     public:
+        void setDeviceName(const char *name);
+        void setDeviceName(const std::string &name);
+
         void setName(const char *name);
         void setName(const std::string &name);
 
@@ -63,6 +66,7 @@ class PropertyBasic : public INDI::Property
         void setTimestamp(const std::string &timestamp);
 
     public:
+        const char *getDeviceName()         const;
         const char *getName()               const;
         const char *getLabel()              const;
         const char *getGroupName()          const;