use '_' in modules name

3 files changed, 154 insertions, 154 deletions

diff --git a/lst/isatable b/lst/isatable
index 29b0112d..5a648f30 100644
--- a/lst/isatable
+++ b/lst/isatable
@@ -6,7 +6,7 @@
 "@P@1001"	"unknown"	"Advance Logic|ALS-110 Sound chip"	"unknown"	""
 "@X@0001"	"unknown"	"Diamond Technologies|DT-0197H subdevice"
 "@X@1001"	"unknown"	"Advance Logic|ALS-110 OPL3"	"sound"	"IS_OPL3	"
-"@@@0001"	"snd-cmi8330"	"C-Media|CMI CMI8330 SoundPRO"	"sound"	""
+"@@@0001"	"snd_cmi8330"	"C-Media|CMI CMI8330 SoundPRO"	"sound"	""
 "@@@9519"	"ne"	"unknown|NE2000 plug&play ethernet card"	"ethernet"	"IS_OPL3"
 "0Z08047"	"unknown"	"Zoom|56K/V90"	"modem"	""
 "ABP0174"	"ignore"	"AdvanSys|ABP742 SCSI Controller"	"scsi"	""
@@ -44,21 +44,21 @@
 "ADP7770"	"ignore"	"Adaptec|AIC-777X EISA SCSI Host"	"scsi"	""
 "ADP7771"	"ignore"	"Adaptec|AIC-7770 (AHA-274X) EISA SCSI Host"	"scsi"	""
 "ADP7880"	"ignore"	"Adaptec|AIC-7880 SCSI Host"	"scsi"	""
-"ADS7150"	snd-ad1816a"	"Analog Devices|AD1815"	"sound"	""
+"ADS7150"	snd_ad1816a"	"Analog Devices|AD1815"	"sound"	""
 "ADS7180"	"ad1816"	"Terratec|Soundsystem BASE 1"	"sound"	"HAS_DMA16"
 "ADS7181"	"mpu401"	"Terratec|Soundsystem BASE 1/MIDI"	"sound"	"HAS_MPU401"
 "ADS7182"	"unknown"	"Terratec|Soundsystem BASE 1/Gameport"	"joystick"	"HAS_JOYSTICK"
-"ADV550A"	"snd-interwave-stb"	"InterWave|STB with TEA6330T"	"sound"	""
+"ADV550A"	"snd_interwave_stb"	"InterWave|STB with TEA6330T"	"sound"	""
 "ADV55AA"	"ignore"	"AMD|PCNET Family Ethernet/ISA+"	"ethernet"	""
-"ADV55FF"	"snd-interwave"	"Panasonic|PCA761AW Audio Card"
+"ADV55FF"	"snd_interwave"	"Panasonic|PCA761AW Audio Card"
 "AEI0218"	"unknown"	"Actiontec|PCMCIA Adapter"	"unknown"	""
 "ALI1489"	"unknown"	"ALI|EIDE Controller"	"ide"	""
 "ALS0001"	"sb"	"Advance Logic|ALS-001 - PRO16PNP"	"sound"	""
 "ALS0007"	"sb"	"Advance Logic|ALS-007"	"sound"	"HAS_DMA16"
 "ALS0100"	"sb"	"Advance Logic|ALS-100"	"sound"	"HAS_DMA16"
-"ALS0110"	"snd-als100"	"Advance Logic|ALS-110 - MF1000 - Digimate 3D Sound"	"sound"	""
+"ALS0110"	"snd_als100"	"Advance Logic|ALS-110 - MF1000 - Digimate 3D Sound"	"sound"	""
 "ALS0120"	"sb"	"Advance Logic|ALS-120"	"sound"	"HAS_DMA16"
-"ALS0200"	"snd-als100"	"Advance Logic|ALS-200"	"sound"	""
+"ALS0200"	"snd_als100"	"Advance Logic|ALS-200"	"sound"	""
 "AMI15D1"	"unknown"	"AMI|Series-15 Host/A BIOS 1.10"	"unknown"	""
 "AMI15E1"	"unknown"	"AMI|Series-15 Host/A BIOS 1.20+"	"unknown"	""
 "AMI16B1"	"unknown"	"AMI|Enterprise II"	"unknown"	""
@@ -132,18 +132,18 @@
 "AXE2201"	"ne"	"Xerox Corporation|SN2000"	"ethernet"	""
 "AZT0500"	"unknown"	"Aztech|AZT3000 IDE CDROM"	"ide"	""
 "AZT1003"	"sb"	"Aztech|AZT3000"	"sound"	"Audio	HAS_DMA16"
-"AZT1022"	"snd-ad1816a"	"Analog|AD1816A - Aztech/Newcom SC-16 3D"	"sound"	""
-"AZT1008"	"snd-azt2320"	"Aztech|PRO16V [AZT2320]"
+"AZT1022"	"snd_ad1816a"	"Analog|AD1816A - Aztech/Newcom SC-16 3D"	"sound"	""
+"AZT1008"	"snd_azt2320"	"Aztech|PRO16V [AZT2320]"
 "AZT1605"	"sb"	"Aztech|Sound Galaxy Nova 16"	"sound"	""
 "AZT1608"	"sb"	"Aztech|Sound Galaxy Pro 16"	"sound"	""
 "AZT2001"	"unknown"	"Aztech|AZT3000"	"sound"	"MPU401	IS_MPU401"
 "AZT2316"	"sb"	"Aztech|Sound Galaxy Washington 16"	"sound"	"HAS_DMA16"
 "AZT2320"	"sb"	"Aztech|Sound Galaxy 16"	"sound"	"HAS_DMA16"
-"AZT3000"	"snd-azt2320"	"Aztech|AZT300: Packard Bell Sound III 336 AM/SP"	"sound"	""
+"AZT3000"	"snd_azt2320"	"Aztech|AZT300: Packard Bell Sound III 336 AM/SP"	"sound"	""
 "AZT3001"	"unknown"	"Aztech|AZT3000 Game Port"	"joystick"	""
-"AZT3002"	"snd-azt2320"	"Aztech|AT3300"	"sound"	""
-"AZT3005"	"snd-azt2320"	"Aztech|???"	"sound"	""
-"AZT3011"	"snd-azt2320"	"Aztech|???"	"sound"	""
+"AZT3002"	"snd_azt2320"	"Aztech|AT3300"	"sound"	""
+"AZT3005"	"snd_azt2320"	"Aztech|???"	"sound"	""
+"AZT3011"	"snd_azt2320"	"Aztech|???"	"sound"	""
 "AZT4001"	"unknown"	"Aztech|AZT3000 Modem"	"modem"	""
 "AZT5001"	"unknown"	"Aztech|AZT3000 EEPROM"	"unknown"	""
 "BRI0200"	"unknown"	"Boca|Complete Office Communicator (audio)"	"unknown"	""
