diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/class b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/bundle_class
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/class
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/bundle_class
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/bundle_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.1/bundle_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/class b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/bundle_class
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/class
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/bundle_class
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/bundle_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/1-2.2/bundle_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/interface_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-2/interface_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/class b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/bundle_class
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/class
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/bundle_class
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/bundle_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/1-4.2/bundle_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/id b/drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/interface_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/id
rename to drivers/staging/greybus/Documentation/sysfs/greybus1/1-4/interface_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/class b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/bundle_class
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/class
rename to drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/bundle_class
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/bundle_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/id
rename to drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/2-3.1/bundle_id
diff --git a/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/id b/drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/interface_id
similarity index 100%
rename from drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/id
rename to drivers/staging/greybus/Documentation/sysfs/greybus2/2-3/interface_id