diff --git a/components/drivers/hwtimer/hwtimer.c b/components/drivers/hwtimer/hwtimer.c
index 83a76c7b9d..3953919fae 100644
--- a/components/drivers/hwtimer/hwtimer.c
+++ b/components/drivers/hwtimer/hwtimer.c
@@ -255,6 +255,7 @@ static rt_err_t rt_hwtimer_control(struct rt_device *dev, int cmd, void *args)
 
         *((struct rt_hwtimer_info*)args) = *timer->info;
     }
+    break;
     case HWTIMER_CTRL_MODE_SET:
     {
         rt_hwtimer_mode_t *m;
diff --git a/components/drivers/include/drivers/rt_inputcapture.h b/components/drivers/include/drivers/rt_inputcapture.h
index 0cadf6444c..40cd55883d 100644
--- a/components/drivers/include/drivers/rt_inputcapture.h
+++ b/components/drivers/include/drivers/rt_inputcapture.h
@@ -48,7 +48,7 @@ struct rt_inputcapture_ops
     rt_err_t (*get_pulsewidth)(struct rt_inputcapture_device *inputcapture, rt_uint32_t *pulsewidth_us);
 };
 
-void rt_hw_capture_isr(struct rt_inputcapture_device *inputcapture, rt_bool_t level);
+void rt_hw_inputcapture_isr(struct rt_inputcapture_device *inputcapture, rt_bool_t level);
 
 rt_err_t rt_device_inputcapture_register(struct rt_inputcapture_device *inputcapture,
                                          const char                    *name,
diff --git a/components/drivers/usb/usbdevice/SConscript b/components/drivers/usb/usbdevice/SConscript
index 876875f8bc..b6dfa8da10 100644
--- a/components/drivers/usb/usbdevice/SConscript
+++ b/components/drivers/usb/usbdevice/SConscript
@@ -3,7 +3,7 @@ from building import *
 
 cwd = GetCurrentDir()
 src = Split("""
-core/ud_core.c
+core/usbdevice_core.c
 core/usbdevice.c
 """)
 
diff --git a/components/drivers/usb/usbdevice/core/ud_core.c b/components/drivers/usb/usbdevice/core/usbdevice_core.c
similarity index 100%
rename from components/drivers/usb/usbdevice/core/ud_core.c
rename to components/drivers/usb/usbdevice/core/usbdevice_core.c
diff --git a/components/drivers/usb/usbhost/SConscript b/components/drivers/usb/usbhost/SConscript
index f497f8868d..081c732819 100644
--- a/components/drivers/usb/usbhost/SConscript
+++ b/components/drivers/usb/usbhost/SConscript
@@ -3,7 +3,7 @@ from building import *
 
 cwd = GetCurrentDir()
 src = Split("""
-core/uh_core.c
+core/usbhost_core.c
 core/driver.c
 core/usbhost.c
 core/hub.c
diff --git a/components/drivers/usb/usbhost/core/uh_core.c b/components/drivers/usb/usbhost/core/usbhost_core.c
similarity index 100%
rename from components/drivers/usb/usbhost/core/uh_core.c
rename to components/drivers/usb/usbhost/core/usbhost_core.c