@@ -152,8 +152,8 @@
 "BTU3840"	"ne"	"Boca Research|Lancard 2000 plus combo"	"ethernet"	""
 "BUS0042"	"unknown"	"BusLogic|MultiMaster SCSI Host"	"unknown"	""
 "BUS4201"	"unknown"	"BusLogic|MultiMaster EISA SCSI Host"	"unknown"	""
-"CDC1111"	"snd-interwave"	"Gravis|Dynasonic Pro"	"sound"	""
-"CMI0001"	"snd-cmi8330"	"C-Media|CMI CMI8330 SoundPRO"	"sound"	""
+"CDC1111"	"snd_interwave"	"Gravis|Dynasonic Pro"	"sound"	""
+"CMI0001"	"snd_cmi8330"	"C-Media|CMI CMI8330 SoundPRO"	"sound"	""
 "CON0071"	"unknown"	"CONTEC|C-NET(AT)P Adapter"	"unknown"	""
 "CON0072"	"unknown"	"CONTEC|C-NET(AT)P Adapter"	"unknown"	""
 "CPL05F4"	"unknown"	"Compal|562DU"	"unknown"	""
@@ -310,41 +310,41 @@
 "CSC000f"	"unknown"	"Crystal|Game Port"	"joystick"	""
 "CSC0010"	"unknown"	"Crystal|PnP Audio System Control Registers"	"sound"	""
 "CSC0100"	"ad1848"	"Crystal|CSC4232"	"sound"	"HAS_DMA16|HAS_MPU401|HAS_JOYSTICK"
-"CSC0225"	"snd-cs4236"	"Intel|Marlin Spike Motherboard - CS4235"	"sound"	""
-"CSC0437"	"snd-cs4236"	"Genius|Sound Maker 3DJ - CS4237B"	"sound"	""
-"CSC0735"	"snd-cs4236"	"Digital|PC 5000 Onboard - CS4236B"	"sound"	""
-"CSC0B35"	"snd-cs4236"	"Unknown|CS4236B"	"sound"	""
-"CSC0D32"	"snd-cs4232"	"Philips|PCA70PS"	"sound"	""
-"CSC1335"	"snd-cs4236"	"Gateway|E1000 Onboard CS4236B"	"sound"	""
-"CSC1425"	"snd-cs4236"	"Unknown|CS4235 on mainboard without MPU"	"sound"	""
-"CSC1525"	"snd-cs4236"	"HP|6330 Onboard sound"	"sound"	""
-"CSC1A32"	"snd-cs4232"	"TerraTec|Maestro 32/96 (CS4232)"	"sound"	""
-"CSC1E37"	"snd-cs4236"	"Crystal|TidalWave128"	"sound"	""
-"CSC4232"	"snd-cs4232"	"HP|Omnibook 5500 onboard"	"sound"	""
-"CSC4236"	"snd-cs4236"	"Crystal|MagicSound 16bit PnP"	"sound"	""
-"CSC4336"	"snd-cs4236"	"Crystal|3D - CS4237B"	"sound"	""
-"CSC4536"	"snd-cs4236"	"Typhoon|Soundsystem PnP - CS4236B"	"sound"	""
-"CSC4625"	"snd-cs4236"	"Crystal|CX4235-XQ3 EP"	"sound"	""
-"CSC4637"	"snd-cs4236"	"Crystal|CS4237B"	"sound"	""
-"CSC4837"	"snd-cs4236"	"NewClear|3D - CX4237B-XQ3"	"sound"	""
-"CSC6835"	"snd-cs4236"	"Dell|Optiplex GX1 - CS4236B"	"sound"	""
-"CSC6836"	"snd-cs4236"	"Dell|Workstation 400 Onboard - CS4236B"	"sound"	""
+"CSC0225"	"snd_cs4236"	"Intel|Marlin Spike Motherboard - CS4235"	"sound"	""
+"CSC0437"	"snd_cs4236"	"Genius|Sound Maker 3DJ - CS4237B"	"sound"	""
+"CSC0735"	"snd_cs4236"	"Digital|PC 5000 Onboard - CS4236B"	"sound"	""
+"CSC0B35"	"snd_cs4236"	"Unknown|CS4236B"	"sound"	""
+"CSC0D32"	"snd_cs4232"	"Philips|PCA70PS"	"sound"	""
+"CSC1335"	"snd_cs4236"	"Gateway|E1000 Onboard CS4236B"	"sound"	""
+"CSC1425"	"snd_cs4236"	"Unknown|CS4235 on mainboard without MPU"	"sound"	""
+"CSC1525"	"snd_cs4236"	"HP|6330 Onboard sound"	"sound"	""
+"CSC1A32"	"snd_cs4232"	"TerraTec|Maestro 32/96 (CS4232)"	"sound"	""
+"CSC1E37"	"snd_cs4236"	"Crystal|TidalWave128"	"sound"	""
+"CSC4232"	"snd_cs4232"	"HP|Omnibook 5500 onboard"	"sound"	""
+"CSC4236"	"snd_cs4236"	"Crystal|MagicSound 16bit PnP"	"sound"	""
+"CSC4336"	"snd_cs4236"	"Crystal|3D - CS4237B"	"sound"	""
+"CSC4536"	"snd_cs4236"	"Typhoon|Soundsystem PnP - CS4236B"	"sound"	""
+"CSC4625"	"snd_cs4236"	"Crystal|CX4235-XQ3 EP"	"sound"	""
+"CSC4637"	"snd_cs4236"	"Crystal|CS4237B"	"sound"	""
+"CSC4837"	"snd_cs4236"	"NewClear|3D - CX4237B-XQ3"	"sound"	""
+"CSC6835"	"snd_cs4236"	"Dell|Optiplex GX1 - CS4236B"	"sound"	""
+"CSC6836"	"snd_cs4236"	"Dell|Workstation 400 Onboard - CS4236B"	"sound"	""
 "CSC7532"	"wavefront"	"Turtle Beach|Wavefront Tropez (?TBS-2000?)"	"sound"	""
-"CSC7537"	"snd-cs4236"	"Turtle Beach|Malibu - CS4237B"	"sound"	""
+"CSC7537"	"snd_cs4236"	"Turtle Beach|Malibu - CS4237B"	"sound"	""
 "CSC7632"	"wavefront"	"Turtle Beach|Wavefront Tropez+"	"sound"	""
