netdev->flags |= IFF_ECHO; /* we support full roundtrip echo */
 
        /* dev setup */
-       strcpy(dev->bt_const.name, "gs_usb");
+       strcpy(dev->bt_const.name, KBUILD_MODNAME);
        dev->bt_const.tseg1_min = le32_to_cpu(bt_const->tseg1_min);
        dev->bt_const.tseg1_max = le32_to_cpu(bt_const->tseg1_max);
        dev->bt_const.tseg2_min = le32_to_cpu(bt_const->tseg2_min);
                        return ERR_PTR(rc);
                }
 
-               strcpy(dev->data_bt_const.name, "gs_usb");
+               strcpy(dev->data_bt_const.name, KBUILD_MODNAME);
                dev->data_bt_const.tseg1_min = le32_to_cpu(bt_const_extended->dtseg1_min);
                dev->data_bt_const.tseg1_max = le32_to_cpu(bt_const_extended->dtseg1_max);
                dev->data_bt_const.tseg2_min = le32_to_cpu(bt_const_extended->dtseg2_min);
 MODULE_DEVICE_TABLE(usb, gs_usb_table);
 
 static struct usb_driver gs_usb_driver = {
-       .name = "gs_usb",
+       .name = KBUILD_MODNAME,
        .probe = gs_usb_probe,
        .disconnect = gs_usb_disconnect,
        .id_table = gs_usb_table,