diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp
index 7ad1c501f..c088f3e5d 100644
--- a/src/libcamera/device_enumerator.cpp
+++ b/src/libcamera/device_enumerator.cpp
@@ -208,10 +208,10 @@ int DeviceEnumerator::addDevice(const std::string &devnode)
 
 	/* Associate entities to device node paths. */
 	for (MediaEntity *entity : media->entities()) {
-		if (entity->major() == 0 && entity->minor() == 0)
+		if (entity->deviceMajor() == 0 && entity->deviceMinor() == 0)
 			continue;
 
-		std::string devnode = lookupDevnode(entity->major(), entity->minor());
+		std::string devnode = lookupDevnode(entity->deviceMajor(), entity->deviceMinor());
 		if (devnode.empty())
 			return -EINVAL;
 
diff --git a/src/libcamera/include/media_object.h b/src/libcamera/include/media_object.h
index 950a33286..04b9a8909 100644
--- a/src/libcamera/include/media_object.h
+++ b/src/libcamera/include/media_object.h
@@ -80,8 +80,8 @@ class MediaEntity : public MediaObject
 {
 public:
 	const std::string &name() const { return name_; }
-	unsigned int major() const { return major_; }
-	unsigned int minor() const { return minor_; }
+	unsigned int deviceMajor() const { return major_; }
+	unsigned int deviceMinor() const { return minor_; }
 
 	const std::vector<MediaPad *> &pads() const { return pads_; }
 
diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp
index 581e1c080..06a8d642b 100644
--- a/src/libcamera/media_object.cpp
+++ b/src/libcamera/media_object.cpp
@@ -212,14 +212,14 @@ void MediaPad::addLink(MediaLink *link)
  */
 
 /**
- * \fn MediaEntity::major()
+ * \fn MediaEntity::deviceMajor()
  * \brief Retrieve the major number of the interface associated with the entity
  * \return The interface major number, or 0 if the entity isn't associated with
  * an interface
  */
 
 /**
- * \fn MediaEntity::minor()
+ * \fn MediaEntity::deviceMinor()
  * \brief Retrieve the minor number of the interface associated with the entity
  * \return The interface minor number, or 0 if the entity isn't associated with
  * an interface