-"CSC8025"	"snd-cs4236"	"Unknown|CS4235 - onboard"	"sound"	""
-"CSC8037"	"snd-cs4236"	"IBM|Aptiva 2137 E24 Onboard - CS4237B"	"sound"	""
-"CSC9836"	"snd-cs4236"	"Guillemot|MaxiSound 16 PnP - CS4236B"	"sound"	""
-"CSC9837"	"snd-cs4236"	"Gallant|SC-70P"	"sound"	""
-"CSCA800"	"snd-cs4236"	"TerraTec|AudioSystem EWS64XL - CS4236B"	"sound"	""
-"CSCC835"	"snd-cs4236"	"IBM|IntelliStation M Pro motherboard"	"sound"	""
-"CSCD925"	"snd-cs4236"	"ACER|AW37/Pro - CS4235"	"sound"	""
-"CSCD937"	"snd-cs4236"	"ACER|AW35/Pro - CS4237B"	"sound"	""
-"CSCE825"	"snd-cs4236"	"Unknown|CS4235 without MPU401"	"sound"	""
-"CSCE836"	"snd-cs4236"	"IBM|PC 300PL Onboard - CS4236B"	"sound"	""
-"CSCF032"	"snd-cs4232"	"SIC|CrystalWave 32 (CS4232)"	"sound"	""
-"CSCF235"	"snd-cs4236"	"Unknown|CS4236B"	"sound"	""
-"CSCF238"	"snd-cs4236"	"Unknown|CS4236B"	"sound"	""
+"CSC8025"	"snd_cs4236"	"Unknown|CS4235 - onboard"	"sound"	""
+"CSC8037"	"snd_cs4236"	"IBM|Aptiva 2137 E24 Onboard - CS4237B"	"sound"	""
+"CSC9836"	"snd_cs4236"	"Guillemot|MaxiSound 16 PnP - CS4236B"	"sound"	""
+"CSC9837"	"snd_cs4236"	"Gallant|SC-70P"	"sound"	""
+"CSCA800"	"snd_cs4236"	"TerraTec|AudioSystem EWS64XL - CS4236B"	"sound"	""
+"CSCC835"	"snd_cs4236"	"IBM|IntelliStation M Pro motherboard"	"sound"	""
+"CSCD925"	"snd_cs4236"	"ACER|AW37/Pro - CS4235"	"sound"	""
+"CSCD937"	"snd_cs4236"	"ACER|AW35/Pro - CS4237B"	"sound"	""
+"CSCE825"	"snd_cs4236"	"Unknown|CS4235 without MPU401"	"sound"	""
+"CSCE836"	"snd_cs4236"	"IBM|PC 300PL Onboard - CS4236B"	"sound"	""
+"CSCF032"	"snd_cs4232"	"SIC|CrystalWave 32 (CS4232)"	"sound"	""
+"CSCF235"	"snd_cs4236"	"Unknown|CS4236B"	"sound"	""
+"CSCF238"	"snd_cs4236"	"Unknown|CS4236B"	"sound"	""
 "CSCFFFF"	"unknown"	"Crystal|PnP Audio System CODEC"	"unknown"	""
 "CSI0600"	"unknown"	"Cabletron|Systems CSI F70xx EISA FDDI Adapter Card"	"unknown"	""
 "CSI0690"	"unknown"	"Cabletron|Systems CSI F70X9 EISA FDDI DNI Adapter Card"	"unknown"	""
@@ -365,7 +365,7 @@
 "CTL002B"	"sb"	"Creative Labs|SB16 PnP"	"sound"	"HAS_OPL3|HAS_MPU401|HAS_DMA16"
 "CTL002C"	"sb"	"Creative Labs|SB16 PnP"	"sound"	"HAS_OPL3|HAS_MPU401|HAS_DMA16"
 "CTL0031"	"sb"	"Creative Labs|SB32 PnP Audio Device"	"sound"	"HAS_DMA16|HAS_AWE|HAS_OPL3|HAS_JOYSTICK"
-"CTL0035"	"snd-sb16"	"Creative Labs|Sound Blaster AWE 32 PnP"	"sound"	""
+"CTL0035"	"snd_sb16"	"Creative Labs|Sound Blaster AWE 32 PnP"	"sound"	""
 "CTL0039"	"sb"	"Creative Labs|SB AWE32"	"sound"	"HAS_DMA16|HAS_OPL3|HAS_AWE|HAS_JOYSTICK"
 "CTL0041"	"sb"	"Creative Labs|Audio Device (V16CL/V32D/V32G)"	"sound"	"HAS_DMA16|HAS_JOYSTICK"
 "CTL0042"	"sb"	"Creative Labs|SB AWE64 16-bit Audio"	"sound"	"HAS_DMA16|HAS_OPL3|HAS_AWE|HAS_JOYSTICK"
@@ -380,7 +380,7 @@
 "CTL0070"	"sb"	"Creative Labs|Vibra16C"	"sound"	""
 "CTL0080"	"sb"	"Creative Labs|Vibra16CL"	"sound"	"HAS_OPL3|HAS_MPU401|HAS_DMA16"
 "CTL0086"	"sb"	"Creative Labs|SB16"	"sound"	"HAS_OPL3|HAS_MPU401|HAS_DMA16"
-"CTL009A"	"snd-sb16"	"Creative Labs|SB AWE32 PnP"	"sound"	""
+"CTL009A"	"snd_sb16"	"Creative Labs|SB AWE32 PnP"	"sound"	""
 "CTL009C"	"sb"	"Creative Labs|SB AWE32 PnP"	"sound"	""
 "CTL009D"	"sb"	"Creative Labs|SB AWE64 PnP"	"sound"	""
 "CTL009E"	"sb"	"Creative Labs|SB AWE64 PnP Gold"	"sound"	""
@@ -467,7 +467,7 @@
 "DXP0013"	"unknown"	"DataExpert|InterWave FM/SB Emulation"	"unknown"	""
 "DXP0014"	"unknown"	"DataExpert|InterWave MPU-401 Emulation"	"sound"	"IS_MP401"
 "DXP0015"	"unknown"	"DataExpert|InterWave 3D Stereo Enhancer"	"unknown"	""
-"DXP3201"	"snd-interwave"	"DataExpert|MED3201 Audio Card"	"unknown"	""
+"DXP3201"	"snd_interwave"	"DataExpert|MED3201 Audio Card"	"unknown"	""
 "ECS0001"	"unknown"	"ECS|Vertos 1401"	"unknown"	""
 "ECS0002"	"unknown"	"ECS|Vertos 1501"	"unknown"	""
 "ECS0003"	"unknown"	"ECS|Vertos 1502"	"unknown"	""
@@ -518,7 +518,7 @@
 "ESS0000"	"unknown"	"ESS|ES1868 Control Interface"	"unknown"	""
 "ESS0001"	"unknown"	"ESS|ESS1869 Control Interface"	"unknown"	""
 "ESS0002"	"unknown"	"ESS|ESS1869 Control Interface"	"unknown"	""
-"ESS0003"	""snd-es18xx"	"ESS|ES1869 Plug and Play AudioDrive"	"sound"	""
+"ESS0003"	""snd_es18xx"	"ESS|ES1869 Plug and Play AudioDrive"	"sound"	""
 "ESS0004"	"unknown"	"ESS|ES1878 Control Interface"	"unknown"	""
 "ESS0006"	"sb"	"ESS|ESS1869"	"sound"	"PnP AudioDrive	HAS_DMA16"
 "ESS0100"	"sb"	"ESS|ES688 PnP AudioDrive"	"sound"	""
@@ -526,7 +526,7 @@
 "ESS0104"	"sb"	"ESS|ES1788 PnP AudioDrive"	"sound"	""
 "ESS0106"	"sb"	"ESS|ES1888 PnP AudioDrive"	"sound"	""
 "ESS0108"	"sb"	"ESS|ES888 PnP AudioDrive"	"sound"	""
