diff --git a/usbip-svn/drivers/README b/usbip-svn/drivers/README
index 57658ab..2c29cdb 100644
--- a/usbip-svn/drivers/README
+++ b/usbip-svn/drivers/README
@@ -25,4 +25,4 @@ This directory contains the source code of usbip drivers for mainline kernel.
 	To disable debug output temporaly, write 0 to usbip_debug.
 	If you use ZSH,
 	   echo 0 >| /sys/bus/platform/drivers/vhci_hcd/vhci_hcd/usbip_debug
-	   echo 0 >| /sys/bus/usb/drivers/usbip/*/usbip_debug
+	   echo 0 >| /sys/bus/usb/drivers/usbip-host/*/usbip_debug
diff --git a/usbip-svn/src/README b/usbip-svn/src/README
index 72837e4..54e57ca 100644
--- a/usbip-svn/src/README
+++ b/usbip-svn/src/README
@@ -114,7 +114,7 @@ Mark the device of busid 3-3.2 as exportable.
 
    trois:# bind_driver --usbip 3-3.2
    ** (process:24621): DEBUG:  3-3.2:1.0   -> none 
-   ** (process:24621): DEBUG: write "add 3-3.2" to /sys/bus/usb/drivers/usbip/match_busid
+   ** (process:24621): DEBUG: write "add 3-3.2" to /sys/bus/usb/drivers/usbip-host/match_busid
    ** Message: bind 3-3.2 to usbip, complete!
    
    trois:# bind_driver --list
diff --git a/usbip-svn/src/cmd/bind-driver.c b/usbip-svn/src/cmd/bind-driver.c
index e101658..a1c7d96 100644
--- a/usbip-svn/src/cmd/bind-driver.c
+++ b/usbip-svn/src/cmd/bind-driver.c
@@ -28,7 +28,7 @@ static const struct option longopts[] = {
 	{NULL,		0,			NULL,  0}
 };
 
-static const char match_busid_path[] = "/sys/bus/usb/drivers/usbip/match_busid";
+static const char match_busid_path[] = "/sys/bus/usb/drivers/usbip-host/match_busid";
 
 
 static void show_help(void)
@@ -227,9 +227,9 @@ static int bind_to_usbip(char *busid)
  	for (i = 0; i < ninterface; i++) {
 		int ret;
 
-		ret = bind_interface(busid, configvalue, i, "usbip");
+		ret = bind_interface(busid, configvalue, i, "usbip-host");
 		if (ret < 0) {
-			g_warning("bind usbip at %s:%d.%d, failed",
+			g_warning("bind usbip-host at %s:%d.%d, failed",
 					busid, configvalue, i);
 			failed = 1;
 			/* need to contine binding at other interfaces */
@@ -261,12 +261,12 @@ static int use_device_by_usbip(char *busid)
 
 	ret = bind_to_usbip(busid);
 	if (ret < 0) {
-		g_warning("bind usbip to %s, failed", busid);
+		g_warning("bind usbip-host to %s, failed", busid);
 		modify_match_busid(busid, 0);
 		return -1;
 	}
 
-	g_message("bind %s to usbip, complete!", busid);
+	g_message("bind %s to usbip-host, complete!", busid);
 
 	return 0;
 }
@@ -297,7 +297,7 @@ static int use_device_by_other(char *busid)
 		return -1;
 	}
 
-	g_message("bind %s to other drivers than usbip, complete!", busid);
+	g_message("bind %s to other drivers than usbip-host, complete!", busid);
 
 	return 0;
 }
diff --git a/usbip-svn/src/lib/stub_driver.c b/usbip-svn/src/lib/stub_driver.c
index 248e98d..7613a0d 100644
--- a/usbip-svn/src/lib/stub_driver.c
+++ b/usbip-svn/src/lib/stub_driver.c
@@ -4,7 +4,7 @@
 
 #include "usbip.h"
 
-static const char *usbip_stub_driver_name = "usbip";
+static const char *usbip_stub_driver_name = "usbip-host";
 
 
 struct usbip_stub_driver *stub_driver;