diff --git a/drivers/staging/greybus/es1.c b/drivers/staging/greybus/es1.c
index 0156db263197..23860870d4f1 100644
--- a/drivers/staging/greybus/es1.c
+++ b/drivers/staging/greybus/es1.c
@@ -396,7 +396,7 @@ static void ap_disconnect(struct usb_interface *interface)
 
 	usb_set_intfdata(interface, NULL);
 	udev = es1->usb_dev;
-	greybus_remove_hd(es1->hd);
+	gb_hd_remove(es1->hd);
 
 	usb_put_dev(udev);
 }
@@ -613,8 +613,8 @@ static int ap_probe(struct usb_interface *interface,
 
 	udev = usb_get_dev(interface_to_usbdev(interface));
 
-	hd = greybus_create_hd(&es1_driver, &udev->dev, ES1_GBUF_MSG_SIZE_MAX,
-			       CPORT_COUNT);
+	hd = gb_hd_create(&es1_driver, &udev->dev, ES1_GBUF_MSG_SIZE_MAX,
+				CPORT_COUNT);
 	if (IS_ERR(hd)) {
 		usb_put_dev(udev);
 		return PTR_ERR(hd);
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 903e3213453b..1e786a6ef7d7 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -548,7 +548,7 @@ static void ap_disconnect(struct usb_interface *interface)
 
 	usb_set_intfdata(interface, NULL);
 	udev = es2->usb_dev;
-	greybus_remove_hd(es2->hd);
+	gb_hd_remove(es2->hd);
 	kfree(es2->cport_to_ep);
 
 	usb_put_dev(udev);
@@ -807,8 +807,8 @@ static int ap_probe(struct usb_interface *interface,
 		return num_cports;
 	}
 
-	hd = greybus_create_hd(&es2_driver, &udev->dev, ES2_GBUF_MSG_SIZE_MAX,
-			       num_cports);
+	hd = gb_hd_create(&es2_driver, &udev->dev, ES2_GBUF_MSG_SIZE_MAX,
+				num_cports);
 	if (IS_ERR(hd)) {
 		usb_put_dev(udev);
 		return PTR_ERR(hd);
diff --git a/drivers/staging/greybus/hd.c b/drivers/staging/greybus/hd.c
index 910e1d2bd49f..6f29eb49993a 100644
--- a/drivers/staging/greybus/hd.c
+++ b/drivers/staging/greybus/hd.c
@@ -28,10 +28,10 @@ static void free_hd(struct kref *kref)
 	mutex_unlock(&hd_mutex);
 }
 
-struct gb_host_device *greybus_create_hd(struct gb_hd_driver *driver,
-					      struct device *parent,
-					      size_t buffer_size_max,
-					      size_t num_cports)
+struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
+					struct device *parent,
+					size_t buffer_size_max,
+					size_t num_cports)
 {
 	struct gb_host_device *hd;
 
@@ -94,9 +94,9 @@ struct gb_host_device *greybus_create_hd(struct gb_hd_driver *driver,
 
 	return hd;
 }
-EXPORT_SYMBOL_GPL(greybus_create_hd);
+EXPORT_SYMBOL_GPL(gb_hd_create);
 
-void greybus_remove_hd(struct gb_host_device *hd)
+void gb_hd_remove(struct gb_host_device *hd)
 {
 	/*
 	 * Tear down all interfaces, modules, and the endo that is associated
@@ -112,4 +112,4 @@ void greybus_remove_hd(struct gb_host_device *hd)
 
 	kref_put_mutex(&hd->kref, free_hd, &hd_mutex);
 }
-EXPORT_SYMBOL_GPL(greybus_remove_hd);
+EXPORT_SYMBOL_GPL(gb_hd_remove);
diff --git a/drivers/staging/greybus/hd.h b/drivers/staging/greybus/hd.h
index 7aea0c54338d..91fcccb46df1 100644
--- a/drivers/staging/greybus/hd.h
+++ b/drivers/staging/greybus/hd.h
@@ -48,10 +48,10 @@ struct gb_host_device {
 	unsigned long hd_priv[0] __aligned(sizeof(s64));
 };
 
-struct gb_host_device *greybus_create_hd(struct gb_hd_driver *driver,
-					      struct device *parent,
-					      size_t buffer_size_max,
-					      size_t num_cports);
-void greybus_remove_hd(struct gb_host_device *hd);
+struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
+					struct device *parent,
+					size_t buffer_size_max,
+					size_t num_cports);
+void gb_hd_remove(struct gb_host_device *hd);
 
 #endif	/* __HD_H */