-"ESS0968"	"snd-es968"	"ESS|1688"	"sound"	""
+"ESS0968"	"snd_es968"	"ESS|1688"	"sound"	""
 "ESS1481"	"sb"	"ESS|ES1488 AudioDrive"	"sound"	""
 "ESS1668"	"sb"	"ESS|1668"	"sound"	""
 "ESS1669"	"sb"	"ESS|1669"	"sound"	""
@@ -535,9 +535,9 @@
 "ESS1681"	"sb"	"ESS|ES1688 AudioDrive"	"sound"	""
 "ESS1781"	"sb"	"ESS|ES1788 AudioDrive"	"sound"	""
 "ESS1868"	"sb"	"ESS|ES1868 PnP AudioDrive"	"sound"	"HAS_DMA16|HAS_OPL3"
-"ESS1869"	"snd-es18xx"	"ESS|ES1869"	"sound"	""
+"ESS1869"	"snd_es18xx"	"ESS|ES1869"	"sound"	""
 "ESS1878"	"sb"	"ESS|ES1878 PnP AudioDrive"	"sound"	""
-"ESS1879"	"snd-es18xx"	"ESS|ES1879"	"sound"	""
+"ESS1879"	"snd_es18xx"	"ESS|ES1879"	"sound"	""
 "ESS1881"	"sb"	"ESS|ES1888 AudioDrive"	"sound"	""
 "ESS4881"	"unknown"	"ESS|ES488 AudioDrive"	"sound"	""
 "ESS6880"	"sb"	"ESS|ES688 AudioDrive + game port"	"sound"	"HAS_JOYSTICK"
@@ -1007,7 +1007,7 @@
 "LGI8002"	"unknown"	"Mouse|Logitech"	"unknown"	""
 "LGI800D"	"unknown"	"Mouse|Logitech"	"unknown"	""
 "LNE2000"	"ne"	"Linksys|Ether16 LAN Card"	"ethernet"	""
-"LWC1061"	"snd-a1848a"	"Highscreen|Sound-Boostar 16 3D"	"sound"	""
+"LWC1061"	"snd_a1848a"	"Highscreen|Sound-Boostar 16 3D"	"sound"	""
 "MAG00E3"	"unknown"	"MAG|InnoVision DX17T"	"unknown"	""
 "MAG11A6"	"unknown"	"MAG|InnoVision DX1495"	"unknown"	""
 "MAG15F4"	"unknown"	"MAG|InnoVision DX1595"	"unknown"	""
@@ -1032,7 +1032,7 @@
 "MDG0002"	"unknown"	"Madge|Smart 16/4 EISA Ringnode"	"unknown"	""
 "MDG0004"	"unknown"	"Madge|Smart 16/4 EISA Ringnode Mk3"	"unknown"	""
 "MDG0101"	"unknown"	"Madge|Smart 16/4 ISA Client PnP Ringnode"	"unknown"	""
-"MDK1605"	"snd-ad1816a"	"Highscreen|Sound-Boostar 16 3D"	"sound"	""
+"MDK1605"	"snd_ad1816a"	"Highscreen|Sound-Boostar 16 3D"	"sound"	""
 "MDY1900"	"unknown"	"Microdyne|NE2500 Ethernet Adapter"	"unknown"	""
 "MDY1901"	"unknown"	"Microdyne|NE2500T Ethernet Adapter"	"unknown"	""
 "MEI1604"	"unknown"	"Panasonic|TX-D2151W-ES"	"unknown"	""
@@ -1150,7 +1150,7 @@
 "NIC1601"	"unknown"	"Tulip|NCC16/NCC16HUB"	"unknown"	""
 "NIC1602"	"unknown"	"Tulip|NCC16/NCC16HUB"	"unknown"	""
 "NMX0010"	"unknown"	"NeoMagic|MagicGraph 128 VL"	"unknown"	""
-"NMX2200"	"snd-opl3sa2"	"NeoMagic|MagicWave 3DX"	"sound"	""
+"NMX2200"	"snd_opl3sa2"	"NeoMagic|MagicWave 3DX"	"sound"	""
 "NOK0085"	"unknown"	"NOKIA|449E"	"unknown"	""
 "NOK008D"	"unknown"	"NOKIA|449M"	"unknown"	""
 "NOK0093"	"unknown"	"NOKIA|44BS"	"unknown"	""
@@ -1196,12 +1196,12 @@
 "OPT0005"	"unknown"	"OPTi|SoundExpression SRS Sound Controller"	"unknown"	""
 "OPT0006"	"unknown"	"OPTi|PNP COM Port"	"unknown"	""
 "OPT0007"	"unknown"	"OPTi|PNP IDE Controller"	"ide"	""
-"OPT0924"	"snd-opti92x-ad1848"	"OPTi|82C924"	"sound"	""
-"OPT0925"	"snd-opti92x-ad1848"	"OPTi|82C925"	"sound"	""
-"OPT0928"	"snd-opti92x-ad1848"	"OPTi|82C928"	"sound"	""
-"OPT0930"	"snd-opti92x-ad1848"	"OPTi|86C930"	"sound"	"HAS_DMA16|HAS_MPU401"
+"OPT0924"	"snd_opti92x_ad1848"	"OPTi|82C924"	"sound"	""
+"OPT0925"	"snd_opti92x_ad1848"	"OPTi|82C925"	"sound"	""
+"OPT0928"	"snd_opti92x_ad1848"	"OPTi|82C928"	"sound"	""
+"OPT0930"	"snd_opti92x_ad1848"	"OPTi|86C930"	"sound"	"HAS_DMA16|HAS_MPU401"
 "OPT0931"	"mad16"	"OPTi|86C931 Audio Card"	"sound"	"HAS_DMA16|HAS_MPU401"
-"OPT0933"	"snd-opti92x-ad1848"	"OPTi|86C933"	"sound"	"HAS_DMA16|HAS_MPU401"
+"OPT0933"	"snd_opti92x_ad1848"	"OPTi|86C933"	"sound"	"HAS_DMA16|HAS_MPU401"
 "OPT9300"	"mad16"	"OPTi|930 Sound/OPL3 Device"	"sound"	"HAS_DMA16|HAS_MPU401"
 "OPT9301"	"unknown"	"OPTi|930 MPU-401 Device"	"unknown"	""
 "OPT9310"	"mad16"	"OPTi|PNP Sound System"	"sound"	"HAS_DMA16|HAS_MPU401"
@@ -1638,10 +1638,10 @@
 "RSS0251"	"unknown"	"Rockwell|K56Flex Plug-and-Play"	"modem"	""
 "RSS0262"	"unknown"	"WiseCom|5614Jx3[G] V90+K56Flex Internal Modem"	"modem"	""
 "RTI1600"	"unknown"	"RT1600/E|SCSI Miniport Driver"	"unknown"	""
