Fix USB names to C-Style
Fix USB names to C-Style