-"RTL3000"	"snd-als100"	"Advance Logic|RTL-3000"	"sound"	""
+"RTL3000"	"snd_als100"	"Advance Logic|RTL-3000"	"sound"	""
 "RTL8019"	"ne"	"Realtek|RTL8019 Ethernet NIC"	"ethernet"	""
 "RTL8029"	"ne"	"Realtek|RTL8029 Ethernet NIC"	"ethernet"	""
-"RWB1688"	"snd-dt019x"	"Diamond Technologies|DT-0197H (DT197A30)"	""sound"	""
+"RWB1688"	"snd_dt019x"	"Diamond Technologies|DT-0197H (DT197A30)"	""sound"	""
 "SAM0000"	"unknown"	"Samsung|SyncMaster 3Ne"	"unknown"	""
 "SAM0100"	"unknown"	"Samsung|SyncMaster 4S"	"unknown"	""
 "SAM1530"	"unknown"	"Samsung|SyncMaster 15GLsi"	"unknown"	""
@@ -1709,7 +1709,7 @@
 "SML6013"	"unknown"	"Smile|CA6013DS"	"unknown"	""
 "SML6719"	"unknown"	"Smile|CA6719"	"unknown"	""
 "SML8819"	"unknown"	"Smile|MM/CA6536DL/SL(NF)"	"unknown"	""
-"SMM7180"	"snd-ad1816a"	"Shark Predator ISA"	"sound"	""
+"SMM7180"	"snd_ad1816a"	"Shark Predator ISA"	"sound"	""
 "SNY0000"	"xunknown"	"Sony|CPD-15SF2/SX1/17SF2/17SE2T/20SF2"	"unknown"	""
 "SNY0050"	"unknown"	"Sony|CPD-100VS"	"unknown"	""
 "SNY00E0"	"unknown"	"Sony|GDM-W900"	"unknown"	""
@@ -1743,7 +1743,7 @@
 "SRC0836"	"unknown"	"ShamRock|SRC2102"	"unknown"	""
 "SSC0000"	"unknown"	"Sierra|14,4k SQ3228"	"modem"	""
 "SSC0001"	"unknown"	"Sierra|14,4k SQ3262"	"modem"	""
-"STB011A"	"snd-interwave"	"Gravis|UltraSound Plug & Play"
+"STB011A"	"snd_interwave"	"Gravis|UltraSound Plug & Play"
 "SUP0980"	"unknown"	"Diamon|SupraFAXModem V.32bis PnP"	"modem"	""
 "SUP1150"	"unknown"	"Diamond|SupraExpress 144 Plus PnP"	"modem"	""
 "SUP1200"	"unknown"	"Diamond|SupraFAXModem 288 PnP"	"modem"	""
@@ -1780,8 +1780,8 @@
 "TCM619C"	"unknown"	"3Com|3C619C Network Adapter"	"unknown"	""
 "TCM7700"	"unknown"	"3Com|3C770 FDDI Adapter"	"unknown"	""
 "TCO4145"	"unknown"	"Thomas-Conrad|Token Ring TC4145"	"unknown"	""
-"TER1411"	"snd-ad1816a"	"Analog Devices|AD1816A - Terratec Base 64"	"sound"	""
-"TER1112"	"snd-ad1816a"	"Analog Devices|AD1816A - Terratec AudioSystem EWS64S"	"sound"	""
+"TER1411"	"snd_ad1816a"	"Analog Devices|AD1816A - Terratec Base 64"	"sound"	""
+"TER1112"	"snd_ad1816a"	"Analog Devices|AD1816A - Terratec AudioSystem EWS64S"	"sound"	""
 "TER2211"	"unknown"	"Terratec|Soundsystem BASE 1/???"	"unknown"	""
 "TEX0011"	"unknown"	"Texas Instruments|33600/Fax"	"unknown"	""
 "TEX1100"	"unknown"	"Texas Instruments|V.34+ Internal PnP FAX"	"unknown"	""
@@ -1907,7 +1907,7 @@
 "YMH0023"	"unknown"	"Yamaha|OPL3-SAx COM Port"	"unknown"	""
 "YMH0024"	"unknown"	"Yamaha|OPL3-SAx IDE"	"ide"	""
 "YMH002F"	"unknown"	"Yamaha|OPL3-SAx (Reserved)"	"unknown"	""
-"YMH0030"	"snd-oplsa2"	"Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard)"	"sound"	""
+"YMH0030"	"snd_oplsa2"	"Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard)"	"sound"	""
 "YMH0800"	"opl3sa2"	"Yamaha|OPL3-SA2"	"sound"	"HAS_OPL3|HAS_DMA16|HAS_MPU401"
 "ZDS2000"	"unknown"	"Zenith|SCSI/IDE/Floppy EISA"	"unknown"	""
 "ZDS2010"	"unknown"	"Zenith|EISA IDE Controller"	"unknown"	""
diff --git a/lst/pcitable b/lst/pcitable
index ba5c1524..cb6df636 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -459,15 +459,15 @@
 0x1013	0x1202	"Card:VGA driver (generic)"
 0x1013	0x1204	"Card:VGA driver (generic)"
 0x1014	0x005c	"eepro100"
-0x1022	0x1103	"amd64-agp"
+0x1022	0x1103	"amd64_agp"
 0x1022	0x2000	"pcnet32"
 0x1022	0x2001	"pcnet32"
 0x1022	0x7446	"slamr"
-0x1022	0x7454	"amd64-agp"
-0x1023	0x2000	"snd-trident"
-0x1023	0x2001	"snd-trident"
+0x1022	0x7454	"amd64_agp"
+0x1023	0x2000	"snd_trident"
+0x1023	0x2001	"snd_trident"
 0x1023	0x2100	"Card:Trident-based cards"
-0x1023	0x7018	"snd-trident"
+0x1023	0x7018	"snd_trident"
 0x1023	0x8200	"Card:VESA driver (generic)"
 0x1023	0x8400	"Card:Trident-based cards"
 0x1023	0x8420	"Card:Trident-based cards"
@@ -515,7 +515,7 @@
 0x1023	0x9910	"Card:Trident-based cards"
 0x1023	0x9930	"Card:Trident-based cards"
 0x1024	0x1024	"Hcf:www.linmodems.org"
-0x1025	0x1689	"amd64-agp"
+0x1025	0x1689	"amd64_agp"
 0x102b	0x0001	"Card:Matrox Millennium G series (single head)"
 0x102b	0x0010	"Card:Matrox Millennium / II / Productiva G100"
 0x102b	0x0100	"Card:Matrox Millennium / II / Productiva G100"
@@ -655,7 +655,7 @@
 0x102c	0x00f4	"Card:Chips & Technologies-based cards"
 0x102c	0x0c30	"Card:Chips & Technologies-based cards"
 0x1031	0x5601	"Card:VESA driver (generic)"
-0x1039	0x0008	"i2c-sis5595"
+0x1039	0x0008	"i2c_sis5595"
 0x1039	0x0200	"Card:SiS (old series)"
 0x1039	0x0204	"Card:VESA driver (generic)"
 0x1039	0x0205	"Card:SiS (old series)"
@@ -668,8 +668,8 @@
 0x1039	0x0325	"Card:SiS / XGI (315 / 330 / 340 series)"
 0x1039	0x0330	"Card:SiS / XGI (315 / 330 / 340 series)"
 0x1039	0x0340	"Card:SiS / XGI (315 / 330 / 340 series)"
-0x1039	0x0755	"amd64-agp"
-0x1039	0x0760	"amd64-agp"
+0x1039	0x0755	"amd64_agp"
+0x1039	0x0760	"amd64_agp"
 0x1039	0x5300	"Card:SiS (300 series)"
 0x1039	0x5315	"Card:SiS / XGI (315 / 330 / 340 series)"
 0x1039	0x5597	"Card:SiS (old series)"
@@ -683,7 +683,7 @@
 0x1039	0x6350	"Card:SiS / XGI (315 / 330 / 340 series)"
 0x1039	0x6351	"Card:SiS / XGI (315 / 330 / 340 series)"
 0x1039	0x7013	"slamr"
-0x1039	0x7018	"snd-trident"
+0x1039	0x7018	"snd_trident"
 0x1039	0x7300	"Card:SiS (300 series)"
 0x103c	0x1279	"Card:ATI Mach / Rage-based cards"
 0x1042	0x1000	"rz1000"
@@ -733,16 +733,16 @@
 0x1060	0x886a	"generic"
 0x1061	0x0001	"Card:VGA driver (generic)"
 0x106b	0x0003	"Card:FrameBuffer (generic)"
-0x1073	0x0003	"snd-ymfpci"
-0x1073	0x0004	"snd-ymfpci"
+0x1073	0x0003	"snd_ymfpci"
+0x1073	0x0004	"snd_ymfpci"
 0x1073	0x0005	"ymfpci"
 0x1073	0x0006	"ymfpci"
 0x1073	0x0008	"ymfpci"
-0x1073	0x000a	"snd-ymfpci"
-0x1073	0x000c	"snd-ymfpci"
-0x1073	0x000d	"snd-ymfpci"
+0x1073	0x000a	"snd_ymfpci"
+0x1073	0x000c	"snd_ymfpci"
+0x1073	0x000d	"snd_ymfpci"
 0x1073	0x0010	"ymfpci"
-0x1073	0x0012	"snd-ymfpci"
+0x1073	0x0012	"snd_ymfpci"
 0x1073	0x0020	"ymfpci"
 0x1078	0x0000	"Card:MediaGX"
 0x1078	0x0002	"Card:MediaGX"
@@ -823,17 +823,17 @@
 0x10b5	0x9030	0x1518	0x0200	"snd-vx222"
 0x10b5	0x9030	0x15ed	0x1002	"snd-vx222"
 0x10b5	0x9030	0x15ed	0x1003	"snd-vx222"
-0x10b5	0x9030	"snd-vx222"
-0x10b5	0x9050	"snd-vx222"
+0x10b5	0x9030	"snd_vx222"
+0x10b5	0x9050	"snd_vx222"
 0x10b7	0x7770	"orinoco_plx"
 0x10b7	0x9300	"tulip"
 0x10b9	0x1533	"alim7101_wdt"
-0x10b9	0x1689	"amd64-agp"
-0x10b9	0x1695	"amd64-agp"
+0x10b9	0x1689	"amd64_agp"
+0x10b9	0x1695	"amd64_agp"
 0x10b9	0x5457	"slamr"
 0x10b9	0x5459	"slamr"
 0x10b9	0x545a	"slamr"
-0x10b9	0x7101	"i2c-ali1535"
+0x10b9	0x7101	"i2c_ali1535"
 0x10c3	0x1100	"eepro100"
 0x10c8	0x0001	"Card:NeoMagic MagicGraph (laptop/notebook)"
 0x10c8	0x0002	"Card:NeoMagic MagicGraph (laptop/notebook)"
@@ -844,9 +844,9 @@
 0x10c8	0x0016	"Card:NeoMagic MagicMedia 256XL+"
 0x10c8	0x0025	"Card:NeoMagic MagicMedia (laptop/notebook)"
 0x10c8	0x0083	"Card:NeoMagic MagicGraph (laptop/notebook)"
-0x10c8	0x8005	"snd-nm256"
-0x10c8	0x8006	"snd-nm256"
-0x10c8	0x8016	"snd-nm256"
+0x10c8	0x8005	"snd_nm256"
+0x10c8	0x8006	"snd_nm256"
+0x10c8	0x8016	"snd_nm256"
 0x10d9	0x0512	"tulip"
 0x10d9	0x0531	"tulip"
 0x10d9	0x8625	"tulip"
@@ -877,8 +877,8 @@
 0x10de	0x0049	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x004d	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x004e	"Card:NVIDIA GeForce FX - GeForce 8800"
-0x10de	0x0069	"snd-intel8x0m"
-0x10de	0x0089	"snd-intel8x0m"
+0x10de	0x0069	"snd_intel8x0m"
+0x10de	0x0089	"snd_intel8x0m"
 0x10de	0x0090	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x0091	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x0092	"Card:NVIDIA GeForce FX - GeForce 8800"
@@ -897,9 +897,9 @@
 0x10de	0x00cc	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x00cd	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x00ce	"Card:NVIDIA GeForce FX - GeForce 8800"
-0x10de	0x00d1	"amd64-agp"
-0x10de	0x00d9	"snd-intel8x0m"
-0x10de	0x00e1	"amd64-agp"
+0x10de	0x00d1	"amd64_agp"
+0x10de	0x00d9	"snd_intel8x0m"
+0x10de	0x00e1	"amd64_agp"
 0x10de	0x00f0	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x00f1	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x00f2	"Card:NVIDIA GeForce FX - GeForce 8800"
@@ -1148,8 +1148,8 @@
 0x10de	0x053a	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x053b	"Card:NVIDIA GeForce FX - GeForce 8800"
 0x10de	0x053e	"Card:NVIDIA GeForce FX - GeForce 8800"
-0x10de	0x055c	"snd-hda-intel"
-0x10de	0x055d	"snd-hda-intel"
+0x10de	0x055c	"snd_hda_intel"
+0x10de	0x055d	"snd_hda_intel"
 0x10e0	0x9128	"Card:IMS TwinTurbo-based cards"
 0x10e0	0x9135	"Card:IMS TwinTurbo-based cards"
 0x10e3	0x0000	"Card:VESA driver (generic)"
@@ -1207,28 +1207,28 @@
 0x1101	0x9700	"initio"
 0x1102	0x0101	"Card:NVIDIA RIVA TNT - GeForce 2 (71xx)"
 0x1106	0x3022	"Card:FrameBuffer (generic)"
-0x1106	0x3050	"i2c-viapro"
-0x1106	0x3051	"i2c-viapro"
-0x1106	0x3057	"i2c-viapro"
+0x1106	0x3050	"i2c_viapro"
+0x1106	0x3051	"i2c_viapro"
+0x1106	0x3057	"i2c_viapro"
 0x1106	0x3068	"slamr"
-0x1106	0x3074	"via-ircc"
+0x1106	0x3074	"via_ircc"
 0x1106	0x3108	"Card:S3 UniChrome-based cards"
-0x1106	0x3109	"via-ircc"
+0x1106	0x3109	"via_ircc"
 0x1106	0x3118	"Card:S3 UniChrome-based cards"
 0x1106	0x3122	"Card:S3 UniChrome-based cards"
-0x1106	0x3147	"via-ircc"
+0x1106	0x3147	"via_ircc"
 0x1106	0x3164	"via82cxxx"
-0x1106	0x3177	"via-ircc"
-0x1106	0x3188	"amd64-agp"
-0x1106	0x3227	"i2c-viapro"
-0x1106	0x3287	"i2c-viapro"
-0x1106	0x3337	"i2c-viapro"
+0x1106	0x3177	"via_ircc"
+0x1106	0x3188	"amd64_agp"
+0x1106	0x3227	"i2c_viapro"
+0x1106	0x3287	"i2c_viapro"
+0x1106	0x3337	"i2c_viapro"
 0x1106	0x3344	"Card:S3 UniChrome-based cards"
-0x1106	0x4511	"snd-via82xx"
+0x1106	0x4511	"snd_via82xx"
 0x1106	0x7205	"Card:S3 UniChrome-based cards"
-0x1106	0x8231	"via-ircc"
-0x1106	0x8235	"i2c-viapro"
-0x1106	0xb188	"amd64-agp"
+0x1106	0x8231	"via_ircc"
+0x1106	0x8235	"i2c_viapro"
+0x1106	0xb188	"amd64_agp"
 0x1113	0x1211	"8139too"
 0x1113	0x1216	"tulip"
 0x1113	0x1217	"tulip"
@@ -1406,16 +1406,16 @@
 0x1259	0xa120	"tulip"
 0x125b	0x1400	"tulip"
 0x125d	0x1948	"maestro"
-0x125d	0x1968	"radio-maestro"
-0x125d	0x1978	"snd-es1968"
+0x125d	0x1968	"radio_maestro"
+0x125d	0x1978	"snd_es1968"
 0x125d	0x1988	"maestro3"
-0x125d	0x1989	"snd-maestro3"
-0x125d	0x1990	"snd-maestro3"
-0x125d	0x1992	"snd-maestro3"
-0x125d	0x1998	"snd-maestro3"
-0x125d	0x1999	"snd-maestro3"
+0x125d	0x1989	"snd_maestro3"
+0x125d	0x1990	"snd_maestro3"
+0x125d	0x1992	"snd_maestro3"
+0x125d	0x1998	"snd_maestro3"
+0x125d	0x1999	"snd_maestro3"
 0x125d	0x199a	"maestro3"
-0x125d	0x199b	"snd-maestro3"
+0x125d	0x199b	"snd_maestro3"
 0x125d	0x2838	"Bad:www.linmodems.org"
 0x1260	0x3872	"orinoco_pci"
 0x1260	0x3873	0x1186	0x3501	"orinoco_pci"
@@ -1601,25 +1601,25 @@
 0x14f1	0x2f00	"Hsf:www.linmodems.org"
 0x1500	0x1360	"8139too"
 0x1562	0x0001	"orinoco_nortel"
-0x1571	0xa001	"com20020-pci"
-0x1571	0xa002	"com20020-pci"
-0x1571	0xa003	"com20020-pci"
-0x1571	0xa004	"com20020-pci"
-0x1571	0xa005	"com20020-pci"
-0x1571	0xa006	"com20020-pci"
-0x1571	0xa007	"com20020-pci"
-0x1571	0xa008	"com20020-pci"
-0x1571	0xa009	"com20020-pci"
-0x1571	0xa00a	"com20020-pci"
-0x1571	0xa00b	"com20020-pci"
-0x1571	0xa00c	"com20020-pci"
-0x1571	0xa00d	"com20020-pci"
-0x1571	0xa201	"com20020-pci"
-0x1571	0xa202	"com20020-pci"
-0x1571	0xa203	"com20020-pci"
-0x1571	0xa204	"com20020-pci"
-0x1571	0xa205	"com20020-pci"
-0x1571	0xa206	"com20020-pci"
+0x1571	0xa001	"com20020_pci"
+0x1571	0xa002	"com20020_pci"
+0x1571	0xa003	"com20020_pci"
+0x1571	0xa004	"com20020_pci"
+0x1571	0xa005	"com20020_pci"
+0x1571	0xa006	"com20020_pci"
+0x1571	0xa007	"com20020_pci"
+0x1571	0xa008	"com20020_pci"
+0x1571	0xa009	"com20020_pci"
+0x1571	0xa00a	"com20020_pci"
+0x1571	0xa00b	"com20020_pci"
+0x1571	0xa00c	"com20020_pci"
+0x1571	0xa00d	"com20020_pci"
+0x1571	0xa201	"com20020_pci"
+0x1571	0xa202	"com20020_pci"
+0x1571	0xa203	"com20020_pci"
+0x1571	0xa204	"com20020_pci"
+0x1571	0xa205	"com20020_pci"
+0x1571	0xa206	"com20020_pci"
 0x15ad	0x0405	"Card:VMware virtual video card"
 0x15ad	0x0710	"Card:VMware virtual video card"
 0x15b0	0x2bd0	"ISDN:hisax,type=35"
@@ -1677,7 +1677,7 @@
 0x4005	0x2464	"Card:VGA driver (generic)"
 0x4005	0x2501	"Card:VGA driver (generic)"
 0x4033	0x1360	"8139too"
-0x5046	0x1001	"radio-maxiradio"
+0x5046	0x1001	"radio_maxiradio"
 0x5301	0x0001	"Card:Alliance ProMotion-based cards"
 0x5333	0x0551	"Card:S3 Trio3D-based cards"
 0x5333	0x0e11	"Card:S3 8xx / 9xx / Trio / Aurora64V+-based cards"
@@ -1969,7 +1969,7 @@
 0x8086	0x1240	"Card:Intel 810 and later"
 0x8086	0x2416	"slamr"
 0x8086	0x2426	"slamr"
-0x8086	0x2446	"snd-intel8x0m"
+0x8086	0x2446	"snd_intel8x0m"
 0x8086	0x2449	"eepro100"
 0x8086	0x2459	"eepro100"
 0x8086	0x245d	"eepro100"
@@ -1989,7 +1989,7 @@
 0x8086	0x24c6	0x144d	0xc00c	"snd-intel8x0m"
 0x8086	0x24c6	0x14c0	0x0012	"slamr"
 0x8086	0x24c6	0x17c0	0x1069	"slamr"
-0x8086	0x24c6	"snd-intel8x0m"
+0x8086	0x24c6	"snd_intel8x0m"
 0x8086	0x24d6	"slamr"
 0x8086	0x2562	"Card:Intel 810 and later"
 0x8086	0x2572	"Card:Intel 810 and later"
@@ -2004,11 +2004,11 @@
 0x8086	0x266d	0x14c0	0x0012	"slamr"
 0x8086	0x266d	0x14f1	0x5423	"Hsf:www.linmodems.org"
 0x8086	0x266d	0x17c0	0x10ab	"snd-intel8x0m"
-0x8086	0x266d	"snd-intel8x0m"
+0x8086	0x266d	"snd_intel8x0m"
 0x8086	0x2772	"Card:Intel 810 and later"
 0x8086	0x27a2	"Card:Intel 810 and later"
 0x8086	0x27dc	"e100"
-0x8086	0x27dd	"snd-intel8x0m"
+0x8086	0x27dd	"snd_intel8x0m"
 0x8086	0x2810	"iTCO_wdt"
 0x8086	0x2812	"iTCO_wdt"
 0x8086	0x2814	"iTCO_wdt"
diff --git a/lst/usbtable b/lst/usbtable
index 2a8f70ee..665ceee0 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -832,7 +832,7 @@
 0x050d	0x0805	"unknown"	"Belkin Components|Nostromo N50 GamePad"
 0x050d	0x1203	"belkin_sa"	"Belkin Components|F5U120-PC Serial Port"
 0x050f	0x0003	"unknown"	"KC Technology Inc.|KC82C160S Hub"
-0x050f	0x0180	"irda-usb"	"KC Technology Inc.|KC-180 IrDA Dongle"
+0x050f	0x0180	"irda_usb"	"KC Technology Inc.|KC-180 IrDA Dongle"
 0x050f	0x0190	"unknown"	"KC Technology, Inc.|KC2190 USB Host-to-Host cable"
 0x0519	0xc002	"unknown"	"Star Micronics Co., Ltd|Xlive Bluetooth XBM-100S MP3 Player"
 0x051d	0x0002	"unknown"	"American Power Conversion|Back-UPS Pro 500"
@@ -1614,7 +1614,7 @@
 0x08e6	0x0437	"unknown"	"Gemplus|GemPC433 SL SmartCard Reader"
 0x08e6	0x3437	"unknown"	"Gemplus|GemPC Twin SmartCard Reader"
 0x08e6	0x3438	"unknown"	"Gemplus|GemPC Key SmartCard Reader"
-0x08e9	0x0100	"irda-usb"	"Extended Systems, Inc.|XTNDAccess IrDA Dongle"
+0x08e9	0x0100	"irda_usb"	"Extended Systems, Inc.|XTNDAccess IrDA Dongle"
 0x08ec	0x0010	"Removable:memory_card"	"M-Systems|DiskOnKey"
 0x090a	0x1540	"unknown"	"Trumpion Microelectronics, Inc.|Digitex Container Flash Disk"
 0x0919	0x0100	"unknown"	"Tiger Electronics|Fast Flicks Digital Camera"
@@ -1652,7 +1652,7 @@
 0x09bf	0x00f2	"auerswald"	"Auerswald GmbH & Co. KG|"
 0x09c1	0x0704	"unknown"	"Arris|CM 200E Cable Modem"
 0x09c3	0x0008	"unknown"	"ActivCard, Inc.|SmartCard Reader"
-0x09c4	0x0011	"irda-usb"	"ACTiSYS Corp.|ACT-IR2000U IrDA Dongle"
+0x09c4	0x0011	"irda_usb"	"ACTiSYS Corp.|ACT-IR2000U IrDA Dongle"
 0x09d3	0x0001	"unknown"	"Com One|ISDN TA"
 0x09da	0x0006	"unknown"	"A4 Tech Co., Ltd|Optical Mouse WOP-35 / Trust 450L Optical Mouse"
 0x09da	0x001a	"unknown"	"A4 Tech Co., Ltd|Wireless Mouse & RXM-15 Receiver"
@@ -1696,15 +1696,15 @@
 0x0aec	0x3260	"unknown"	"Neodio Technologies Corp.|7-in-1 Card Reader"
 0x0aec	0x5010	"unknown"	"Neodio|ND5010 Card Reader"
 0x0af0	0x5000	"unknown"	"Option|UMTS Card"
-0x0af7	0x0101	"b2c2-usb"	"B2C2, Inc.|Digital TV USB Receiver (DVB-S/T/C / ATSC)"
+0x0af7	0x0101	"b2c2_usb"	"B2C2, Inc.|Digital TV USB Receiver (DVB-S/T/C / ATSC)"
 0x0af9	0x0010	"unknown"	"Hama, Inc.|USB SightCam 100"
 0x0b30	0x0006	"unknown"	"PNY Technologies, Inc.|SM Media-Shuttle Card Reader"
 0x0b3b	0x1601	"prism2_usb"	"Tekram Technology Co., Ltd|Allnet 0193 802.11b Adapter"
 0x0b3b	0x1602	"prism2_usb"	"Tekram Technology Co., Ltd|ZyXEL ZyAIR B200 802.11b Adapter"
 0x0b3b	0x1612	"at76_usb"	"Tekram Technology Co., Ltd.|AIR.Mate 2@net"
 0x0b43	0x0003	"unknown"	"Play.com, Inc.|PS2 Controller Convertor"
-0x0b48	0x1003	"dvb-ttusb-budget"	"TechnoTrend AG|Technotrend/Hauppauge USB-Nova"
-0x0b48	0x1005	"dvb-ttusb-budget"	"TechnoTrend AG|Technotrend/Hauppauge USB-Nova"
+0x0b48	0x1003	"dvb_ttusb_budget"	"TechnoTrend AG|Technotrend/Hauppauge USB-Nova"
+0x0b48	0x1005	"dvb_ttusb_budget"	"TechnoTrend AG|Technotrend/Hauppauge USB-Nova"
 0x0b48	0x1006	"unknown"	"TechnoTrend AG|Technotrend/Hauppauge DEC3000-s"
 0x0b48	0x1008	"unknown"	"TechnoTrend AG|Technotrend/Hauppauge DEC2000-t"
 0x0b48	0x1009	"unknown"	"TechnoTrend AG|Technotrend/Hauppauge DEC2540-t"
@@ -5644,7 +5644,7 @@
 0x22b8	0x3802	"unknown"	"Motorola PCS|C330 GSM Phone"
 0x22b8	0x4002	"unknown"	"Motorola PCS|A920/A925 UMTS Phone"
 0x22b8	0x4810	"unknown"	"Motorola PCS|E398 Storage"
-0x22b8	0x4902	"cdc-acm"	"Motorola PCS|E398 GSM Phone"
+0x22b8	0x4902	"cdc_acm"	"Motorola PCS|E398 GSM Phone"
 0x22b8	0x600c	"unknown"	"Motorola PCS|A768i GSM Phone"
 0x22b8	0x6604	"unknown"	"Motorola PCS|Washington CDMA Phone"
 0x22b8	0x6631	"unknown"	"Motorola PCS|CDC Modem"