diff --git a/ACs/Admiral/Admiral_AC.ir b/ACs/Admiral/Admiral_AC.ir
index 57f50672..e5be174b 100644
--- a/ACs/Admiral/Admiral_AC.ir
+++ b/ACs/Admiral/Admiral_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Admiral AC
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 20 00 00 00
diff --git a/ACs/Airmet/Airmet_ac.ir b/ACs/Airmet/Airmet_ac.ir
index ca45bd16..d564db31 100644
--- a/ACs/Airmet/Airmet_ac.ir
+++ b/ACs/Airmet/Airmet_ac.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # Airmet AC by JEREMYNO
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 6239 515 2191 4487 590 562 536 589 540 559 560 1665 563 563 566 560 538 587 532 567 562 1663 565 561 558 567 542 1658 590 561 537 1662 586 1665 563 1663 565 586 533 566 563 1663 565 1661 618 507 561 565 564 561 538 588 541 1658 560 592 537 563 566 559 540 586 533 567 562 563 535 590 539 561 558 568 541 1657 591 1662 566 1659 559 1667 591 1660 558 1668 560 591 538 561 568 558 540 585 534 565 564 562 536 1688 560 1665 563 1663 565 1661 587 1664 564 1661 567 584 535 565 564 561 538 588 541 559 560 565 534 592 537 562 567 559 539 1685 563 563 536 1663 585 1667 561 537 592 1660 568 558 561
 # 
-name: Power24
+name: POWER24
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Amcor/Amcor_AC.ir b/ACs/Amcor/Amcor_AC.ir
index 0219503a..4c8b599f 100644
--- a/ACs/Amcor/Amcor_AC.ir
+++ b/ACs/Amcor/Amcor_AC.ir
@@ -39,7 +39,7 @@ protocol: NEC
 address: 80 00 00 00
 command: 95 00 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 80 00 00 00
diff --git a/ACs/Ariston/Ariston_AC_A-MW09-IGX.ir b/ACs/Ariston/Ariston_AC_A-MW09-IGX.ir
index 6fb96288..ba67cf83 100644
--- a/ACs/Ariston/Ariston_AC_A-MW09-IGX.ir
+++ b/ACs/Ariston/Ariston_AC_A-MW09-IGX.ir
@@ -4,7 +4,7 @@ Version: 1
 # Ariston AC A-MW09-IGX
 # On and Off buttons set to 26 C° cool
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Bonaire/Bonaire_DurangoAC.ir b/ACs/Bonaire/Bonaire_DurangoAC.ir
index df7a8a0d..2ca0454d 100644
--- a/ACs/Bonaire/Bonaire_DurangoAC.ir
+++ b/ACs/Bonaire/Bonaire_DurangoAC.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Boulanger/Boulanger_AC.ir b/ACs/Boulanger/Boulanger_AC.ir
index e54ecacb..28d94004 100644
--- a/ACs/Boulanger/Boulanger_AC.ir
+++ b/ACs/Boulanger/Boulanger_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Boulanger AC
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 81 00 00 00
diff --git a/ACs/Corlitec/Cortlitec_portable_ac.ir b/ACs/Corlitec/Cortlitec_portable_ac.ir
index efb07cf6..520661d3 100644
--- a/ACs/Corlitec/Cortlitec_portable_ac.ir
+++ b/ACs/Corlitec/Cortlitec_portable_ac.ir
@@ -4,7 +4,7 @@ Version: 1
 # Corlitec Portable AC
 # 'Corlitec' is rebadge, the same unit is sold under a dozen brand names
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 E7 00 00
diff --git a/ACs/Daikin/Daikin_AC_industrial_TB.ir b/ACs/Daikin/Daikin_AC_industrial_TB.ir
index 9db4d90d..dc9f2d4e 100644
--- a/ACs/Daikin/Daikin_AC_industrial_TB.ir
+++ b/ACs/Daikin/Daikin_AC_industrial_TB.ir
@@ -9,7 +9,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 5055 2191 335 1799 360 752 338 714 365 716 364 1800 359 723 367 715 365 718 361 720 359 1805 365 747 332 1802 357 1806 364 719 360 1803 367 1798 361 1803 367 1797 362 1802 368 744 335 1799 360 721 369 714 365 716 363 719 360 721 369 713 366 1798 361 1802 368 715 364 717 362 720 359 723 367 715 364 1799 360 722 368 714 365 717 363 719 361 722 368 714 365 716 363 719 360 721 369 713 366 716 363 718 361 721 359 723 367 1797 362 1802 368 1796 363 1801 358 754 336 716 363 719 361 29583 5057 2160 366 1798 361 750 329 723 367 715 364 1800 359 753 337 715 364 717 363 720 359 1804 366 747 332 1801 358 1806 364 718 361 1803 356 1798 1802 368 1797 362 1802 368 714 365 1799 360 722 368 714 365 717 362 719 360 722 368 714 365 1798 361 1803 367 715 364 718 362 721 359 723 367 715 364 718 361 720 359 723 367 715 364 717 362 720 360 1804 366 1799 360 721 369 714 365 1798 361 1803 367 1798 361 720 359 723 367 715 364 718 361 720 360 723 367 715 364 717 362 720 359 722 368 714 365 717 362 719 360 722 368 1796 363 719 360 721 369 714 365 716 363 719 361 721 369 713 366 716 363 718 361 721 358 723 367 716 363 718 362 720 359 723 367 715 364 718 361 720 359 723 367 715 364 1799 360 1804 366 1799 360 721 369 714 365 716 363 1801 358 754 336 1798 361 720 360 1805 365 748 331 720 359 723 367 715 364 717 363 720 360 722 368 714 365 717 362 720 359 722 368 714 365 717 363 719 361 722 368 714 365 1798 361 751 339 713 366 716 363 1801 359 1805 365 1800 359 1805 365 1800 359 1805 365 1799 360
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/DeLonghi/Delonghi_portable_Pinguino-Air-to-Air-PAC-N81_ac.ir b/ACs/DeLonghi/Delonghi_portable_Pinguino-Air-to-Air-PAC-N81_ac.ir
index 6312b3b4..f1658fdb 100644
--- a/ACs/DeLonghi/Delonghi_portable_Pinguino-Air-to-Air-PAC-N81_ac.ir
+++ b/ACs/DeLonghi/Delonghi_portable_Pinguino-Air-to-Air-PAC-N81_ac.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # DeLonghi Pinguino Air-to-Air PAC N81 by JEREMYNO
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 48 12 00 00
diff --git a/ACs/Eurom/Eurom_Tristar_AC.ir b/ACs/Eurom/Eurom_Tristar_AC.ir
index ee68fb21..0347f5b2 100644
--- a/ACs/Eurom/Eurom_Tristar_AC.ir
+++ b/ACs/Eurom/Eurom_Tristar_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Eurom/Tristar Portable AC
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 80 00 00 00
diff --git a/ACs/Friedrich/Friedrich.ir b/ACs/Friedrich/Friedrich.ir
index f02be58e..4b238643 100755
--- a/ACs/Friedrich/Friedrich.ir
+++ b/ACs/Friedrich/Friedrich.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Frigidaire/Frigidaire_AC.ir b/ACs/Frigidaire/Frigidaire_AC.ir
index 4593a683..f72c4159 100644
--- a/ACs/Frigidaire/Frigidaire_AC.ir
+++ b/ACs/Frigidaire/Frigidaire_AC.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 FF 00 00
diff --git a/ACs/Fujitsu/Fujitsu_AC.ir b/ACs/Fujitsu/Fujitsu_AC.ir
index 27e384ac..3241aff7 100644
--- a/ACs/Fujitsu/Fujitsu_AC.ir
+++ b/ACs/Fujitsu/Fujitsu_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Fujitsu AC
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -39,7 +39,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 3303 1643 410 417 412 415 414 1232 406 421 408 1238 410 417 412 415 414 413 406 1240 408 1237 411 418 411 416 413 414 405 1214 434 1238 410 418 411 416 413 414 405 423 406 421 408 420 409 418 411 416 413 414 405 422 407 420 409 418 411 416 413 1206 432 422 407 420 409 419 410 417 412 415 414 413 406 422 407 1238 410 417 412 415 414 413 406 421 408 1211 437 1210 438 1207 431 1215 433 1239 409 1236 412 1208 440 1206 432 422 407 420 409 1237 411 416 413 414 405 423 406 421 408 419 410 417 412 416 413 414 405 1240 408 1211 437 417 412 415 414 413 406 422 407 420 409 418 411 417 412 1233 405 1214 434 420 409 418 411 1208 440 413 406 422 407 420 409 419 410 417 412 415 414 413 406 421 408 419 410 417 412 415 414 413 406 421 408 419 410 417 412 416 413 414 405 423 406 420 409 418 411 416 413 414 405 423 406 421 408 419 410 416 413 414 405 424 405 422 407 420 409 418 411 416 413 414 405 422 407 420 409 418 411 416 413 414 405 422 407 421 408 419 410 417 412 415 414 1208 440 413 406 422 407 420 409 1236 412 1207 431 1215 433 421 408 419 410 1235 413 415 414
 # 
-name: Power_off
+name: POWER_off
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/General_Electric/GE_AC.ir b/ACs/General_Electric/GE_AC.ir
index c5c3768c..084ad2f6 100644
--- a/ACs/General_Electric/GE_AC.ir
+++ b/ACs/General_Electric/GE_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # GE Air Conditioner
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/General_Electric/GE_Window_AC.ir b/ACs/General_Electric/GE_Window_AC.ir
index e214631a..93b41c27 100644
--- a/ACs/General_Electric/GE_Window_AC.ir
+++ b/ACs/General_Electric/GE_Window_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # GE Window AC
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 98 6F 00 00
diff --git a/ACs/Haier/Haier_AC_HPD10XCM-LW.ir b/ACs/Haier/Haier_AC_HPD10XCM-LW.ir
index 94c7faa4..d2e038c0 100644
--- a/ACs/Haier/Haier_AC_HPD10XCM-LW.ir
+++ b/ACs/Haier/Haier_AC_HPD10XCM-LW.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Haier HPD10XCM-LW 10,000-BTU Room Portable Air Conditioner
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 20 00 00 00
diff --git a/ACs/Hisense/Hisense_window_AC.ir b/ACs/Hisense/Hisense_window_AC.ir
index b370d91e..ee7c9718 100644
--- a/ACs/Hisense/Hisense_window_AC.ir
+++ b/ACs/Hisense/Hisense_window_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Hisense Window AC
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Insigna/Insigna_AC_NSRC2AC9.ir b/ACs/Insigna/Insigna_AC_NSRC2AC9.ir
index 42566d79..9ab14188 100644
--- a/ACs/Insigna/Insigna_AC_NSRC2AC9.ir
+++ b/ACs/Insigna/Insigna_AC_NSRC2AC9.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Insigna AC NSRC2AC9
 # 
-name: On_Off
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 E7 00 00
diff --git a/ACs/Inventum/Inventum_AC.ir b/ACs/Inventum/Inventum_AC.ir
index da85c589..56f7d877 100644
--- a/ACs/Inventum/Inventum_AC.ir
+++ b/ACs/Inventum/Inventum_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Inventum AC
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Kenmore/Kenmore_AC.ir b/ACs/Kenmore/Kenmore_AC.ir
index 4e63894b..853cdb46 100644
--- a/ACs/Kenmore/Kenmore_AC.ir
+++ b/ACs/Kenmore/Kenmore_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Kenmore Window AC
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
@@ -63,7 +63,7 @@ protocol: NECext
 address: 08 F5 00 00
 command: 07 F8 00 00
 # 
-name: Power Saver
+name: POWER Saver
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
diff --git a/ACs/Koldfront/Koldfront_WAC12001.ir b/ACs/Koldfront/Koldfront_WAC12001.ir
index 92e6fa2e..bea61eb9 100644
--- a/ACs/Koldfront/Koldfront_WAC12001.ir
+++ b/ACs/Koldfront/Koldfront_WAC12001.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 FF 00 00
diff --git a/ACs/LG/LG_AC.ir b/ACs/LG/LG_AC.ir
index db3adfa8..4ae9f761 100644
--- a/ACs/LG/LG_AC.ir
+++ b/ACs/LG/LG_AC.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 81 66 00 00
diff --git a/ACs/LG/LG_AC_2.ir b/ACs/LG/LG_AC_2.ir
index 0f97cab6..e6c85d71 100644
--- a/ACs/LG/LG_AC_2.ir
+++ b/ACs/LG/LG_AC_2.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # LG Home AC
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/LG/LG_AC_LP1417GSR.ir b/ACs/LG/LG_AC_LP1417GSR.ir
index 96a80021..40d80408 100644
--- a/ACs/LG/LG_AC_LP1417GSR.ir
+++ b/ACs/LG/LG_AC_LP1417GSR.ir
@@ -27,7 +27,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 8915 4461 590 1639 600 1632 597 527 598 529 595 536 599 534 601 537 598 1637 591 523 591 1641 598 1639 600 529 595 536 599 535 600 537 598 528 597 1628 590 1639 600 523 591 537 598 534 601 533 591 545 590 535 600 515 599 520 594 1638 590 534 591 539 596 539 596 542 593 533 591 525 599 520 594 531 593 534 601 530 594 539 596 542 593 534 590 525 599 520 594 528 597 529 595 534 590 542 593 543 592 519 595 7885 593 525 600 522 592 533 591 537 598 532 593 540 595 1653 596 1648 601 519 595 526 599 525 599 528 597 534 601 533 591 544 591 535 600 516 598 521 593 530 594 531 593 535 589 542 593 544 591 535 600 515 599 520 594 528 597 530 594 536 599 535 600 537 598 529 595 522 592 528 597 526 598 529 596 534 601 533 591 545 600 525 599 517 597 521 593 529 596 530 594 535 600 533 591 543 592 536 599 518 596 525 599 524 601 528 596 535 600 536 599 537 598 528 596 1629 600 1630 599 1635 593 533 591 538 597 534 590 1715 1631 598 7879 599 519 595 525 599 524 600 526 598 531 593 540 595 542 593 531 593 1633 596 523 591 532 592 532 592 1650 599 533 591 546 599 526 598 517 597 523 591 531 593 534 590 539 596 538 597 540 595 531 593 523 591 529 595 528 597 530 595 536 599 534 591 546 599 1637 591 524 590 529 595 527 598 1639 590 1650 599 1644 595 544 591 535 589 525 600 520 594 527 598 528 597 533 591 541 594 542 593 534 590 1634 595 525 599 523 591 1650 599 533 591 1655 594 544 591 1630 588
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/LG/LP1015WNR.ir b/ACs/LG/LP1015WNR.ir
index 4ff8e533..daae7504 100644
--- a/ACs/LG/LP1015WNR.ir
+++ b/ACs/LG/LP1015WNR.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # LG Portable AC LP1015WNR
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 E7 00 00
diff --git a/ACs/Midea/Midea_AC_MAW05R1WBL.ir b/ACs/Midea/Midea_AC_MAW05R1WBL.ir
index e5f5f57c..7c7f98af 100644
--- a/ACs/Midea/Midea_AC_MAW05R1WBL.ir
+++ b/ACs/Midea/Midea_AC_MAW05R1WBL.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Mitsubishi/mitsubishi-MSY-GE10VA.ir b/ACs/Mitsubishi/mitsubishi-MSY-GE10VA.ir
index 8408a482..88ecde04 100644
--- a/ACs/Mitsubishi/mitsubishi-MSY-GE10VA.ir
+++ b/ACs/Mitsubishi/mitsubishi-MSY-GE10VA.ir
@@ -3,13 +3,13 @@ Version: 1
 #
 # Mitsubishi AC MSG-GE10VA
 #
-name: Power On
+name: POWER On
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 3472 1691 441 1285 464 1265 443 451 408 459 410 456 434 1266 462 404 434 431 459 1271 437 1317 432 410 459 1293 435 407 431 436 433 1321 428 1273 435 432 458 1270 438 1314 414 426 433 432 458 1296 412 427 463 408 441 1312 406 432 437 432 437 456 434 411 438 425 465 404 434 433 457 414 455 414 455 414 434 430 460 410 439 423 436 432 458 411 438 425 434 459 410 430 439 428 462 405 433 1317 411 427 463 430 408 432 468 439 441 406 432 1318 431 1268 440 425 454 416 463 404 434 1291 437 1284 455 443 437 1265 432 434 456 413 435 436 433 432 437 456 434 1296 432 1266 462 409 460 1265 463 1309 409 429 461 410 439 1287 441 1284 434 433 436 429 440 424 435 1317 411 1312 406 459 431 414 435 1286 463 1265 463 408 441 1280 459 1269 439 1311 407 434 435 460 430 413 435 434 435 427 463 411 438 427 442 423 436 431 438 428 441 450 409 434 435 456 434 413 456 411 437 428 431 460 409 433 436 431 438 429 440 427 442 422 437 426 433 445 435 457 412 432 437 428 441 452 407 436 464 403 456 413 466 407 441 428 441 428 462 411 437 426 464 405 433 434 435 429 440 427 442 425 434 429 440 426 433 434 435 432 437 434 456 416 432 432 458 409 440 1288 440 1283 435 1288 441 429 440 453 406 1295 433 1290 439 426 443 17056 3607 1696 457 1271 437 1291 438 429 461 411 469 407 462 1292 405 461 408 433 436 1287 462 1265 432 435 434 1289 460 411 458 409 439 1286 463 1267 441 426 433 1319 409 1314 414 455 414 453 406 1295 433 431 459 435 434 1269 460 410 459 410 439 452 438 405 433 430 439 427 463 407 441 421 438 429 440 426 433 435 455 412 436 428 462 409 460 409 440 425 434 460 409 457 412 431 438 427 432 1293 435 429 440 425 434 429 440 426 433 430 439 1284 434 1315 413 425 465 405 433 434 435 1286 463 1264 464 407 462 1266 442 425 465 405 464 409 440 425 434 458 432 1271 457 1270 438 429 461 1298 410 1318 410 454 436 410 438 1282 457 1271 437 430 439 430 439 430 460 1270 438 1288 440 426 433 463 437 1266 442 1282 457 415 433 1290 439 1282 436 1290 438 452 407 430 439 428 441 421 438 429 440 427 463 406 442 421 459 410 459 408 461 408 440 426 433 456 413 430 470 408 440 450 430 422 457 414 434 431 438 428 441 424 455 413 435 432 437 430 439 425 465 407 441 449 410 431 459 408 461 417 463 409 439 425 434 433 436 431 438 427 463 406 463 410 439 431 438 424 435 432 437 452 438 405 433 460 409 454 436 409 439 427 442 449 431 417 442 429 440 1281 437 1286 432 1291 458 413 435 432 468 1277 431 1295 464 402 457
 # 
-name: Power Off
+name: POWER Off
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Rinnai/Rinnai_AC.ir b/ACs/Rinnai/Rinnai_AC.ir
index b2eefbd1..82f7337b 100644
--- a/ACs/Rinnai/Rinnai_AC.ir
+++ b/ACs/Rinnai/Rinnai_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Rinnai AC
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Samsung/Samsung_Wind-Free.ir b/ACs/Samsung/Samsung_Wind-Free.ir
index 8c21784b..4ae92af7 100644
--- a/ACs/Samsung/Samsung_Wind-Free.ir
+++ b/ACs/Samsung/Samsung_Wind-Free.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Samsung Wind-Free AC
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Toshiba/Toshiba_AC.ir b/ACs/Toshiba/Toshiba_AC.ir
index 4646ea69..4e33ba59 100644
--- a/ACs/Toshiba/Toshiba_AC.ir
+++ b/ACs/Toshiba/Toshiba_AC.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Toshiba AC
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 FF 00 00
diff --git a/ACs/Toshiba/Toshiba_RAS13SKV2E.ir b/ACs/Toshiba/Toshiba_RAS13SKV2E.ir
index 9db4e2b8..1c12721f 100644
--- a/ACs/Toshiba/Toshiba_RAS13SKV2E.ir
+++ b/ACs/Toshiba/Toshiba_RAS13SKV2E.ir
@@ -3,13 +3,13 @@ Version: 1
 #
 # Toshiba RAS-13SKV2-E
 # 
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4384 4380 522 1611 551 1609 553 1607 555 1605 557 523 547 533 548 1612 550 530 551 529 552 528 553 527 554 526 555 1605 557 1603 549 531 550 1610 552 528 553 527 554 527 554 526 555 525 556 524 546 1613 549 1611 551 1609 553 1607 555 1605 557 1603 548 1611 551 1609 553 527 554 527 554 526 555 525 556 524 557 523 547 533 548 532 549 531 550 1609 553 527 554 1606 556 1604 547 533 548 532 549 531 550 530 551 529 552 528 553 527 554 526 555 525 556 524 557 523 547 532 549 1611 551 529 552 528 553 528 553 527 554 526 555 525 556 524 546 533 548 532 549 1611 551 1609 553 527 554 526 555 525 556 524 557 523 547 7458 4392 4345 556 1604 547 1612 550 1611 551 1609 553 527 554 526 555 1605 557 523 547 533 548 532 549 531 550 530 551 1609 553 1607 555 525 556 1604 547 532 549 532 549 531 550 530 551 529 552 528 553 1607 555 1605 557 1603 548 1611 551 1610 552 1608 554 1606 556 1604 547 533 548 532 549 532 549 531 550 530 551 529 552 528 553 527 554 526 555 1604 547 533 548 1612 550 1610 552 528 553 528 553 527 554 526 555 525 556 524 557 523 547 533 548 532 549 531 550 530 551 529 552 1607 555 525 556 525 556 524 557 523 547 533 548 532 549 531 550 530 551 529 552 1607 555 1605 557 523 547 533 548 532 549 531 550 530 551
 # 
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Toshiba/Toshiba_RG57H4.ir b/ACs/Toshiba/Toshiba_RG57H4.ir
index d782657e..b8e06b2c 100644
--- a/ACs/Toshiba/Toshiba_RG57H4.ir
+++ b/ACs/Toshiba/Toshiba_RG57H4.ir
@@ -2,8 +2,8 @@
 # Used with Toshiba Air Conditioner RAC-PD0812CRRU
 Filetype: IR signals file
 Version: 1
-# Power
-name: Power
+# POWER
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Vornado/Vornado.ir b/ACs/Vornado/Vornado.ir
index 70997b08..76ffbfb3 100644
--- a/ACs/Vornado/Vornado.ir
+++ b/ACs/Vornado/Vornado.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Whynter/Whynter_AC.ir b/ACs/Whynter/Whynter_AC.ir
index 01c00ea6..2c3a7daf 100644
--- a/ACs/Whynter/Whynter_AC.ir
+++ b/ACs/Whynter/Whynter_AC.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power_on
+name: POWER_on
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 782 708 2923 2885 777 2176 748 2232 775 2152 782 736 752 2176 779 711 777 2179 776 2178 746 2181 774 744 754 737 771 720 778 713 775 716 782 737 751 740 779 712 828 717 833 657 779 713 775 2180 775 716 782 2173 772 720 778 2177 778 713 775 2180 775 716 772 2183 751 740 748 2180 775 715 835
 # 
-name: Power_off
+name: POWER_off
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/ACs/Zenith/Zenith_AC.ir b/ACs/Zenith/Zenith_AC.ir
index 3961eeca..0dec61aa 100644
--- a/ACs/Zenith/Zenith_AC.ir
+++ b/ACs/Zenith/Zenith_AC.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 81 66 00 00
diff --git a/Audio_Receivers/Denon/Denon_AVR_Receiver.ir b/Audio_Receivers/Denon/Denon_AVR_Receiver.ir
index 673e16ba..6561036b 100644
--- a/Audio_Receivers/Denon/Denon_AVR_Receiver.ir
+++ b/Audio_Receivers/Denon/Denon_AVR_Receiver.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Denon AVR Receiver
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -15,19 +15,19 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 270 793 250 1795 272 818 246 791 252 809 244 766 277 1795 282 781 272 790 253 809 224 1822 275 1797 280 1820 277 785 248 788 245 43889 273 790 274 1799 278 785 248 788 276 787 246 1826 271 792 251 1794 273 1827 270 1802 275 788 245 791 273 790 253 1819 278 1794 273 43889 274 789 254 1818 269 767 276 786 247 789 275 788 245 1827 270 792 251 785 248 814 250 1796 281 1819 248 1825 272 790 253 783 271 43889 245 791 273 1799 278 786 278 784 249 787 246 1827 281 781 252 1821 276 1796 281 1792 274 814 250 786 247 789 244 1829 279 1793 274 43888 275 815 218 1828 280 783 250 786 278 785 248 788 245 1827 280 782 251 785 268 794 249 1797 280 1819 278 1794 272 791 252 810 254
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 277 759 274 1799 278 784 280 783 250 812 242 1804 273 816 227 808 246 791 252 1819 248 1825 273 1826 251 1822 276 786 247 789 244 43888 274 815 249 1797 280 783 250 812 252 784 249 813 241 1805 272 1827 250 1822 275 787 246 816 217 819 255 807 226 1820 278 1795 272 43888 273 789 254 1817 270 793 251 785 248 814 250 1795 282 807 247 790 253 783 250 1822 276 1796 281 1818 249 1824 274 814 229 807 247
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 275 762 271 1800 277 786 278 784 249 813 241 795 248 1824 253 784 270 792 251 1821 246 1826 272 1801 276 1823 275 762 271 790 243 43889 274 789 275 1797 280 783 250 812 252 784 249 1823 275 762 271 1827 250 1822 276 787 246 816 217 818 246 790 253 1819 268 1804 273 43886 277 786 247 1825 273 764 280 783 250 811 253 784 249 1822 276 761 272 816 228 1819 279 1794 273 1826 251 1821 277 786 247 815 249
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Audio_Receivers/NAD/NAD712.ir b/Audio_Receivers/NAD/NAD712.ir
index f0c4074f..29a82a92 100644
--- a/Audio_Receivers/NAD/NAD712.ir
+++ b/Audio_Receivers/NAD/NAD712.ir
@@ -7,7 +7,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 5396 53113 8899 4450 563 1662 563 1662 563 1662 563 563 563 563 563 563 563 563 563 1662 563 563 563 563 563 1662 563 1662 563 1662 563 1662 563 1662 563 563 563 563 563 563 563 563 563 563 563 563 563 563 563 563 563 1662 563 1662 563 1662 563 1662 563 1662 563 1662 563 1662 563 1662 563 563 563 38358 8899 2225 563 95052
 #
-name: Vol_Up
+name: VOL+
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
@@ -19,7 +19,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 5472 53344 8899 4424 563 1662 563 1662 563 1662 563 563 563 563 563 563 563 563 563 1662 563 563 563 563 563 1662 563 1662 563 1662 563 1662 563 1662 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 563 563 1662 563 1662 563 1662 563 563 563 563 563 1662 563 1662 563 1662 563 563 563 38358 8899 2225 563 95052
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
diff --git a/Audio_Receivers/Onkyo/Onkyo.ir b/Audio_Receivers/Onkyo/Onkyo.ir
index a207d405..9f6df0eb 100644
--- a/Audio_Receivers/Onkyo/Onkyo.ir
+++ b/Audio_Receivers/Onkyo/Onkyo.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: D2 6C 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: D2 6D 00 00
 command: 85 7A 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 FD 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 03 FC 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/Audio_Receivers/Onkyo/Onkyo_RC627S.ir b/Audio_Receivers/Onkyo/Onkyo_RC627S.ir
index bb245938..1338ff99 100644
--- a/Audio_Receivers/Onkyo/Onkyo_RC627S.ir
+++ b/Audio_Receivers/Onkyo/Onkyo_RC627S.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: D2 03 00 00
diff --git a/Audio_Receivers/Onkyo/Onkyo_tx_nr686.ir b/Audio_Receivers/Onkyo/Onkyo_tx_nr686.ir
index 4e9f923e..7094bf3f 100644
--- a/Audio_Receivers/Onkyo/Onkyo_tx_nr686.ir
+++ b/Audio_Receivers/Onkyo/Onkyo_tx_nr686.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Onkyo TX NR686
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: D2 6C 00 00
diff --git a/Audio_Receivers/Rega/Rega_IO.ir b/Audio_Receivers/Rega/Rega_IO.ir
index 570a1d9d..ad81286b 100644
--- a/Audio_Receivers/Rega/Rega_IO.ir
+++ b/Audio_Receivers/Rega/Rega_IO.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: RC5
 address: 10 00 00 00
 command: 10 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: RC5
 address: 10 00 00 00
 command: 11 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: RC5
 address: 10 00 00 00
diff --git a/Audio_Receivers/Sony/Sony_Amp.ir b/Audio_Receivers/Sony/Sony_Amp.ir
index 7c734ce8..540b8b3c 100644
--- a/Audio_Receivers/Sony/Sony_Amp.ir
+++ b/Audio_Receivers/Sony/Sony_Amp.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
 command: 15 00 00 00
 # 
-name: Vol_UP
+name: VOL+
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
 command: 13 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
diff --git a/Audio_Receivers/Sony/Sony_MHC-GS300AV.ir b/Audio_Receivers/Sony/Sony_MHC-GS300AV.ir
index ab7a355d..48fdd3d7 100644
--- a/Audio_Receivers/Sony/Sony_MHC-GS300AV.ir
+++ b/Audio_Receivers/Sony/Sony_MHC-GS300AV.ir
@@ -19,7 +19,7 @@ protocol: SIRC15
 address: 10 00 00 00
 command: 27 00 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC15
 address: 10 00 00 00
diff --git a/Audio_Receivers/Sony/Sony_RM-AAU130_AV.ir b/Audio_Receivers/Sony/Sony_RM-AAU130_AV.ir
index 86f3c959..a3207920 100644
--- a/Audio_Receivers/Sony/Sony_RM-AAU130_AV.ir
+++ b/Audio_Receivers/Sony/Sony_RM-AAU130_AV.ir
@@ -4,19 +4,19 @@ Version: 1
 # Sony RM-AAU130 AV System
 # Used for Sony AV Receiver STR-DH130 or STR-KM7
 #
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
 command: 15 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
@@ -64,7 +64,7 @@ protocol: SIRC15
 address: B0 00 00 00
 command: 2C 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
diff --git a/Audio_Receivers/Yamaha/RXA770.ir b/Audio_Receivers/Yamaha/RXA770.ir
index 9375beb3..2dbb7064 100644
--- a/Audio_Receivers/Yamaha/RXA770.ir
+++ b/Audio_Receivers/Yamaha/RXA770.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 7A 00 00 00
@@ -13,7 +13,7 @@ protocol: NEC
 address: 7A 00 00 00
 command: 1B 00 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 7E 00 00 00
diff --git a/Audio_Receivers/Yamaha/Yamaha_RAS5.ir b/Audio_Receivers/Yamaha/Yamaha_RAS5.ir
index 46ffd07e..5a9e1f59 100644
--- a/Audio_Receivers/Yamaha/Yamaha_RAS5.ir
+++ b/Audio_Receivers/Yamaha/Yamaha_RAS5.ir
@@ -7,25 +7,25 @@ Version: 1
 #
 # Tested with Yamaha A-S500.
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 7E 81 00 00
 command: 2A D4 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 85 00 00
 command: 1A E4 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 85 00 00
 command: 1B E5 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 7A 85 00 00
diff --git a/Blu-Ray/LG/LG_AKB73775801.ir b/Blu-Ray/LG/LG_AKB73775801.ir
index d751be23..222396bc 100644
--- a/Blu-Ray/LG/LG_AKB73775801.ir
+++ b/Blu-Ray/LG/LG_AKB73775801.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # LG BlueRay/Surround Sound
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
@@ -21,19 +21,19 @@ protocol: Samsung32
 address: 2C 00 00 00
 command: 8A 00 00 00
 # 
-name: Vol_UP
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
 command: 17 00 00 00
 # 
-name: Vol_DOWN
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
 command: 16 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
diff --git a/Blu-Ray/LG/LG_BlueRay.ir b/Blu-Ray/LG/LG_BlueRay.ir
index 83687a83..1da8aaac 100644
--- a/Blu-Ray/LG/LG_BlueRay.ir
+++ b/Blu-Ray/LG/LG_BlueRay.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 2D 00 00 00
diff --git a/Blu-Ray/LG/LG_LHB655.ir b/Blu-Ray/LG/LG_LHB655.ir
index 8a7c43d5..5c0d4678 100644
--- a/Blu-Ray/LG/LG_LHB655.ir
+++ b/Blu-Ray/LG/LG_LHB655.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # LG Blueray LHB655
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
@@ -153,7 +153,7 @@ protocol: Samsung32
 address: 2C 00 00 00
 command: B6 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
diff --git a/Blu-Ray/Sony/RMT_VB201U.ir b/Blu-Ray/Sony/RMT_VB201U.ir
index f666b91d..a9d9ac2b 100644
--- a/Blu-Ray/Sony/RMT_VB201U.ir
+++ b/Blu-Ray/Sony/RMT_VB201U.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC20
 address: 5A 1C 00 00
 command: 15 00 00 00
 # 
-name: TV_Power
+name: TV_POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/Blu-Ray/Toshiba/Toshiba_SE-R0398.ir b/Blu-Ray/Toshiba/Toshiba_SE-R0398.ir
index 984c075d..1e161da1 100644
--- a/Blu-Ray/Toshiba/Toshiba_SE-R0398.ir
+++ b/Blu-Ray/Toshiba/Toshiba_SE-R0398.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 B5 00 00
diff --git a/CCTV/BrandUnknown/Szxlcom_cams.ir b/CCTV/BrandUnknown/Szxlcom_cams.ir
index df3e12e7..5dc02241 100644
--- a/CCTV/BrandUnknown/Szxlcom_cams.ir
+++ b/CCTV/BrandUnknown/Szxlcom_cams.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC15
 address: D4 00 00 00
diff --git a/CCTV/MarshallElectronics/Marshall_CV610.ir b/CCTV/MarshallElectronics/Marshall_CV610.ir
index 82964133..df2bef76 100644
--- a/CCTV/MarshallElectronics/Marshall_CV610.ir
+++ b/CCTV/MarshallElectronics/Marshall_CV610.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 44 00 00 00
diff --git a/Cable_Boxes/ARRIS/ARRIS_VIP_4302.ir b/Cable_Boxes/ARRIS/ARRIS_VIP_4302.ir
index 07c4611e..ab4e7d01 100644
--- a/Cable_Boxes/ARRIS/ARRIS_VIP_4302.ir
+++ b/Cable_Boxes/ARRIS/ARRIS_VIP_4302.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # ARRIS Cable Box VIP 4302 (Orange and other ISPs)
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -81,13 +81,13 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 2563 1915 670 326 315 322 309 328 649 627 309 328 313 324 307 330 311 324 317 321 310 327 314 323 308 329 312 325 316 322 309 328 313 322 644 326 315 322 309 329 312 326 315 627 309 328 313 323 643 326 315 323 308 330 311 631 641 330 311 75602 2558 1921 674 322 309 328 313 325 641 633 313 324 317 320 311 327 314 321 310 328 313 324 317 320 311 327 314 323 308 329 312 326 315 320 646 324 306 331 310 327 314 324 317 626 310 327 314 321 645 325 316 322 308 329 312 630 642 329 312 75602 2566 1912 673 322 309 328 313 325 641 633 313 323 308 330 311 326 315 320 311 326 315 323 308 329 312 325 316 321 310 328 313 324 306 328 649 322 309 328 313 325 316 322 309 633 313 324 317 318 648 322 308 329 312 325 316 627 645 325 316 10083 2556 1949 646 321 310 328 313 324 642 632 314 323 308 329 312 325 641 631 315 322 309 328 313 324 317 321 310 327 314 323 308 328 648 321 310 328 313 324 317 321 310 633 313 324 307 328 649 321 310 328 313 630 316 321 645 324 317
 # 
-name: + Volume
+name: + VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 2564 1914 671 324 317 321 310 327 650 625 311 326 315 322 309 328 313 323 307 329 312 325 316 321 309 328 313 324 307 330 311 326 315 320 646 628 308 329 648 322 309 634 648 597 675 322 308 329 312 326 315 627 309 328 649 75589 2557 1921 674 322 309 328 313 325 641 605 341 324 317 320 310 327 314 321 310 327 314 323 307 330 311 326 315 322 309 328 313 325 316 319 647 627 309 329 647 322 309 634 648 597 675 323 308 330 311 326 315 628 308 329 647 44134 2556 1949 646 322 309 329 312 325 641 633 313 324 306 330 311 326 640 633 313 324 306 330 311 326 315 322 309 328 313 325 316 319 647 627 309 328 648 321 310 633 649 596 676 322 309 329 312 630 316 321 310 327 649
 # 
-name: - Volume
+name: - VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -111,7 +111,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 2564 1941 643 324 317 321 310 327 649 625 311 326 315 322 308 329 312 323 308 329 312 325 316 321 309 328 313 324 306 330 311 326 315 321 645 324 306 635 647 628 644 631 315 320 646 324 306 330 311 327 314 628 308 329 312 325 316 75281 2556 1921 674 322 308 329 312 325 641 633 313 324 317 320 310 327 314 321 310 328 313 324 306 330 311 326 315 323 308 329 312 325 316 320 646 323 307 635 647 628 644 631 315 320 646 324 306 330 311 327 314 628 308 329 312 326 315 75287 2560 1918 676 319 311 325 316 321 645 630 316 321 309 327 314 323 307 328 313 324 317 320 310 327 314 323 307 329 312 326 315 322 309 326 640 330 311 631 641 634 648 627 309 326 640 330 311 326 315 323 307 634 312 325 316 321 309 31540 2559 1946 649 319 311 326 315 322 644 630 316 321 309 328 313 324 642 631 315 322 308 328 313 324 317 320 310 327 314 323 307 328 648 321 310 633 649 625 647 628 308 328 648 321 309 328 313 629 317 320 310 326 315 323 307
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Cable_Boxes/Amino/Amino_Amigo.ir b/Cable_Boxes/Amino/Amino_Amigo.ir
index 3bcdc1fd..c644b109 100644
--- a/Cable_Boxes/Amino/Amino_Amigo.ir
+++ b/Cable_Boxes/Amino/Amino_Amigo.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Cable_Boxes/Atlas/Atlas_URC1056.ir b/Cable_Boxes/Atlas/Atlas_URC1056.ir
index 1688bf46..93585fd4 100644
--- a/Cable_Boxes/Atlas/Atlas_URC1056.ir
+++ b/Cable_Boxes/Atlas/Atlas_URC1056.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 8925 4439 505 2216 513 4435 509 2212 507 4441 513 2208 511 2210 509 2212 507 2214 505 2216 513 2208 511 2210 509 2212 507 2214 505 4443 511 4437 507 2214 505 32494 8927 2230 510
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -19,7 +19,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 180 7740 170 2303 179 2294 177 2298 173 2300 172 5288 171 1313 180 2294 177 4753 180 12209 172 1313 180 3778 177 1308 175 1309 174 2300 171 8243 171 7748 173 2301 170 12712 173 1311 172 2303 179 2295 176 2279 172 12218 173 1311 172 2303 179 1305 178 1307 176 1308 175 2281 170
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Cable_Boxes/Bell/Bell_Sat_CAN.ir b/Cable_Boxes/Bell/Bell_Sat_CAN.ir
index 305fd4d3..81a89b1d 100644
--- a/Cable_Boxes/Bell/Bell_Sat_CAN.ir
+++ b/Cable_Boxes/Bell/Bell_Sat_CAN.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 173 10501 173 2154 174 2328 175 2345 179 10792 185 2317 186 1318 170 1316 193 1312 192 276 172 865 190 1314 174 276 177 1857 188 2314 189 1315 173 2329 189 1333 176 256 176 1858 171 1333 186 2316 172 8332 177 12844 178 11790 171 2331 172 1332 172 3817 180 1325 194 1311 193 1312 176 1310 188 6321 174 3815 187 3819 188 2314 174
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -19,7 +19,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 171 12830 172 2329 174 2346 178 11790 172 2331 172 1332 172 1351 173 258 174 862 193 274 174 863 192 1312 192 4795 176 1328 176 2326 177 1328 176 1311 187 1317 187 2315 173 8330 179 12841 171 11797 175 2327 191 2310 193 2309 194 1328 181 10790 188 1317 187 2315 188 1299 184 336 174 810 194 273 175 862 245 2257 246 8239 172 7826 179 11334 189 1298 237 282 176 1806 187 280 178 859 238 2264 239 2263 189 2331 177 281 172 839 237 1267 237 1268 246 1259 224 200 176 886 242 200 176 1884 243 2259 192 1330 277 2189 191 274 174 866 241 201 175 887 292 1212 189 2296 238 100669 176 6404 179 1920 171 3048 176 1922 179 3040 174 3045 179 3039 175 3044 180 3039 175 3044 180 3038 176 3043 171 3048 176 3043 171 3048 176 3043 171 1928 173 6405 178 1921 180 3039 175 1924 177 3042 172 3047 177 3042 172 3047 177 3041 173 3046 178 3041 173 3046 178 3040 174 3045 179 3040 174 3045 179 1920 171 6425 178 1920 171 3049 175 1924 177 3041 173 3047 177 3042 172 3047 177 3041 173 3046 178 3041 173 3046 178 3041 173 3046 178 3041 173 3046 178 1921 180 6398 174
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Cable_Boxes/Cogeco/Cogeco_Cable_Box_CAN.ir b/Cable_Boxes/Cogeco/Cogeco_Cable_Box_CAN.ir
index 106ea10d..b9dde6f1 100644
--- a/Cable_Boxes/Cogeco/Cogeco_Cable_Box_CAN.ir
+++ b/Cable_Boxes/Cogeco/Cogeco_Cable_Box_CAN.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -37,7 +37,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 9051 4463 542 2197 537 4469 536 4468 537 2202 542 4463 542 4463 542 2197 537 2202 542 2198 536 2203 541 2199 535 2204 540 4465 510 4495 510 4494 541 2198 536 26319 9044 2204 540 88266 9047 2201 543 88263 9051 2197 537
 # 
-name: Ch_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -49,19 +49,19 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 9019 4495 510 2229 515 2224 510 4495 510 4495 510 2228 516 2224 510 2229 515 2225 509 2230 514 2226 508 2232 512 2227 507 2232 512 2228 516 4489 516 2223 511 35398 9022 2226 508 88307 9017 2231 513 88291 9024 2224 510
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 9017 4497 509 4496 509 2230 514 4491 514 4491 514 2224 510 2230 514 2225 509 2231 513 2227 507 2232 512 2228 516 2223 511 4494 511 4494 511 2228 516 2223 511 30869 9047 2202 511 88292 9022 2226 508 88297 9045 2202 511 88304 9018 2230 514
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 9023 4491 515 2225 509 4496 510 4495 511 4495 511 2228 516 2224 510 2229 515 2224 510 2230 514 2226 508 2231 513 2227 507 2232 512 4493 513 2227 507 2232 512 33130 9019 2230 514 88290 9024 2224 510 88305 9021 2228 516 88299 9016 2232 512
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Cable_Boxes/DIRECTV/DIRECTV.ir b/Cable_Boxes/DIRECTV/DIRECTV.ir
index c8098b59..e003c26b 100644
--- a/Cable_Boxes/DIRECTV/DIRECTV.ir
+++ b/Cable_Boxes/DIRECTV/DIRECTV.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power_on
+name: POWER_on
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 177 7806 174 1352 177 2284 181 2311 175 2318 179 5309 174 2319 178 2316 181 3809 176 3815 180 6803 178 2315 182 6801 180 3809 176 8324 176 7804 177 3813 172 2321 176 2318 179 5308 175 2318 179 2315 182 3808 177 3813 182 6801 180 2313 173 6809 172 3818 177 8322 178 7802 178 3811 174 2320 177 2316 181 5306 177 2316 181 2313 173 3817 178 3811 174 6809 172 2321 176 6807 175 3815 180
 # 
-name: Power_off
+name: POWER_off
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -67,13 +67,13 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 179 7802 179 6307 175 2319 178 10296 182 2312 174 12328 179 2297 179 10794 173 8309 181 7801 180 6305 177 2316 181 7799 181 2312 174 2319 178 14784 179 10795 172 8329 182 7798 183 6302 180 2313 173 7807 173 2320 177 2317 180 14782 181 10793 174 8327 173 7807 173 3816 179 2314 172 2322 175 7805 176 2318 179 2315 182 12304 182 2293 183 10791 176
 # 
-name: Chan_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 180 7803 177 6306 175 2319 177 9300 178 2315 181 3808 176 2317 179 9297 181 3810 174 15306 175 7808 172 3818 177 2317 179 2313 173 5314 179 3811 173 2320 177 3813 182 2312 174 9303 175 3815 180 5306 177 9819 178 7802 178 3812 172 2321 175 2318 179 9298 180 2314 182 3808 176 2317 179 9297 181 3809 175
 # 
-name: Chan_down
+name: CH-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Cable_Boxes/Telus/Telus_OptikTV.ir b/Cable_Boxes/Telus/Telus_OptikTV.ir
index 1d8783f7..ae5c718b 100644
--- a/Cable_Boxes/Telus/Telus_OptikTV.ir
+++ b/Cable_Boxes/Telus/Telus_OptikTV.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -61,7 +61,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 429 295 176 270 175 605 171 442 179 266 179 602 174 271 174 272 173 273 172 274 171 609 178 436 175 605 171 442 179 434 177 604 172 440 181 89098 423 301 180 266 179 601 175 410 180 294 172 608 179 268 177 268 177 269 176 270 175 605 182 432 179 573 177 436 180 461 181 572 178 435 181
 # 
-name: Ch_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Cable_Boxes/Xfinity/Xfinity_RNG_DCX.ir b/Cable_Boxes/Xfinity/Xfinity_RNG_DCX.ir
index 029b02de..a100aef4 100644
--- a/Cable_Boxes/Xfinity/Xfinity_RNG_DCX.ir
+++ b/Cable_Boxes/Xfinity/Xfinity_RNG_DCX.ir
@@ -4,7 +4,7 @@ Version: 1
 # Xfinity Cable Box (Old Style) RNG DCX
 # 3 DEVICE UNIVERSAL COMCAST XFINITY REMOTE CONTROL RNG DCX
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Cameras/Logitech/Logitech_ConferenceCam_Connect.ir b/Cameras/Logitech/Logitech_ConferenceCam_Connect.ir
index ce131aea..a9cf7d56 100644
--- a/Cameras/Logitech/Logitech_ConferenceCam_Connect.ir
+++ b/Cameras/Logitech/Logitech_ConferenceCam_Connect.ir
@@ -10,13 +10,13 @@ protocol: NEC
 address: 02 00 00 00
 command: EB 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 02 00 00 00
 command: 6B 00 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: NEC
 address: 02 00 00 00
diff --git a/Consoles/Microsoft/Xbox.ir b/Consoles/Microsoft/Xbox.ir
index d61072db..9d82c01b 100644
--- a/Consoles/Microsoft/Xbox.ir
+++ b/Consoles/Microsoft/Xbox.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Xbox_power
+name: Xbox_POWER
 type: parsed
 protocol: NECext
 address: 80 D8 00 00
diff --git a/Consoles/PlayStation/PlayStation_2.txt b/Consoles/PlayStation/PlayStation_2.txt
index d2319097..a387924d 100644
--- a/Consoles/PlayStation/PlayStation_2.txt
+++ b/Consoles/PlayStation/PlayStation_2.txt
@@ -4,7 +4,7 @@ Version: 1
 # PlayStation 2 Multimedia Remote
 # Works directly with PS2 Slim (certain fat models need IR adapter) 
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC20
 address: 5A 1B 00 00
diff --git a/Converters/Benchmark/Benchmark_DAC2_HGC.ir b/Converters/Benchmark/Benchmark_DAC2_HGC.ir
index 11ced088..0fc72ab5 100644
--- a/Converters/Benchmark/Benchmark_DAC2_HGC.ir
+++ b/Converters/Benchmark/Benchmark_DAC2_HGC.ir
@@ -9,7 +9,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 2612 2602 1196 1115 1197 2809 1226 1111 1201 2805 1220 1117 1195 2811 1224 2807 1218 1119 1193 2814 1221 2810 1225 2806 1219 2813 1222 2809 1226 1111 1201 1110 1202 2805 1220 58129 2620 2568 1219 1118 1193 2812 1223 1114 1198 2808 1227 1109 1203 2804 1221 2811 1224 1112 1200 2806 1219 2813 1222 2809 1226 2806 1219 2813 1222 1114 1197 1114 1198 2808 1227 58123 2616 2572 1226 1111 1201 2805 1220 1117 1194 2812 1223 1113 1198 2808 1227 2804 1221 1090 1221 2811 1224 2807 1218 2814 1221 2810 1225 2807 1218 1119 1193 1118 1194 2812 1223
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -33,7 +33,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 2618 2596 1202 1110 1202 2805 1220 1117 1195 2811 1224 1113 1199 2807 1218 2814 1221 1116 1195 1116 1196 1116 1195 1116 1196 2809 1226 1112 1200 2806 1219 1118 1193 1118 1194 58145 2614 2600 1198 1114 1198 2808 1227 1110 1202 2804 1221 1116 1195 2811 1224 2807 1218 1119 1193 1119 1193 1119 1193 1118 1194 2812 1223 1115 1197 2835 1200 1111 1201 1111 1200 58138 2621 2593 1195 1117 1194 2837 1198 1113 1198 2833 1202 1110 1191 2840 1195 2811 1224 1112 1199 1112 1200 1112 1200 1112 1200 2805 1220 1118 1194 2837 1198 1114 1198 1114 1198
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Converters/Magnavox/Magnavox_ZV450MW8.ir b/Converters/Magnavox/Magnavox_ZV450MW8.ir
index 0c29230a..616c8ea7 100644
--- a/Converters/Magnavox/Magnavox_ZV450MW8.ir
+++ b/Converters/Magnavox/Magnavox_ZV450MW8.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Magnavox DVD VCR Converter ZV450MW8
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 22 00 00
diff --git a/Converters/RME/RME_ADI-2_DAC_FS.ir b/Converters/RME/RME_ADI-2_DAC_FS.ir
index 4d136060..9376883d 100644
--- a/Converters/RME/RME_ADI-2_DAC_FS.ir
+++ b/Converters/RME/RME_ADI-2_DAC_FS.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 12 34 00 00
diff --git a/Converters/Theta/GENVIIIS3.ir b/Converters/Theta/GENVIIIS3.ir
index 4a4aeae7..f524acb7 100644
--- a/Converters/Theta/GENVIIIS3.ir
+++ b/Converters/Theta/GENVIIIS3.ir
@@ -10,7 +10,7 @@ protocol: RC5
 address: 0D 00 00 00
 command: 0C 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: RC5
 address: 0D 00 00 00
diff --git a/Digital_Signs/Philips/Philips_Signage_YKF326-019.ir b/Digital_Signs/Philips/Philips_Signage_YKF326-019.ir
index 9736ef95..8a3af13c 100644
--- a/Digital_Signs/Philips/Philips_Signage_YKF326-019.ir
+++ b/Digital_Signs/Philips/Philips_Signage_YKF326-019.ir
@@ -5,7 +5,7 @@ Version: 1
 # RC: philips-ykf326-019
 # Service Menu: HOME 1888
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: RC6
 address: 00 00 00 00
@@ -125,13 +125,13 @@ protocol: RC6
 address: 00 00 00 00
 command: 10 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: RC6
 address: 00 00 00 00
 command: 11 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: RC6
 address: 00 00 00 00
diff --git a/Digital_Signs/iiyama/iiyama_LExx40UHS.ir b/Digital_Signs/iiyama/iiyama_LExx40UHS.ir
index fbe44f06..56ee15c3 100644
--- a/Digital_Signs/iiyama/iiyama_LExx40UHS.ir
+++ b/Digital_Signs/iiyama/iiyama_LExx40UHS.ir
@@ -4,7 +4,7 @@ Version: 1
 # iiyama ProLite LE5540UHS Large Format Display / Digital Sign
 # MENU ACCESS by pressing HOME+1668
 #
-name: Power
+name: POWER
 type: parsed
 protocol: RC6
 address: 00 00 00 00
@@ -94,7 +94,7 @@ protocol: RC6
 address: 00 00 00 00
 command: 10 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: RC6
 address: 00 00 00 00
diff --git a/Fans/Amazon/Amazon_Basics_Fan.ir b/Fans/Amazon/Amazon_Basics_Fan.ir
index 918f0c0d..874101d9 100644
--- a/Fans/Amazon/Amazon_Basics_Fan.ir
+++ b/Fans/Amazon/Amazon_Basics_Fan.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Amazon Basics Fan
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Big_Ass_Fans_Haiku.ir b/Fans/Big_Ass_Fans_Haiku.ir
index 3de3f36d..5238f2e3 100644
--- a/Fans/Big_Ass_Fans_Haiku.ir
+++ b/Fans/Big_Ass_Fans_Haiku.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # Big Ass Fans Haiku
 # 
-name: Fan_Power
+name: Fan_POWER
 type: parsed
 protocol: NECext
 address: BA F0 00 00
 command: 03 FC 00 00
 # 
-name: Light_Power
+name: Light_POWER
 type: parsed
 protocol: NECext
 address: BA F0 00 00
diff --git a/Fans/Black_and_Decker/Black_and_Decker_BFSR16W.ir b/Fans/Black_and_Decker/Black_and_Decker_BFSR16W.ir
index 0b633fbc..ab803c72 100644
--- a/Fans/Black_and_Decker/Black_and_Decker_BFSR16W.ir
+++ b/Fans/Black_and_Decker/Black_and_Decker_BFSR16W.ir
@@ -4,7 +4,7 @@ Version: 1
 # 
 # Black & Decker BFSR16W Fan
 #
-name: Power ON/OFF
+name: POWER POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Brandson/Brandson_Fan_304997.ir b/Fans/Brandson/Brandson_Fan_304997.ir
index 4cbec55d..bba886d2 100644
--- a/Fans/Brandson/Brandson_Fan_304997.ir
+++ b/Fans/Brandson/Brandson_Fan_304997.ir
@@ -4,7 +4,7 @@ Version: 1
 # Brandson Fan 304997
 # https://www.brandson-equipment.com/turmventilator-dcmotor-grau
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -40,7 +40,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 1282 413 1276 445 409 1260 1274 450 1249 445 410 1259 430 1265 434 1261 438 1258 1276 445 409 1285 404 8017 1274 420 1279 442 412 1283 1251 448 1251 443 411 1283 406 1290 409 1260 439 1256 1278 443 411 1284 405 8015 1276 418 1281 440 404 1291 1253 446 1253 440 404 1291 408 1287 412 1283 406 1263 1281 440 404 1291 408 8011 1280 414 1275 446 408 1287 1247 452 1247 447 407 1261 438 1283 406 1289 410 1259 1275 447 407 1287 412 8006 1275 446 1253 441 403 1292 1252 447 1252 442 402 1292 407 1288 411 1284 405 1291 1253 442 402 1292 407
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Dyson/Dyson_AM06_33_Fan.ir b/Fans/Dyson/Dyson_AM06_33_Fan.ir
index 14289cb7..abba5054 100644
--- a/Fans/Dyson/Dyson_AM06_33_Fan.ir
+++ b/Fans/Dyson/Dyson_AM06_33_Fan.ir
@@ -9,7 +9,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 2209 840 748 1595 745 829 748 821 746 1607 723 810 747 808 749 800 746 861 747 832 745 829 748 820 747 818 749 810 747 1570 750 800 746 101645 2210 839 749 1593 747 827 750 819 748 1579 751 809 748 806 751 799 747 859 749 830 747 827 750 819 748 816 751 808 749 1569 751 798 748
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Dyson/Dyson_Air_Multiplier.ir b/Fans/Dyson/Dyson_Air_Multiplier.ir
index b4c98e49..a9241b74 100644
--- a/Fans/Dyson/Dyson_Air_Multiplier.ir
+++ b/Fans/Dyson/Dyson_Air_Multiplier.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Dyson/Dyson_Air_Purifier_Fan.ir b/Fans/Dyson/Dyson_Air_Purifier_Fan.ir
index 27825df7..88c53032 100644
--- a/Fans/Dyson/Dyson_Air_Purifier_Fan.ir
+++ b/Fans/Dyson/Dyson_Air_Purifier_Fan.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Dyson Air Purifier and Fan
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Dyson/Dyson_Cool_Fan.ir b/Fans/Dyson/Dyson_Cool_Fan.ir
index 3cf36fad..ca3b4a0f 100644
--- a/Fans/Dyson/Dyson_Cool_Fan.ir
+++ b/Fans/Dyson/Dyson_Cool_Fan.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Dyson Cool Fan
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Dyson/Dyson_Fan_HP04.ir b/Fans/Dyson/Dyson_Fan_HP04.ir
index 004d7169..f4b20c25 100644
--- a/Fans/Dyson/Dyson_Fan_HP04.ir
+++ b/Fans/Dyson/Dyson_Fan_HP04.ir
@@ -3,7 +3,7 @@ Version: 1
 #
 # Dyson Fan HP04
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Dyson/Dyson_HP01.ir b/Fans/Dyson/Dyson_HP01.ir
index c75edbf5..04735ec5 100644
--- a/Fans/Dyson/Dyson_HP01.ir
+++ b/Fans/Dyson/Dyson_HP01.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Dyson AC HP01
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -63,7 +63,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 2220 730 747 731 746 1391 752 1406 726 710 746 712 755 699 747 701 755 1415 749 729 748 1389 754 1404 729 708 748 1374 748 705 751 1387 725 101019 2221 729 748 730 747 1390 753 1405 728 735 721 711 745 708 748 700 746 1424 750 754 723 1388 745 1413 720 717 750 1372 750 703 753 1385 727
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Dyson/Dyson_HP09.ir b/Fans/Dyson/Dyson_HP09.ir
index 8f245207..c3ba2c2b 100644
--- a/Fans/Dyson/Dyson_HP09.ir
+++ b/Fans/Dyson/Dyson_HP09.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Dyson AC HP09
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Homezest/Homezest_LWTF-04.ir b/Fans/Homezest/Homezest_LWTF-04.ir
index 425c59a0..3c894952 100644
--- a/Fans/Homezest/Homezest_LWTF-04.ir
+++ b/Fans/Homezest/Homezest_LWTF-04.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Homezest tower fan LWTF-04
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Honeywell/Honeywell_Fan_HYF290E4.ir b/Fans/Honeywell/Honeywell_Fan_HYF290E4.ir
index 4380046d..c85384fd 100644
--- a/Fans/Honeywell/Honeywell_Fan_HYF290E4.ir
+++ b/Fans/Honeywell/Honeywell_Fan_HYF290E4.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Honeywell HYF290E4 Fan
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Lasko/Lasko_Fan.ir b/Fans/Lasko/Lasko_Fan.ir
index 6580793b..0d9a280d 100644
--- a/Fans/Lasko/Lasko_Fan.ir
+++ b/Fans/Lasko/Lasko_Fan.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Lasko/Lasko_Fan_Simple.ir b/Fans/Lasko/Lasko_Fan_Simple.ir
index 1e65e7b4..52ed7c13 100644
--- a/Fans/Lasko/Lasko_Fan_Simple.ir
+++ b/Fans/Lasko/Lasko_Fan_Simple.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/LeaderPro/LeaderPro_DC_Motor_Floor_Fan.ir b/Fans/LeaderPro/LeaderPro_DC_Motor_Floor_Fan.ir
index 8fe83ae8..8535cfd7 100644
--- a/Fans/LeaderPro/LeaderPro_DC_Motor_Floor_Fan.ir
+++ b/Fans/LeaderPro/LeaderPro_DC_Motor_Floor_Fan.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # LeaderPro DC Motor Floor Fan
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/MainStays/MainStays_Fan_FZ10-19JR.ir b/Fans/MainStays/MainStays_Fan_FZ10-19JR.ir
index fad94b99..774144e9 100644
--- a/Fans/MainStays/MainStays_Fan_FZ10-19JR.ir
+++ b/Fans/MainStays/MainStays_Fan_FZ10-19JR.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # MainStays Tower Fan FZ10-19JR
 # 
-name: PowerToggle
+name: POWERToggle
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Meaco/MeacoFan_1056_P.ir b/Fans/Meaco/MeacoFan_1056_P.ir
index 6a71217b..7c8b38ca 100755
--- a/Fans/Meaco/MeacoFan_1056_P.ir
+++ b/Fans/Meaco/MeacoFan_1056_P.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Meaco MeacoFan 1056 P
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 80 00 00 00
diff --git a/Fans/Orbrgozo/Orbegozo_SF0243.ir b/Fans/Orbrgozo/Orbegozo_SF0243.ir
index 518d8308..6fbd456f 100644
--- a/Fans/Orbrgozo/Orbegozo_SF0243.ir
+++ b/Fans/Orbrgozo/Orbegozo_SF0243.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Orbegozo SF0243 Fan
 #
-name: ON_OFF
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Pelonis/Pelonis_PFS40D6ABB_Fan.ir b/Fans/Pelonis/Pelonis_PFS40D6ABB_Fan.ir
index 406a13eb..f15f7958 100644
--- a/Fans/Pelonis/Pelonis_PFS40D6ABB_Fan.ir
+++ b/Fans/Pelonis/Pelonis_PFS40D6ABB_Fan.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Pelonis PFS40D6ABB Fan
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Rowenta/Rowenta_Eole_Infinite.ir b/Fans/Rowenta/Rowenta_Eole_Infinite.ir
index 79dc3dbb..04043bad 100644
--- a/Fans/Rowenta/Rowenta_Eole_Infinite.ir
+++ b/Fans/Rowenta/Rowenta_Eole_Infinite.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Rowenta Eole Infinite Fan
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Fans/Rowenta/Rowenta_Mosquito_Silence_VU6410FD.ir b/Fans/Rowenta/Rowenta_Mosquito_Silence_VU6410FD.ir
index 4bbf1a30..55582816 100644
--- a/Fans/Rowenta/Rowenta_Mosquito_Silence_VU6410FD.ir
+++ b/Fans/Rowenta/Rowenta_Mosquito_Silence_VU6410FD.ir
@@ -3,7 +3,7 @@ Version: 1
 #
 # Rowenta Mosquito Silence VU6410FD
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Fans/Silver_Crest/SilverCrest_Fan.ir b/Fans/Silver_Crest/SilverCrest_Fan.ir
index 7becec84..07386a29 100644
--- a/Fans/Silver_Crest/SilverCrest_Fan.ir
+++ b/Fans/Silver_Crest/SilverCrest_Fan.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Silver Crest Fan 
 #
-name: On
+POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Fans/Taurus/Taurus_Babel_RC.ir b/Fans/Taurus/Taurus_Babel_RC.ir
index 020a6cc7..de86ede5 100644
--- a/Fans/Taurus/Taurus_Babel_RC.ir
+++ b/Fans/Taurus/Taurus_Babel_RC.ir
@@ -3,7 +3,7 @@ Version: 1
 #
 # Taurus BABEL RC Alpatec fan
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Vornado/Vornado.ir b/Fans/Vornado/Vornado.ir
index 3e645b7f..bfded89c 100644
--- a/Fans/Vornado/Vornado.ir
+++ b/Fans/Vornado/Vornado.ir
@@ -4,7 +4,7 @@ Version: 1
 # Vornado 184 Tower Fan
 # https://a.co/d/3xtrJK9
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Fans/Xpelair/Xpelair_XPA360CF_Fan.ir b/Fans/Xpelair/Xpelair_XPA360CF_Fan.ir
index 80a85ab2..7c3e7b6c 100644
--- a/Fans/Xpelair/Xpelair_XPA360CF_Fan.ir
+++ b/Fans/Xpelair/Xpelair_XPA360CF_Fan.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Xpelair XPA360CF Fan
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
diff --git a/Heaters/Amerlife/Amerlife_Fireplace.ir b/Heaters/Amerlife/Amerlife_Fireplace.ir
index 80527af1..a9d92be8 100644
--- a/Heaters/Amerlife/Amerlife_Fireplace.ir
+++ b/Heaters/Amerlife/Amerlife_Fireplace.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Amerlife Fireplace TV Stand
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: AB CD 00 00
diff --git a/Heaters/ComfortZone/ComfortZone_Heater.ir b/Heaters/ComfortZone/ComfortZone_Heater.ir
index f258b292..66224e35 100644
--- a/Heaters/ComfortZone/ComfortZone_Heater.ir
+++ b/Heaters/ComfortZone/ComfortZone_Heater.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Heaters/Dreo/Dreo_Heater.ir b/Heaters/Dreo/Dreo_Heater.ir
index 54ea2f2a..c249e5d9 100644
--- a/Heaters/Dreo/Dreo_Heater.ir
+++ b/Heaters/Dreo/Dreo_Heater.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -25,7 +25,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 1306 403 1279 404 437 1235 1278 405 1278 406 435 1238 434 1211 461 1210 462 1236 1277 405 436 1236 436 7959 1306 402 1280 403 438 1234 1279 404 1278 405 436 1210 462 1236 436 1209 463 1235 1278 404 437 1209 463 9015 1301 407 1276 407 434 1239 1275 407 1275 409 432 1241 431 1240 432 1214 458 1213 1300 408 433 1240 432 7962 1302 407 1276 407 434 1239 1274 408 1274 410 431 1242 430 1241 431 1240 432 1240 1273 410 431 1241 431 9021 1306 403 1279 404 437 1235 1278 405 1278 406 435 1237 435 1237 435 1237 435 1236 1278 405 436 1237 435 7960 1304 403 1279 404 437 1235 1278 405 1278 406 435 1237 435 1236 436 1235 437 1234 1279 404 437 1235 437 9015 1302 406 1276 407 434 1238 1275 409 1273 410 441 1231 441 1230 431 1266 406 1265 1248 410 431 1241 431 7964 1300 408 1274 410 441 1231 1272 411 1281 403 438 1234 438 1234 438 1259 413 1259 1254 404 437 1234 438
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Heaters/Duraflame/Duraflame_Heater.ir b/Heaters/Duraflame/Duraflame_Heater.ir
index 44227db2..ce406dcd 100644
--- a/Heaters/Duraflame/Duraflame_Heater.ir
+++ b/Heaters/Duraflame/Duraflame_Heater.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Duraflame Heater
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Heaters/GoldenVantage/GoldenVantage_AF510_Fireplace.ir b/Heaters/GoldenVantage/GoldenVantage_AF510_Fireplace.ir
index af20bdec..28224705 100644
--- a/Heaters/GoldenVantage/GoldenVantage_AF510_Fireplace.ir
+++ b/Heaters/GoldenVantage/GoldenVantage_AF510_Fireplace.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Heaters/Konwin/Konwin_GD921BCP_4JR_Heater.ir b/Heaters/Konwin/Konwin_GD921BCP_4JR_Heater.ir
index 820010cc..b3aec62b 100644
--- a/Heaters/Konwin/Konwin_GD921BCP_4JR_Heater.ir
+++ b/Heaters/Konwin/Konwin_GD921BCP_4JR_Heater.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Konwin Space Heater
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Heaters/Lasko/Lasko_6462_Space_Heater.ir b/Heaters/Lasko/Lasko_6462_Space_Heater.ir
index ae9dbd45..40b26748 100644
--- a/Heaters/Lasko/Lasko_6462_Space_Heater.ir
+++ b/Heaters/Lasko/Lasko_6462_Space_Heater.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # Lasko 6462 Space Heater
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Heaters/Lasko/Lasko_Heater.ir b/Heaters/Lasko/Lasko_Heater.ir
index e0358178..e00b0ba4 100644
--- a/Heaters/Lasko/Lasko_Heater.ir
+++ b/Heaters/Lasko/Lasko_Heater.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Humidifiers/Dyson/Dyson_Humidifier_AM10.ir b/Humidifiers/Dyson/Dyson_Humidifier_AM10.ir
index b59fc66e..1746775b 100644
--- a/Humidifiers/Dyson/Dyson_Humidifier_AM10.ir
+++ b/Humidifiers/Dyson/Dyson_Humidifier_AM10.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Dyson Humidifier AM10
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Humidifiers/ElecHome/ElecHome_SH8820_Humid.ir b/Humidifiers/ElecHome/ElecHome_SH8820_Humid.ir
index ba3fe397..0ee6847a 100644
--- a/Humidifiers/ElecHome/ElecHome_SH8820_Humid.ir
+++ b/Humidifiers/ElecHome/ElecHome_SH8820_Humid.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # ElecHome SH8820 Humidifier
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Humidifiers/Homedics/HoMedics TotalComfort Ultrasonic Humidifier/Homedics_humidifier.ir b/Humidifiers/Homedics/HoMedics TotalComfort Ultrasonic Humidifier/Homedics_humidifier.ir
index 26f649de..83eec9b4 100644
--- a/Humidifiers/Homedics/HoMedics TotalComfort Ultrasonic Humidifier/Homedics_humidifier.ir	
+++ b/Humidifiers/Homedics/HoMedics TotalComfort Ultrasonic Humidifier/Homedics_humidifier.ir	
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Humidifiers/Homedics/HoMedics_TotalComfort.ir b/Humidifiers/Homedics/HoMedics_TotalComfort.ir
index aade78b3..5b53a3fd 100644
--- a/Humidifiers/Homedics/HoMedics_TotalComfort.ir
+++ b/Humidifiers/Homedics/HoMedics_TotalComfort.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # HoMedics TotalComfort
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Humidifiers/Homedics/Homedics_Humidifier.ir b/Humidifiers/Homedics/Homedics_Humidifier.ir
index 46ae9283..26bb59a1 100644
--- a/Humidifiers/Homedics/Homedics_Humidifier.ir
+++ b/Humidifiers/Homedics/Homedics_Humidifier.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Humidifiers/ProBreeze/ProBreese_PB_F13B_US_Dehumid.ir b/Humidifiers/ProBreeze/ProBreese_PB_F13B_US_Dehumid.ir
index 27f1f4ac..96ff6912 100644
--- a/Humidifiers/ProBreeze/ProBreese_PB_F13B_US_Dehumid.ir
+++ b/Humidifiers/ProBreeze/ProBreese_PB_F13B_US_Dehumid.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # ProBreeze Remote Oscillating Fan
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/LED_Lighting/Amazon/Amazon_LED_Lights.ir b/LED_Lighting/Amazon/Amazon_LED_Lights.ir
index 87fe7018..bfc97524 100644
--- a/LED_Lighting/Amazon/Amazon_LED_Lights.ir
+++ b/LED_Lighting/Amazon/Amazon_LED_Lights.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/LED_Lighting/American Lighting/American_Lighting_LED.ir b/LED_Lighting/American Lighting/American_Lighting_LED.ir
index b40f0eac..12f42623 100644
--- a/LED_Lighting/American Lighting/American_Lighting_LED.ir	
+++ b/LED_Lighting/American Lighting/American_Lighting_LED.ir	
@@ -3,7 +3,7 @@ Version: 1
 # 
 # America Lighting LEDs
 # 
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
diff --git a/LED_Lighting/AuraLED/AuraLED_ColorStrip.ir b/LED_Lighting/AuraLED/AuraLED_ColorStrip.ir
index e4c3a6ab..b853d110 100644
--- a/LED_Lighting/AuraLED/AuraLED_ColorStrip.ir
+++ b/LED_Lighting/AuraLED/AuraLED_ColorStrip.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # AuraLED ColorStrip LEDs
 # 
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
diff --git a/LED_Lighting/BrandUnknown/44_Button_Generic_LED.ir b/LED_Lighting/BrandUnknown/44_Button_Generic_LED.ir
index 2f0aea6d..3ab93b1c 100644
--- a/LED_Lighting/BrandUnknown/44_Button_Generic_LED.ir
+++ b/LED_Lighting/BrandUnknown/44_Button_Generic_LED.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # 44 button generic LED lights
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/LED_Lighting/BrandUnknown/44_Button_LED.ir b/LED_Lighting/BrandUnknown/44_Button_LED.ir
index 0dc2f92d..89ef81cd 100644
--- a/LED_Lighting/BrandUnknown/44_Button_LED.ir
+++ b/LED_Lighting/BrandUnknown/44_Button_LED.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On
+POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/LED_Lighting/BrandUnknown/Color_Change_Bulb_Remote.ir b/LED_Lighting/BrandUnknown/Color_Change_Bulb_Remote.ir
index a14f723f..f7dc8c5f 100644
--- a/LED_Lighting/BrandUnknown/Color_Change_Bulb_Remote.ir
+++ b/LED_Lighting/BrandUnknown/Color_Change_Bulb_Remote.ir
@@ -7,7 +7,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4076 4497 331 539 335 583 291 532 331 539 335 584 290 581 293 532 331 541 333 1648 329 1651 336 1690 287 1696 291 1642 335 1648 339 1644 333 1649 338 536 338 1644 333 1650 337 537 337 536 338 537 337 536 338 537 337 1647 330 587 287 537 337 1694 293 1640 337 1692 285 1648 339 1690 287 59795 13271 2259 280 98396 13269 2276 273 98426 13292 2256 272 98428 13268 2283 277 98424 13273 2276 273
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/LED_Lighting/BrandUnknown/DMX_Light.ir b/LED_Lighting/BrandUnknown/DMX_Light.ir
index 680b08a5..a4fae468 100644
--- a/LED_Lighting/BrandUnknown/DMX_Light.ir
+++ b/LED_Lighting/BrandUnknown/DMX_Light.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/LED_Lighting/BrandUnknown/LED_44Key.ir b/LED_Lighting/BrandUnknown/LED_44Key.ir
index 1f7ca296..5775335f 100644
--- a/LED_Lighting/BrandUnknown/LED_44Key.ir
+++ b/LED_Lighting/BrandUnknown/LED_44Key.ir
@@ -19,7 +19,7 @@ protocol: NEC
 address: 00 00 00 00
 command: 41 00 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/LED_Lighting/BrandUnknown/LED_Cat.ir b/LED_Lighting/BrandUnknown/LED_Cat.ir
index 3cb60fa9..1bc30eed 100644
--- a/LED_Lighting/BrandUnknown/LED_Cat.ir
+++ b/LED_Lighting/BrandUnknown/LED_Cat.ir
@@ -4,7 +4,7 @@ Filetype: IR signals file
 #
 Version: 1
 #
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
diff --git a/LED_Lighting/BrandUnknown/Light_Strip.ir b/LED_Lighting/BrandUnknown/Light_Strip.ir
index 182af31f..b9efd5d9 100644
--- a/LED_Lighting/BrandUnknown/Light_Strip.ir
+++ b/LED_Lighting/BrandUnknown/Light_Strip.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power_on
+name: POWER_on
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 9752 4512 678 519 629 574 636 569 631 571 629 572 628 572 628 571 629 573 627 1689 629 1683 625 1685 623 1686 622 1687 621 1688 630 1678 619 1686 622 1683 625 1681 627 567 623 575 625 571 619 576 624 572 628 1679 629 567 623 573 627 1681 627 1677 620 1686 622 1680 617 1681 616 571 619 39161 9413 2260 622 96457 9493 2267 615 96491 9491 2260 622 99522 2889 75674 9757 4519 630 573 627 578 632 572 628 578 632 573 627 578 632 572 628 575 635 1675 622 1676 621 1677 610 1687 621 1677 610 1687 621 1678 609 1688 620 1683 614 1687 631 568 621 575 625 577 633 568 632 569 631 1682 626 573 627 573 627 1684 624 1687 631 1677 631 1678 630 1680 628 569 631 39165 9531 2265 617 97240 9673 2263 629
 # 
-name: Power_off
+name: POWER_off
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/LED_Lighting/BrandUnknown/Magic_Lighting_Remote.ir b/LED_Lighting/BrandUnknown/Magic_Lighting_Remote.ir
index a14f723f..f7dc8c5f 100644
--- a/LED_Lighting/BrandUnknown/Magic_Lighting_Remote.ir
+++ b/LED_Lighting/BrandUnknown/Magic_Lighting_Remote.ir
@@ -7,7 +7,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4076 4497 331 539 335 583 291 532 331 539 335 584 290 581 293 532 331 541 333 1648 329 1651 336 1690 287 1696 291 1642 335 1648 339 1644 333 1649 338 536 338 1644 333 1650 337 537 337 536 338 537 337 536 338 537 337 1647 330 587 287 537 337 1694 293 1640 337 1692 285 1648 339 1690 287 59795 13271 2259 280 98396 13269 2276 273 98426 13292 2256 272 98428 13268 2283 277 98424 13273 2276 273
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/LED_Lighting/BrandUnknown/Practical_Series_2.ir b/LED_Lighting/BrandUnknown/Practical_Series_2.ir
index a03f4f1b..fa6b7d17 100644
--- a/LED_Lighting/BrandUnknown/Practical_Series_2.ir
+++ b/LED_Lighting/BrandUnknown/Practical_Series_2.ir
@@ -7,7 +7,7 @@ protocol: NEC
 address: 00 00 00 00
 command: 45 00 00 00
 # 
-name: On
+POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/LED_Lighting/BrandUnknown/mlambert_rope_light.ir b/LED_Lighting/BrandUnknown/mlambert_rope_light.ir
index c8bddd09..3febbe1f 100644
--- a/LED_Lighting/BrandUnknown/mlambert_rope_light.ir
+++ b/LED_Lighting/BrandUnknown/mlambert_rope_light.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 00 EF 00 00
 command: 1F E0 00 00
 # 
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
diff --git a/LED_Lighting/MonsterIlluminessence/MonsterIlluminessence_LED.ir b/LED_Lighting/MonsterIlluminessence/MonsterIlluminessence_LED.ir
index 75da62cb..b0597dc2 100644
--- a/LED_Lighting/MonsterIlluminessence/MonsterIlluminessence_LED.ir
+++ b/LED_Lighting/MonsterIlluminessence/MonsterIlluminessence_LED.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
diff --git a/LED_Lighting/Osram/Osram_24_Button_LED.ir b/LED_Lighting/Osram/Osram_24_Button_LED.ir
index 61f27af7..c8599e08 100644
--- a/LED_Lighting/Osram/Osram_24_Button_LED.ir
+++ b/LED_Lighting/Osram/Osram_24_Button_LED.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Osram 24 Button LED Remote
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/LED_Lighting/Sylvania/Sylvania_24_Button_LED.ir b/LED_Lighting/Sylvania/Sylvania_24_Button_LED.ir
index 740a84e0..2a44c650 100644
--- a/LED_Lighting/Sylvania/Sylvania_24_Button_LED.ir
+++ b/LED_Lighting/Sylvania/Sylvania_24_Button_LED.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Sylvania 24 Button LED
 #
-name: On
+POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/LED_Lighting/artika/Europa_21in_chrome.ir b/LED_Lighting/artika/Europa_21in_chrome.ir
index 2811c6d8..2e43c247 100644
--- a/LED_Lighting/artika/Europa_21in_chrome.ir
+++ b/LED_Lighting/artika/Europa_21in_chrome.ir
@@ -4,7 +4,7 @@ Version: 1
 # artika Europa 21 in Chrome LED Lighting
 # Model #CL-ERR-HD2
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 EF 00 00
diff --git a/LED_Lighting/iDual/iDual_JEDI_Lighting_LED_Light.ir b/LED_Lighting/iDual/iDual_JEDI_Lighting_LED_Light.ir
index 1a92e8d9..844844fb 100644
--- a/LED_Lighting/iDual/iDual_JEDI_Lighting_LED_Light.ir
+++ b/LED_Lighting/iDual/iDual_JEDI_Lighting_LED_Light.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # iDual JEDI Lighting LED Light
 # 
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 02 FE 00 00
diff --git a/Miscellaneous/AMI/AMI_Jukebox_Full.ir b/Miscellaneous/AMI/AMI_Jukebox_Full.ir
index b1c5376f..7fea8da8 100644
--- a/Miscellaneous/AMI/AMI_Jukebox_Full.ir
+++ b/Miscellaneous/AMI/AMI_Jukebox_Full.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # AMI Jukebox
 #
-name: Power
+name: POWER
 type: parsed
 protocol: RC5
 address: 14 00 00 00
diff --git a/Miscellaneous/AMI/Ami_jukebox.ir b/Miscellaneous/AMI/Ami_jukebox.ir
index 6b28ab9b..071e0915 100644
--- a/Miscellaneous/AMI/Ami_jukebox.ir
+++ b/Miscellaneous/AMI/Ami_jukebox.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: RC5
 address: 14 00 00 00
@@ -13,7 +13,7 @@ protocol: RC5
 address: 14 00 00 00
 command: 36 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: RC5
 address: 14 00 00 00
diff --git a/Miscellaneous/AOC/JXD_021.ir b/Miscellaneous/AOC/JXD_021.ir
index 42e11711..699d890f 100644
--- a/Miscellaneous/AOC/JXD_021.ir
+++ b/Miscellaneous/AOC/JXD_021.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # JXD 021 AOC Monitor
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 12 ED 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/Miscellaneous/Arizer/Arizer_XQ2.ir b/Miscellaneous/Arizer/Arizer_XQ2.ir
index 746da023..46a5afed 100644
--- a/Miscellaneous/Arizer/Arizer_XQ2.ir
+++ b/Miscellaneous/Arizer/Arizer_XQ2.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Arizer Extreme Q2 Vaporizer
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 01 00 00 00
diff --git a/Miscellaneous/Azulle/Azulle_Byte3_Fanless_MiniPC.ir b/Miscellaneous/Azulle/Azulle_Byte3_Fanless_MiniPC.ir
index a5289f60..7f05a9e3 100644
--- a/Miscellaneous/Azulle/Azulle_Byte3_Fanless_MiniPC.ir
+++ b/Miscellaneous/Azulle/Azulle_Byte3_Fanless_MiniPC.ir
@@ -4,13 +4,13 @@ Version: 1
 # Azulle Byte3 Fanless Mini PC
 # https://www.amazon.com/dp/B0817JMXTD
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1067 137011 1040
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -64,13 +64,13 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 1225 136742 1223
 #
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1277 138128 1278 138120 1201 138152 1223 138110 1254 138109 1256
 #
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Miscellaneous/Azulle/Azulle_Byte4_Fanless_MiniPC.ir b/Miscellaneous/Azulle/Azulle_Byte4_Fanless_MiniPC.ir
index 8a22d021..3a33d965 100644
--- a/Miscellaneous/Azulle/Azulle_Byte4_Fanless_MiniPC.ir
+++ b/Miscellaneous/Azulle/Azulle_Byte4_Fanless_MiniPC.ir
@@ -5,13 +5,13 @@ Version: 1
 # https://shop.azulle.com/products/byte4
 # 6/14/2022 - Daseiner0
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 57 A8 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -59,13 +59,13 @@ protocol: NECext
 address: 00 9F 00 00
 command: 47 B8 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 00 FF 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
diff --git a/Miscellaneous/Azulle/Azulle_Inspire_Fanless_MiniPC.ir b/Miscellaneous/Azulle/Azulle_Inspire_Fanless_MiniPC.ir
index fbe9c59e..45fdaf84 100644
--- a/Miscellaneous/Azulle/Azulle_Inspire_Fanless_MiniPC.ir
+++ b/Miscellaneous/Azulle/Azulle_Inspire_Fanless_MiniPC.ir
@@ -4,13 +4,13 @@ Version: 1
 # Azulle Inspire Fanless Mini PC
 # https://azulle.com/inspire/
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1067 137011 1040
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -64,13 +64,13 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 1225 136742 1223
 #
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1277 138128 1278 138120 1201 138152 1223 138110 1254 138109 1256
 #
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Miscellaneous/Diffuser/Homedics/Homedics_ARM-720A.ir b/Miscellaneous/Diffuser/Homedics/Homedics_ARM-720A.ir
index f417fdd4..db9c4f63 100644
--- a/Miscellaneous/Diffuser/Homedics/Homedics_ARM-720A.ir
+++ b/Miscellaneous/Diffuser/Homedics/Homedics_ARM-720A.ir
@@ -4,7 +4,7 @@ Version: 1
 # Homedics ARM-720A Ellia Essential Diffuser
 # https://www.homedics.com/content/pdf/instructionbooks/ARM-720_IB.pdf
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -22,13 +22,13 @@ protocol: NEC
 address: 00 00 00 00
 command: 52 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 01 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Miscellaneous/HDMI_Switch.ir b/Miscellaneous/HDMI_Switch.ir
index e413dfc0..c4503f67 100644
--- a/Miscellaneous/HDMI_Switch.ir
+++ b/Miscellaneous/HDMI_Switch.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 80 00 00 00
diff --git a/Miscellaneous/JETTools/JETTools_AFS-1000B_Air_Filter.ir b/Miscellaneous/JETTools/JETTools_AFS-1000B_Air_Filter.ir
index 45735b9b..6bc840f0 100644
--- a/Miscellaneous/JETTools/JETTools_AFS-1000B_Air_Filter.ir
+++ b/Miscellaneous/JETTools/JETTools_AFS-1000B_Air_Filter.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On_off
+name: POWER
 type: parsed
 protocol: NEC
 address: 01 00 00 00
diff --git a/Miscellaneous/LED_Candles.ir b/Miscellaneous/LED_Candles.ir
index eada5174..ef216540 100644
--- a/Miscellaneous/LED_Candles.ir
+++ b/Miscellaneous/LED_Candles.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Miscellaneous/LG/LG.ir b/Miscellaneous/LG/LG.ir
index d480fb71..650e6ace 100644
--- a/Miscellaneous/LG/LG.ir
+++ b/Miscellaneous/LG/LG.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -55,7 +55,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 06 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -73,7 +73,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 03 00 00 00
 # 
-name: Surr_power
+name: Surr_POWER
 type: parsed
 protocol: NEC
 address: 08 00 00 00
diff --git a/Miscellaneous/Logitech/Logitech_Conference_R-R007.ir b/Miscellaneous/Logitech/Logitech_Conference_R-R007.ir
index a21e035f..b5cdb466 100644
--- a/Miscellaneous/Logitech/Logitech_Conference_R-R007.ir
+++ b/Miscellaneous/Logitech/Logitech_Conference_R-R007.ir
@@ -16,19 +16,19 @@ protocol: NEC
 address: 02 00 00 00
 command: F6 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 02 00 00 00
 command: 6A 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 02 00 00 00
 command: AA 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 02 00 00 00
diff --git a/Miscellaneous/Lutron/Lutron_Wall_Dimmer.ir b/Miscellaneous/Lutron/Lutron_Wall_Dimmer.ir
index b7b47f7c..1cf6fe94 100644
--- a/Miscellaneous/Lutron/Lutron_Wall_Dimmer.ir
+++ b/Miscellaneous/Lutron/Lutron_Wall_Dimmer.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Lutron Wall Dimmer
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Miscellaneous/MovinFlame/MovinFlame_LED_Candle.ir b/Miscellaneous/MovinFlame/MovinFlame_LED_Candle.ir
index 23cf93d6..4465ab44 100644
--- a/Miscellaneous/MovinFlame/MovinFlame_LED_Candle.ir
+++ b/Miscellaneous/MovinFlame/MovinFlame_LED_Candle.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # MovinFlame LED Candle
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Miscellaneous/Roksan/Roksan_cd_player.ir b/Miscellaneous/Roksan/Roksan_cd_player.ir
index b21d5f00..72e20397 100644
--- a/Miscellaneous/Roksan/Roksan_cd_player.ir
+++ b/Miscellaneous/Roksan/Roksan_cd_player.ir
@@ -3,13 +3,13 @@ Version: 1
 #
 # Roksan CD player
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 40 BF 00 00
 #
-name: Power2
+name: POWER2
 type: parsed
 protocol: NECext
 address: 87 75 00 00
diff --git a/Miscellaneous/Roland/Roland_SC55_SB55.ir b/Miscellaneous/Roland/Roland_SC55_SB55.ir
index 5453870a..c089bd62 100644
--- a/Miscellaneous/Roland/Roland_SC55_SB55.ir
+++ b/Miscellaneous/Roland/Roland_SC55_SB55.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Roland SC-55 (Sound Canvas) and SB-55 (Sound Brush) MIDI remote
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -33,7 +33,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 3378 1698 406 1277 408 434 403 412 435 405 432 436 411 430 407 1249 436 432 405 436 411 430 407 434 403 438 409 405 432 436 411 403 434 407 430 1279 406 435 412 1270 405 437 410 431 406 435 412 429 408 433 404 1278 407 435 412 429 408 433 404 437 410 431 406 435 412 428 409 1274 411 1271 414 428 409 432 405 1277 408 434 413 428 409 432 405
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Miscellaneous/Seville/Seville_Classics_EHF10119PB_Fan.ir b/Miscellaneous/Seville/Seville_Classics_EHF10119PB_Fan.ir
index 0f89217a..862ed0d2 100644
--- a/Miscellaneous/Seville/Seville_Classics_EHF10119PB_Fan.ir
+++ b/Miscellaneous/Seville/Seville_Classics_EHF10119PB_Fan.ir
@@ -4,7 +4,7 @@ Version: 1
 # Seville Classics EHF10119P Fan
 # https://www.sevilleclassics.com/products/ehf10119pb
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Miscellaneous/Simulflame/Simulflame_LED_Candles.ir b/Miscellaneous/Simulflame/Simulflame_LED_Candles.ir
index a99101f9..e1d4c8ae 100644
--- a/Miscellaneous/Simulflame/Simulflame_LED_Candles.ir
+++ b/Miscellaneous/Simulflame/Simulflame_LED_Candles.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Simulflame LED Candles
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Miscellaneous/Winix/Winix_Air_Filter.ir b/Miscellaneous/Winix/Winix_Air_Filter.ir
index b1a8778e..b1173709 100644
--- a/Miscellaneous/Winix/Winix_Air_Filter.ir
+++ b/Miscellaneous/Winix/Winix_Air_Filter.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Winix Air Filter
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 12 00 00 00
diff --git a/Miscellaneous/Winix/Winix_Air_Purifier.ir b/Miscellaneous/Winix/Winix_Air_Purifier.ir
index 0ee98099..104557c0 100644
--- a/Miscellaneous/Winix/Winix_Air_Purifier.ir
+++ b/Miscellaneous/Winix/Winix_Air_Purifier.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Winix Air Purifier
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 12 00 00 00
diff --git a/Miscellaneous/Woozoo/Woozoo_Fan.ir b/Miscellaneous/Woozoo/Woozoo_Fan.ir
index 171a739e..cd805724 100644
--- a/Miscellaneous/Woozoo/Woozoo_Fan.ir
+++ b/Miscellaneous/Woozoo/Woozoo_Fan.ir
@@ -4,7 +4,7 @@ Version: 1
 # Woozoo Fan
 # https://www.irisusainc.com/collections/woozoo-2
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 DE 00 00
diff --git a/Picture_Frames/Micca/Micca_N10.ir b/Picture_Frames/Micca/Micca_N10.ir
index 1c03b4aa..de0f1142 100644
--- a/Picture_Frames/Micca/Micca_N10.ir
+++ b/Picture_Frames/Micca/Micca_N10.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Micca N10 Picture Frame
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -15,7 +15,7 @@ protocol: NEC
 address: 00 00 00 00
 command: 0E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -69,13 +69,13 @@ protocol: NEC
 address: 00 00 00 00
 command: 17 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 19 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Picture_Frames/Micca/Micca_N7.ir b/Picture_Frames/Micca/Micca_N7.ir
index e8cba0fc..dd364475 100644
--- a/Picture_Frames/Micca/Micca_N7.ir
+++ b/Picture_Frames/Micca/Micca_N7.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Micca N7 Picture Frame
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -15,7 +15,7 @@ protocol: NEC
 address: 00 00 00 00
 command: 0E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -69,13 +69,13 @@ protocol: NEC
 address: 00 00 00 00
 command: 17 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 19 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Picture_Frames/Micca/Micca_N8.ir b/Picture_Frames/Micca/Micca_N8.ir
index 248901fe..202bcd79 100644
--- a/Picture_Frames/Micca/Micca_N8.ir
+++ b/Picture_Frames/Micca/Micca_N8.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Micca N8 Picture Frame
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -15,7 +15,7 @@ protocol: NEC
 address: 00 00 00 00
 command: 0E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -69,13 +69,13 @@ protocol: NEC
 address: 00 00 00 00
 command: 17 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 19 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Picture_Frames/Nixplay/Nixplay_Picture_Frame.ir b/Picture_Frames/Nixplay/Nixplay_Picture_Frame.ir
index 8ba4b32b..d3771534 100644
--- a/Picture_Frames/Nixplay/Nixplay_Picture_Frame.ir
+++ b/Picture_Frames/Nixplay/Nixplay_Picture_Frame.ir
@@ -4,7 +4,7 @@ Version: 1
 # Nixplay Picture Frame Remote
 # https://www.nixplay.com
 # 
-name: On_Off
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 88 00 00
diff --git a/Projectors/Anker/NebulaMarsLite.ir b/Projectors/Anker/NebulaMarsLite.ir
index af38e582..6a0d3b8f 100644
--- a/Projectors/Anker/NebulaMarsLite.ir
+++ b/Projectors/Anker/NebulaMarsLite.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Anker Nebula Mars Lite Projector
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 19 00 00
@@ -63,13 +63,13 @@ protocol: NECext
 address: 80 19 00 00
 command: 19 E6 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 19 00 00
 command: 1C E3 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 19 00 00
diff --git a/Projectors/BenQ/BenQ.ir b/Projectors/BenQ/BenQ.ir
index d4b5c519..075237ab 100644
--- a/Projectors/BenQ/BenQ.ir
+++ b/Projectors/BenQ/BenQ.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/Projectors/BenQ/BenQ_W1070.ir b/Projectors/BenQ/BenQ_W1070.ir
index b68666f6..9e237349 100644
--- a/Projectors/BenQ/BenQ_W1070.ir
+++ b/Projectors/BenQ/BenQ_W1070.ir
@@ -3,7 +3,7 @@ Version: 1
 #
 # BenQ DLP Projector W1070
 # 
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 00 30 00 00
@@ -195,7 +195,7 @@ protocol: NECext
 address: 00 30 00 00
 command: 9D 62 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 30 00 00
diff --git a/Projectors/BenQ/BenQ_W770ST.ir b/Projectors/BenQ/BenQ_W770ST.ir
index bff9c6ee..7ca15cc7 100644
--- a/Projectors/BenQ/BenQ_W770ST.ir
+++ b/Projectors/BenQ/BenQ_W770ST.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # BenQ Projector W770ST
 #
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 00 30 00 00
@@ -195,7 +195,7 @@ protocol: NECext
 address: 00 30 00 00
 command: 9D 62 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 30 00 00
diff --git a/Projectors/BrandUnknown/LED_Smart_Home_Theater_Projector.ir b/Projectors/BrandUnknown/LED_Smart_Home_Theater_Projector.ir
index 635b42a4..7418a3ca 100644
--- a/Projectors/BrandUnknown/LED_Smart_Home_Theater_Projector.ir
+++ b/Projectors/BrandUnknown/LED_Smart_Home_Theater_Projector.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 08 16 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 08 16 00 00
 command: B5 4A 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 16 00 00
diff --git a/Projectors/Casio/Casio_YT-130.ir b/Projectors/Casio/Casio_YT-130.ir
index 8d7506b3..96d80d2a 100644
--- a/Projectors/Casio/Casio_YT-130.ir
+++ b/Projectors/Casio/Casio_YT-130.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 F4 00 00
diff --git a/Projectors/Eiki/Eiki_Projector.ir b/Projectors/Eiki/Eiki_Projector.ir
index 57283402..903753ed 100644
--- a/Projectors/Eiki/Eiki_Projector.ir
+++ b/Projectors/Eiki/Eiki_Projector.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Eiki Projector
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 33 00 00 00
@@ -45,13 +45,13 @@ protocol: NECext
 address: 33 00 00 00
 command: 8D 72 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 33 00 00 00
 command: 1E E1 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 33 00 00 00
@@ -105,7 +105,7 @@ protocol: NECext
 address: 33 00 00 00
 command: 43 BC 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 33 00 00 00
diff --git a/Projectors/Epson/Epson.ir b/Projectors/Epson/Epson.ir
index b29d592f..960901b7 100644
--- a/Projectors/Epson/Epson.ir
+++ b/Projectors/Epson/Epson.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 55 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 83 55 00 00
 command: 59 A6 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 99 66 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 55 00 00
diff --git a/Projectors/Minolta/Minolta_MN674.ir b/Projectors/Minolta/Minolta_MN674.ir
index 377bc3c2..1b72650a 100644
--- a/Projectors/Minolta/Minolta_MN674.ir
+++ b/Projectors/Minolta/Minolta_MN674.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 DF 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 00 DF 00 00
 command: 08 F7 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 DF 00 00
 command: 4F B0 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 DF 00 00
diff --git a/Projectors/Optoma/Optoma_Profomo_L-27-5KEY.ir b/Projectors/Optoma/Optoma_Profomo_L-27-5KEY.ir
index f18092b8..83ff2d44 100644
--- a/Projectors/Optoma/Optoma_Profomo_L-27-5KEY.ir
+++ b/Projectors/Optoma/Optoma_Profomo_L-27-5KEY.ir
@@ -4,7 +4,7 @@ Filetype: IR signals file
 #
 Version: 1
 # 
-name: On
+POWER
 type: parsed
 protocol: NEC
 address: 32 00 00 00
@@ -82,7 +82,7 @@ protocol: NEC
 address: 32 00 00 00
 command: 89 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 32 00 00 00
diff --git a/Projectors/Philips/Philips_NeoPix_Prime_Projector.ir b/Projectors/Philips/Philips_NeoPix_Prime_Projector.ir
index e7122c87..add176cd 100644
--- a/Projectors/Philips/Philips_NeoPix_Prime_Projector.ir
+++ b/Projectors/Philips/Philips_NeoPix_Prime_Projector.ir
@@ -9,19 +9,19 @@ protocol: NEC
 address: 20 00 00 00
 command: 41 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 20 00 00 00
 command: 51 00 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: NEC
 address: 20 00 00 00
 command: 56 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 20 00 00 00
diff --git a/Projectors/Sony/Sony_RM_PJ24.ir b/Projectors/Sony/Sony_RM_PJ24.ir
index a7a486f9..fea831d3 100755
--- a/Projectors/Sony/Sony_RM_PJ24.ir
+++ b/Projectors/Sony/Sony_RM_PJ24.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC15
 address: 54 00 00 00
diff --git a/Projectors/ViewSonic/ViewSonic_Projector_PA503W-2.ir b/Projectors/ViewSonic/ViewSonic_Projector_PA503W-2.ir
index d1d4d051..53eef399 100644
--- a/Projectors/ViewSonic/ViewSonic_Projector_PA503W-2.ir
+++ b/Projectors/ViewSonic/ViewSonic_Projector_PA503W-2.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # ViewSonic Projector PA503W-2
 # 
-name: Power_On
+name: POWER_On
 type: parsed
 protocol: NECext
 address: 83 F4 00 00
 command: 4F B0 00 00
 # 
-name: Power_Off
+name: POWER_Off
 type: parsed
 protocol: NECext
 address: 83 F4 00 00
@@ -123,7 +123,7 @@ protocol: NECext
 address: 83 F4 00 00
 command: 06 F9 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 F4 00 00
@@ -141,7 +141,7 @@ protocol: NECext
 address: 83 F4 00 00
 command: 05 FA 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 F4 00 00
@@ -159,7 +159,7 @@ protocol: NECext
 address: 83 F4 00 00
 command: 2B D4 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 F4 00 00
diff --git a/Projectors/Vivitek/Vivitek.ir b/Projectors/Vivitek/Vivitek.ir
index d15adf3c..720ad12b 100755
--- a/Projectors/Vivitek/Vivitek.ir
+++ b/Projectors/Vivitek/Vivitek.ir
@@ -9,7 +9,7 @@ protocol: NEC
 address: 31 00 00 00
 command: 91 00 00 00
 # 
-name: On
+POWER
 type: parsed
 protocol: NEC
 address: 31 00 00 00
@@ -117,7 +117,7 @@ protocol: NEC
 address: 31 00 00 00
 command: 86 00 00 00
 # 
-name: Volume
+name: VOL+
 type: parsed
 protocol: NEC
 address: 31 00 00 00
@@ -135,7 +135,7 @@ protocol: NEC
 address: 31 00 00 00
 command: 99 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 31 00 00 00
diff --git a/README.md b/README.md
index f9130b13..ab753119 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Lastly, it's helpful to add further information as a comment directly into the I
 `#`<br>
 `# Dynex EN-21669D TV` <---<br>
 `#`<br>
-`name: Power`<br>
+`name: POWER`<br>
 
 Make, model, link, or even a short description can be helpful if the name is changed or just in general!
 
diff --git a/SoundBars/Bose/Bose_Solo_2.ir b/SoundBars/Bose/Bose_Solo_2.ir
index ac5b3d75..7aa3570b 100644
--- a/SoundBars/Bose/Bose_Solo_2.ir
+++ b/SoundBars/Bose/Bose_Solo_2.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1004 1513 481 515 487 1478 516 505 487 510 482 1484 510 1481 513 508 484 512 490 1475 509 513 489 1477 507 1484 510 511 481 515 487 1479 515 1474 510 50774 1005 1484 510 513 489 1476 508 513 489 508 484 1482 512 1479 515 506 486 511 481 1483 511 512 490 1475 509 1483 511 510 482 515 487 1504 490 1475 509 50777 1013 1503 491 506 486 1505 489 507 485 512 490 1501 483 1508 486 510 482 514 488 1503 481 515 487 1504 490 1500 484 512 490 506 486 1506 488 1502 482
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1014 1477 517 478 514 509 483 487 515 480 512 484 508 488 514 1479 515 1476 508 1483 511 1481 513 1478 516 1475 509 1482 512 1479 515 480 512 483 509 50775 1014 1477 517 504 488 508 484 513 489 506 486 510 482 514 488 1478 516 1475 509 1483 511 1480 514 1477 517 1474 510 1482 512 1478 516 505 487 509 483 50770 1009 1481 513 508 484 512 490 506 486 510 482 514 488 508 484 1481 513 1478 516 1475 509 1483 511 1480 514 1477 517 1475 509 1482 512 509 483 513 489
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1010 1508 486 509 483 513 489 507 485 512 490 505 487 510 482 1509 485 511 491 1501 483 1509 485 1507 487 1504 490 1502 482 1509 485 511 491 1500 484 50779 1010 1506 488 508 484 512 490 505 487 509 483 513 489 506 486 1506 488 507 485 1506 488 1503 481 1510 484 1508 486 1505 489 1503 481 514 488 1503 491
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/SoundBars/Bose/Bose_Solo_5.ir b/SoundBars/Bose/Bose_Solo_5.ir
index 8169a968..f4572fdb 100644
--- a/SoundBars/Bose/Bose_Solo_5.ir
+++ b/SoundBars/Bose/Bose_Solo_5.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: BA A0 00 00
 command: 81 7E 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: BA A0 00 00
diff --git a/SoundBars/Bose/Bose_Solo_Soundbar.ir b/SoundBars/Bose/Bose_Solo_Soundbar.ir
index 825dbfb4..de10a1d4 100644
--- a/SoundBars/Bose/Bose_Solo_Soundbar.ir
+++ b/SoundBars/Bose/Bose_Solo_Soundbar.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Bose Solo Soundbar
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: BA A0 00 00
@@ -21,7 +21,7 @@ protocol: NECext
 address: BA A0 00 00
 command: 02 FD 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: BA A0 00 00
diff --git a/SoundBars/Bose/Bose_Soundbar.ir b/SoundBars/Bose/Bose_Soundbar.ir
index ac5b3d75..7aa3570b 100644
--- a/SoundBars/Bose/Bose_Soundbar.ir
+++ b/SoundBars/Bose/Bose_Soundbar.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1004 1513 481 515 487 1478 516 505 487 510 482 1484 510 1481 513 508 484 512 490 1475 509 513 489 1477 507 1484 510 511 481 515 487 1479 515 1474 510 50774 1005 1484 510 513 489 1476 508 513 489 508 484 1482 512 1479 515 506 486 511 481 1483 511 512 490 1475 509 1483 511 510 482 515 487 1504 490 1475 509 50777 1013 1503 491 506 486 1505 489 507 485 512 490 1501 483 1508 486 510 482 514 488 1503 481 515 487 1504 490 1500 484 512 490 506 486 1506 488 1502 482
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1014 1477 517 478 514 509 483 487 515 480 512 484 508 488 514 1479 515 1476 508 1483 511 1481 513 1478 516 1475 509 1482 512 1479 515 480 512 483 509 50775 1014 1477 517 504 488 508 484 513 489 506 486 510 482 514 488 1478 516 1475 509 1483 511 1480 514 1477 517 1474 510 1482 512 1478 516 505 487 509 483 50770 1009 1481 513 508 484 512 490 506 486 510 482 514 488 508 484 1481 513 1478 516 1475 509 1483 511 1480 514 1477 517 1475 509 1482 512 509 483 513 489
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1010 1508 486 509 483 513 489 507 485 512 490 505 487 510 482 1509 485 511 491 1501 483 1509 485 1507 487 1504 490 1502 482 1509 485 511 491 1500 484 50779 1010 1506 488 508 484 512 490 505 487 509 483 513 489 506 486 1506 488 507 485 1506 488 1503 481 1510 484 1508 486 1505 489 1503 481 514 488 1503 491
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/SoundBars/Bose/Bose_Soundbar_300.ir b/SoundBars/Bose/Bose_Soundbar_300.ir
index b725a64b..2245d81c 100644
--- a/SoundBars/Bose/Bose_Soundbar_300.ir
+++ b/SoundBars/Bose/Bose_Soundbar_300.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Bose Soundbar 300
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: BA 4B 00 00
@@ -39,7 +39,7 @@ protocol: NECext
 address: BA 4B 00 00
 command: 02 FD 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: BA 4B 00 00
diff --git a/SoundBars/BrandUnknown/Amz_snd_bar.ir b/SoundBars/BrandUnknown/Amz_snd_bar.ir
index e02deae5..20ba3153 100644
--- a/SoundBars/BrandUnknown/Amz_snd_bar.ir
+++ b/SoundBars/BrandUnknown/Amz_snd_bar.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 35 00 00 00
 command: 09 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 35 00 00 00
 command: 45 00 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: NEC
 address: 35 00 00 00
 command: 1B 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 35 00 00 00
diff --git a/SoundBars/BrandUnknown/Soundblasterx.ir b/SoundBars/BrandUnknown/Soundblasterx.ir
index 2252b1e7..8e54ff31 100644
--- a/SoundBars/BrandUnknown/Soundblasterx.ir
+++ b/SoundBars/BrandUnknown/Soundblasterx.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 22 00 00
 command: 08 F7 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 22 00 00
 command: 0C F3 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 22 00 00
 command: 0A F5 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 22 00 00
diff --git a/SoundBars/Craig/Craig_CHT912.ir b/SoundBars/Craig/Craig_CHT912.ir
index 00fc1928..fbaae644 100644
--- a/SoundBars/Craig/Craig_CHT912.ir
+++ b/SoundBars/Craig/Craig_CHT912.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: NEC
 address: 20 00 00 00
@@ -13,7 +13,7 @@ protocol: NEC
 address: 20 00 00 00
 command: 02 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 20 00 00 00
diff --git a/SoundBars/Craig/Craig_CHT921.ir b/SoundBars/Craig/Craig_CHT921.ir
index 26c6c32d..9dbf37d6 100644
--- a/SoundBars/Craig/Craig_CHT921.ir
+++ b/SoundBars/Craig/Craig_CHT921.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -13,13 +13,13 @@ protocol: NEC
 address: 00 00 00 00
 command: 03 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 01 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/SoundBars/Craig/Craig_CHT939.ir b/SoundBars/Craig/Craig_CHT939.ir
index 504ea33b..dfad2119 100644
--- a/SoundBars/Craig/Craig_CHT939.ir
+++ b/SoundBars/Craig/Craig_CHT939.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -13,7 +13,7 @@ protocol: NEC
 address: 00 00 00 00
 command: 1F 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/SoundBars/Klipsch/Klipsch_Soundbar.ir b/SoundBars/Klipsch/Klipsch_Soundbar.ir
index 23636460..9b90972e 100644
--- a/SoundBars/Klipsch/Klipsch_Soundbar.ir
+++ b/SoundBars/Klipsch/Klipsch_Soundbar.ir
@@ -7,19 +7,19 @@ protocol: NEC
 address: 80 00 00 00
 command: 1E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 80 00 00 00
 command: 01 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 80 00 00 00
 command: 03 00 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: NEC
 address: 80 00 00 00
diff --git a/SoundBars/LG/LG_Soundbar.ir b/SoundBars/LG/LG_Soundbar.ir
index fc77d3b2..e0ad6809 100644
--- a/SoundBars/LG/LG_Soundbar.ir
+++ b/SoundBars/LG/LG_Soundbar.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # LG Soundbar
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
@@ -45,7 +45,7 @@ protocol: Samsung32
 address: 2C 00 00 00
 command: 66 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
diff --git a/SoundBars/Onn/Onn_sound_bar_and_subwoofer.ir b/SoundBars/Onn/Onn_sound_bar_and_subwoofer.ir
index 5d8722e1..924d9d7a 100644
--- a/SoundBars/Onn/Onn_sound_bar_and_subwoofer.ir
+++ b/SoundBars/Onn/Onn_sound_bar_and_subwoofer.ir
@@ -15,7 +15,7 @@ protocol: NECext
 address: 83 22 00 00
 command: 0F F0 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 22 00 00
@@ -81,7 +81,7 @@ protocol: NECext
 address: 83 22 00 00
 command: 08 F7 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 22 00 00
diff --git a/SoundBars/Panasonic/Panasonic_SCH-TB8.ir b/SoundBars/Panasonic/Panasonic_SCH-TB8.ir
index 997ab0c7..4937d41e 100644
--- a/SoundBars/Panasonic/Panasonic_SCH-TB8.ir
+++ b/SoundBars/Panasonic/Panasonic_SCH-TB8.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Panasonic Soundbar SCH-TB8
 #
-name: On_Off
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -33,19 +33,19 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 3487 1756 420 449 419 1319 418 451 417 452 416 454 425 444 424 445 423 447 421 448 420 449 419 450 418 451 417 452 416 1322 425 444 424 446 422 447 421 421 447 449 419 450 418 451 417 1322 415 454 425 1314 423 446 422 420 448 1317 420 1319 418 1319 418 425 443 453 415 454 425 445 423 446 422 447 421 449 419 450 418 1320 417 453 415 1323 424 445 423 446 422 1316 421 1317 420 1317 420 423 445 424 444 452 416 74926 3484 1758 418 450 418 1320 417 453 415 427 452 445 423 446 422 447 421 448 420 449 419 450 418 451 417 452 416 426 442 1323 424 445 423 446 422 447 421 448 420 449 419 450 418 451 417 1321 416 453 415 1323 424 418 450 446 422 1316 421 1290 447 1290 447 450 418 451 417 425 443 453 415 454 425 445 423 446 422 447 421 1317 420 450 418 1320 417 452 416 453 415 1323 424 1314 423 1314 423 447 421 448 420 449 419 74912 3488 1753 423 446 422 1315 422 447 421 448 420 449 419 450 418 451 417 452 416 426 442 454 425 445 423 445 423 446 422 1289 448 449 419 450 418 451 417 452 416 453 415 454 425 444 424 1287 450 419 449 1289 448 449 419 450 418 1320 417 1293 444 1294 443 453 415 454 425 445 423 445 423 446 422 447 421 448 420 449 419 1292 445 451 417 1321 416 453 415 454 425 1286 451 1287 450 1315 422 420 448 448 420 450 418
 # 
-name: Vol_Up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 3492 1750 416 454 425 1313 424 446 422 447 421 448 420 450 418 451 417 452 416 453 415 455 424 445 423 446 422 447 421 1290 447 450 418 451 417 452 416 453 415 455 424 445 423 447 421 1290 447 422 446 1319 418 452 416 426 442 454 425 445 423 446 422 447 421 421 447 449 419 450 418 451 417 452 416 453 415 454 425 1314 423 446 422 447 421 448 420 449 419 450 418 451 417 452 416 454 425 444 424 1315 422 74926 3488 1754 422 447 421 1317 420 422 446 451 417 452 416 453 415 454 425 444 424 445 423 446 422 447 421 448 420 449 419 1292 445 452 416 453 415 454 425 445 423 446 422 447 421 448 420 1318 419 450 418 1293 444 453 415 454 425 445 423 446 422 447 421 448 420 449 419 450 418 451 417 452 416 453 415 455 424 445 423 1315 422 448 420 449 419 450 418 424 444 452 416 453 415 454 425 445 423 446 422 1289 448
 # 
-name: Vol_Down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 3486 1756 420 449 419 1291 446 424 444 452 416 453 415 454 425 444 424 445 423 446 422 446 422 447 421 448 420 449 419 1319 418 452 416 453 415 426 453 444 424 445 423 446 422 447 421 1290 447 422 446 1319 418 451 417 452 416 454 425 444 424 445 423 446 422 447 421 420 448 1317 420 449 419 450 418 452 416 453 415 1322 425 417 451 445 423 1315 422 447 421 448 420 449 419 450 418 451 417 452 416 1322 415 74922 3492 1722 444 452 416 1321 416 426 453 444 424 445 423 446 422 447 421 447 421 448 420 449 419 450 418 451 417 452 416 1294 443 453 415 454 425 445 423 445 423 446 422 447 421 448 420 1317 420 450 418 1319 418 451 417 425 443 453 415 454 425 444 424 418 450 446 422 447 421 1317 420 449 419 450 418 451 417 452 416 1322 425 444 424 445 423 1315 422 420 448 448 420 448 420 422 446 450 418 451 417 1321 416
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/SoundBars/Philips/Philips_HTL2161B_Soundbar.ir b/SoundBars/Philips/Philips_HTL2161B_Soundbar.ir
index 428ea19e..7075428f 100644
--- a/SoundBars/Philips/Philips_HTL2161B_Soundbar.ir
+++ b/SoundBars/Philips/Philips_HTL2161B_Soundbar.ir
@@ -3,13 +3,13 @@ Version: 1
 #
 # Philips Soundbar HTL2161B/F7 (2015)
 #
-name: Power
+name: POWER
 type: parsed
 protocol: RC6
 address: 10 00 00 00
 command: 0C 00 00 00
 #
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: RC6
 address: 10 00 00 00
diff --git a/SoundBars/Samsung/Samsung_AH59-02692P_Soundbar.ir b/SoundBars/Samsung/Samsung_AH59-02692P_Soundbar.ir
index 5a66c402..2222db1e 100644
--- a/SoundBars/Samsung/Samsung_AH59-02692P_Soundbar.ir
+++ b/SoundBars/Samsung/Samsung_AH59-02692P_Soundbar.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Samsung AH59-02692P Soundbar
 # 
-name: On_off
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/SoundBars/Samsung/Samsung_AH59002692H.ir b/SoundBars/Samsung/Samsung_AH59002692H.ir
index a792ecb3..0e9e5b56 100644
--- a/SoundBars/Samsung/Samsung_AH59002692H.ir
+++ b/SoundBars/Samsung/Samsung_AH59002692H.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -25,7 +25,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4500 4436 516 504 486 510 490 505 485 510 490 1500 491 1474 517 505 485 484 516 1501 490 1501 490 1501 490 1501 490 505 485 511 489 506 484 485 515 4449 513 482 508 513 487 508 482 514 486 1504 487 1504 487 1504 487 482 508 1509 482 1509 492 1499 492 504 486 509 491 504 486 509 491 1500 491 504 486 510 490 478 512 1505 486 55017 4492 4444 508 512 488 508 482 513 487 508 482 1508 483 1482 509 513 487 508 482 1509 482 1509 482 1483 508 1483 508 513 487 508 482 514 486 509 481 4457 515 506 484 511 489 506 484 511 489 1501 490 1475 516 1501 490 506 484 1480 511 1507 484 1480 511 511 489 506 484 512 488 507 483 1507 484 512 488 507 483 512 488 1503 488
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -73,7 +73,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4497 4439 512 510 490 505 485 510 490 506 484 1481 509 1482 508 513 487 508 492 1473 517 1474 516 1475 515 1475 515 506 484 512 488 507 483 513 487 4452 509 511 489 507 483 512 488 507 483 513 487 1478 512 1479 511 510 490 505 485 1481 509 511 489 1476 514 1477 513 508 482 513 487 1478 512 1479 511 510 490 1475 515 506 484
 # 
-name: Bluetooth Power
+name: Bluetooth POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -85,7 +85,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4495 4441 510 511 489 506 484 512 488 507 483 1483 518 1473 517 504 486 510 490 1475 515 1476 514 1477 513 1477 513 508 492 503 487 509 491 504 486 4454 517 504 486 510 490 505 485 510 490 506 484 1481 509 512 488 1477 513 1478 512 1479 511 1479 511 510 490 1475 515 506 484 1482 508 512 488 481 509 513 487 509 491 1474 516
 # 
-name: Auto Power
+name: Auto POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/SoundBars/Samsung/Samsung_SK10Y.ir b/SoundBars/Samsung/Samsung_SK10Y.ir
index 2c0d3168..cde396b0 100644
--- a/SoundBars/Samsung/Samsung_SK10Y.ir
+++ b/SoundBars/Samsung/Samsung_SK10Y.ir
@@ -3,25 +3,25 @@ Version: 1
 # 
 # Samsung Soundbar SK10Y
 #
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
 command: 1E 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
 command: 17 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
 command: 16 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 2C 00 00 00
diff --git a/SoundBars/Samsung/Samsung_Soundbar.ir b/SoundBars/Samsung/Samsung_Soundbar.ir
index a567d73c..a091af74 100644
--- a/SoundBars/Samsung/Samsung_Soundbar.ir
+++ b/SoundBars/Samsung/Samsung_Soundbar.ir
@@ -3,25 +3,25 @@ Version: 1
 # 
 # Samsung Soundbar
 #
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4496 4442 513 503 488 502 489 501 490 500 491 1505 487 1508 484 505 486 504 487 1508 484 1511 492 1503 489 1499 514 484 486 504 487 502 489 501 490 4449 517 499 492 499 492 497 483 507 484 1511 492 1504 488 1499 514 483 487 1509 483 1512 491 1504 488 503 488 501 490 500 491 499 492 1504 488 501 490 500 491 492 509 1494 488 55126 4496 4446 541 482 488 502 489 501 490 500 491 1505 487 1508 484 505 486 504 487 1508 484 1503 510 1493 489 1480 512 504 487 503 488 502 489 500 491 4449 517 498 493 497 483 507 484 505 486 1502 511 1492 490 1504 488 502 489 1507 485 1509 483 1512 491 473 518 498 493 496 484 505 486 1510 483 499 512 484 486 504 487 1508 484
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4492 4434 510 505 486 505 486 504 487 503 488 1481 511 1484 518 499 492 498 493 1476 516 1479 513 1483 519 1469 596 402 516 500 491 499 492 498 493 4447 518 498 493 497 483 507 484 506 485 504 487 503 488 494 517 1485 486 1483 519 1476 516 1480 512 504 486 1508 484 1486 517 1479 565 425 513 502 488 501 490 492 509 1467 515
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4504 4432 511 509 492 504 486 509 492 504 486 1478 514 1477 515 507 484 512 489 1476 516 1475 517 1475 517 1474 518 503 487 509 492 503 487 508 493 4446 508 513 488 507 483 512 489 507 483 512 489 506 484 511 490 506 484 1481 511 1480 512 1479 513 509 492 1473 519 1473 519 1472 509 1482 510 511 490 506 484 511 490 1475 517 54985 4498 4437 517 504 486 509 492 504 486 509 492 1473 519 1472 509 512 489 506 484 1481 511 1480 512 1480 512 1479 513 508 493 502 488 507 483 512 489 4449 516 506 485 511 490 505 485 510 491 505 485 510 491 504 486 509 492 1473 519 1473 508 1483 561 434 515 1476 516 1475 517 1474 518 1473 519 502 488 507 483 512 489 1476 516
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -57,7 +57,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4496 4440 512 510 490 479 511 485 515 480 520 1471 520 1471 520 475 515 480 520 1472 519 1472 519 1472 519 1472 519 476 514 481 519 477 513 483 517 4446 516 506 494 474 516 479 521 475 515 480 520 1472 519 475 515 1477 514 1477 514 1477 514 1477 514 481 519 1473 518 476 514 1478 513 508 492 478 512 483 517 478 512 1480 511 54996 4502 4434 518 504 486 482 518 478 512 484 516 1475 516 1475 516 504 486 484 516 1475 516 1475 516 1475 516 1475 516 505 495 474 516 506 495 475 515 4449 513 508 492 503 487 482 518 477 513 482 518 1474 517 478 512 1480 511 1480 511 1480 511 1480 511 510 490 1475 516 479 521 1471 520 474 516 480 520 475 515 507 493 1472 519
 # 
-name: Auto_power
+name: Auto_POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/SoundBars/Samsung/Samsung_Soundbar_HW-T400.ir b/SoundBars/Samsung/Samsung_Soundbar_HW-T400.ir
index c173fb90..f43b9aef 100644
--- a/SoundBars/Samsung/Samsung_Soundbar_HW-T400.ir
+++ b/SoundBars/Samsung/Samsung_Soundbar_HW-T400.ir
@@ -4,25 +4,25 @@ Version: 1
 # Samsung Soundbar HW-T400
 # ALL BUTTONS!
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4551 4468 549 461 544 493 523 460 545 466 518 1480 520 1479 542 468 548 489 495 1477 523 1475 515 1484 516 1483 549 461 544 493 523 487 518 466 518 4490 548 462 543 493 523 488 517 466 550 461 544 466 550 460 545 465 519 1480 520 1478 522 1477 544 465 519 1480 520 1479 521 1477 523 1476 545 464 541 496 520 490 494 1479 542 55901 4554 4465 542 494 522 489 516 494 522 488 496 1477 523 1476 545 490 515 495 489 1484 516 1483 517 1481 519 1479 542 494 522 489 516 494 522 488 496 4487 541 495 521 490 515 495 521 489 516 494 522 488 517 493 523 488 496 1476 525 1475 515 1483 549 488 496 1476 524 1475 515 1484 516 1482 550 486 519 491 525 486 488 1485 547 55897 4548 4470 548 462 543 468 548 462 543 467 517 1482 518 1480 541 469 547 490 494 1478 575 1423 515 1485 515 1483 549 461 544 466 550 461 544 466 518 4491 547 462 543 467 549 462 543 467 549 461 544 466 539 497 519 492 492 1480 520 1478 522 1477 544 465 519 1480 520 1479 521 1477 513 1486 546 464 541 469 547 464 520 1478 543
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4553 4467 550 459 546 464 541 469 547 464 520 1479 521 1477 544 492 524 486 498 1475 515 1484 516 1482 518 1481 540 496 520 490 515 495 521 490 494 4488 550 486 519 491 525 486 519 491 493 1479 542 494 522 489 516 494 490 1482 518 1481 519 1480 541 494 522 489 495 1478 522 1476 514 1485 547 489 516 494 522 489 495 1477 544
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4559 4461 546 490 515 495 521 490 515 495 489 1484 516 1482 550 486 519 491 493 1480 520 1478 522 1477 523 1475 546 490 515 495 521 490 515 495 489 4493 545 491 525 486 519 491 514 496 488 1484 516 1483 517 1481 551 486 488 1485 515 1483 517 1482 550 486 519 491 525 486 519 491 493 1479 542 494 522 489 516 467 517 1482 550
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/SoundBars/Samsung/Samsung_Soundbar_New.ir b/SoundBars/Samsung/Samsung_Soundbar_New.ir
index 46eae540..3391df5c 100644
--- a/SoundBars/Samsung/Samsung_Soundbar_New.ir
+++ b/SoundBars/Samsung/Samsung_Soundbar_New.ir
@@ -3,7 +3,7 @@ Filetype: IR signals file
 # Samsung Soundbar NEW
 #
 Version: 1
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/SoundBars/Sony/Sony_MHC-GS300AV.ir b/SoundBars/Sony/Sony_MHC-GS300AV.ir
index ab7a355d..48fdd3d7 100644
--- a/SoundBars/Sony/Sony_MHC-GS300AV.ir
+++ b/SoundBars/Sony/Sony_MHC-GS300AV.ir
@@ -19,7 +19,7 @@ protocol: SIRC15
 address: 10 00 00 00
 command: 27 00 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC15
 address: 10 00 00 00
diff --git a/SoundBars/Sony/Sony_Old_XBR.ir b/SoundBars/Sony/Sony_Old_XBR.ir
index c326b805..33c5c0b8 100644
--- a/SoundBars/Sony/Sony_Old_XBR.ir
+++ b/SoundBars/Sony/Sony_Old_XBR.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 15 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 13 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/SoundBars/Sony/Sony_RDH-GTK33IP.ir b/SoundBars/Sony/Sony_RDH-GTK33IP.ir
index 9324f88a..abb19659 100644
--- a/SoundBars/Sony/Sony_RDH-GTK33IP.ir
+++ b/SoundBars/Sony/Sony_RDH-GTK33IP.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC
 address: 10 00 00 00
diff --git a/SoundBars/Sony/Sony_Soundbar_RMT-AH411U.ir b/SoundBars/Sony/Sony_Soundbar_RMT-AH411U.ir
index 933165d5..4db87b10 100644
--- a/SoundBars/Sony/Sony_Soundbar_RMT-AH411U.ir
+++ b/SoundBars/Sony/Sony_Soundbar_RMT-AH411U.ir
@@ -51,13 +51,13 @@ protocol: SIRC15
 address: B0 00 00 00
 command: 20 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
@@ -69,7 +69,7 @@ protocol: SIRC15
 address: B0 00 00 00
 command: 10 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC15
 address: 30 00 00 00
diff --git a/SoundBars/TCL/TCL_TS5010.ir b/SoundBars/TCL/TCL_TS5010.ir
index 85aadbf7..769532ec 100644
--- a/SoundBars/TCL/TCL_TS5010.ir
+++ b/SoundBars/TCL/TCL_TS5010.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # TCL TS5010 Soundbar
 #
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: NECext
 address: 86 FF 00 00
diff --git a/SoundBars/TaoTronics/TaoTronics_TT-SK023_Sound_Bar.ir b/SoundBars/TaoTronics/TaoTronics_TT-SK023_Sound_Bar.ir
index 50a76828..78ea08c5 100644
--- a/SoundBars/TaoTronics/TaoTronics_TT-SK023_Sound_Bar.ir
+++ b/SoundBars/TaoTronics/TaoTronics_TT-SK023_Sound_Bar.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # TaoTronics TT-SK023 Sound Bar
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 80 00 00 00
@@ -19,7 +19,7 @@ protocol: NEC
 address: 80 00 00 00
 command: 08 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 80 00 00 00
diff --git a/SoundBars/Vizio/Vizio_Soundbar.ir b/SoundBars/Vizio/Vizio_Soundbar.ir
index 1f7ca296..5775335f 100644
--- a/SoundBars/Vizio/Vizio_Soundbar.ir
+++ b/SoundBars/Vizio/Vizio_Soundbar.ir
@@ -19,7 +19,7 @@ protocol: NEC
 address: 00 00 00 00
 command: 41 00 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/SoundBars/Yamaha/Yamaha_BAR400.ir b/SoundBars/Yamaha/Yamaha_BAR400.ir
index 1f83ae9d..ab37af59 100644
--- a/SoundBars/Yamaha/Yamaha_BAR400.ir
+++ b/SoundBars/Yamaha/Yamaha_BAR400.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 78 00 00 00
 command: CC 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 78 00 00 00
@@ -31,7 +31,7 @@ protocol: NEC
 address: 78 00 00 00
 command: 4D 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 78 00 00 00
diff --git a/SoundBars/Yamaha/Yamaha_RX.ir b/SoundBars/Yamaha/Yamaha_RX.ir
index 1fb76163..16936634 100644
--- a/SoundBars/Yamaha/Yamaha_RX.ir
+++ b/SoundBars/Yamaha/Yamaha_RX.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Yamaha_power
+name: Yamaha_POWER
 type: parsed
 protocol: NEC
 address: 7E 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 7A 85 00 00
 command: 6B 14 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 7A 00 00 00
 command: 1A 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 7A 00 00 00
 command: 1B 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 7A 00 00 00
diff --git a/Speakers/Audioengine/Audioengine_a5.ir b/Speakers/Audioengine/Audioengine_a5.ir
index aca38e4a..c1adce25 100644
--- a/Speakers/Audioengine/Audioengine_a5.ir
+++ b/Speakers/Audioengine/Audioengine_a5.ir
@@ -10,19 +10,19 @@ protocol: NECext
 address: 00 FD 00 00
 command: 01 FE 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 03 FC 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 09 F6 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
diff --git a/Speakers/Bose/Bose_SoundTouch.ir b/Speakers/Bose/Bose_SoundTouch.ir
index 2dbe54c7..a216845b 100644
--- a/Speakers/Bose/Bose_SoundTouch.ir
+++ b/Speakers/Bose/Bose_SoundTouch.ir
@@ -4,7 +4,7 @@ Version: 1
 # Bose SoundTouch
 # https://www.bose.com/en_us/support/products/bose_speakers_support/bose_smarthome_speakers_support.html
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -52,13 +52,13 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 1044 1457 543 1456 544 1454 546 454 546 454 546 1453 537 1461 539 1460 540 1458 542 457 543 457 543 1455 545 1453 537 463 537 462 538 462 538 460 540 50931 1009 1489 511 1488 512 1487 513 486 514 485 515 1484 516 1483 517 1481 509 1491 509 490 510 489 511 1488 512 1488 512 487 513 487 513 487 513 485 515
 # 
-name: Vol_Up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1044 1456 544 455 545 455 534 1464 536 1462 538 1460 540 1458 542 1456 544 1455 545 1453 537 1461 539 460 540 459 541 459 561 437 542 457 543 456 544 50915 1016 1483 517 482 518 482 518 1481 509 1489 511 1487 513 1486 514 1485 515 1483 517 1482 508 1490 510 489 511 488 512 487 513 487 513 486 514 485 515 50956 1047 1452 538 462 538 462 538 1461 539 1460 540 1458 542 1457 543 1456 544 1454 546 1453 547 1451 539 461 539 460 540 460 540 459 541 459 541 457 543
 # 
-name: Vol_Down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Speakers/Bose/Bose_Wave_System.ir b/Speakers/Bose/Bose_Wave_System.ir
index ae7a47dc..0eaf8876 100644
--- a/Speakers/Bose/Bose_Wave_System.ir
+++ b/Speakers/Bose/Bose_Wave_System.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # Bose WAVE System
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 1011 1479 517 477 516 481 512 1480 516 1473 513 482 511 485 518 1473 513 482 511 1481 515 1474 512 482 511 485 518 1473 513 1477 509 486 517 1473 513 50728 1014 1475 511 484 509 487 516 1475 511 1479 517 477 516 480 513 1478 508 487 516 1475 511 1479 517 478 514 480 513 1479 517 1473 513 508 484 1479 517 50725 1016 1473 513 481 512 484 519 1473 513 1477 509 485 518 478 515 1476 510 485 518 1473 513 1477 509 486 517 478 515 1476 510 1480 516 479 514 1476 510 50735 1069 1421 513 481 512 484 509 1483 513 1477 509 486 517 479 514 1477 509 486 517 1474 512 1479 507 488 515 480 513 1479 507 1483 513 482 511 1479 517 50733 1011 1478 508 513 490 506 486 1478 508 1483 513 508 485 511 482 1482 514 508 485 1480 516 1473 513 508 485 511 482 1483 513 1477 509 512 491 1473 513 50735 1008 1480 516 479 514 508 485 1480 516 1474 512 509 484 486 517 1472 514 508 485 1480 516 1474 512 509 484 512 481 1482 514 1477 509 512 491 1472 514 50738 1006 1509 487 508 485 486 507 1509 487 1503 483 513 490 505 488 1502 484 512 491 1473 513 1503 483 512 491 505 488 1476 510 1507 489 506 487 1503 483
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/Speakers/Craig/Craig_CHT904.ir b/Speakers/Craig/Craig_CHT904.ir
index f1ac6472..f788c624 100644
--- a/Speakers/Craig/Craig_CHT904.ir
+++ b/Speakers/Craig/Craig_CHT904.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Craig Electronics Speaker CHT904
 #  
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: NEC
 address: 20 00 00 00
@@ -15,7 +15,7 @@ protocol: NEC
 address: 20 00 00 00
 command: 0E 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 20 00 00 00
diff --git a/Speakers/Craig/Craig_CHT912.ir b/Speakers/Craig/Craig_CHT912.ir
index a475d7ef..eb66fb1c 100644
--- a/Speakers/Craig/Craig_CHT912.ir
+++ b/Speakers/Craig/Craig_CHT912.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Craig Electronics Speaker CHT912
 # 
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: NEC
 address: 20 00 00 00
@@ -15,7 +15,7 @@ protocol: NEC
 address: 20 00 00 00
 command: 02 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 20 00 00 00
diff --git a/Speakers/Craig/Craig_CHT921.ir b/Speakers/Craig/Craig_CHT921.ir
index c6f986ef..40a187b6 100644
--- a/Speakers/Craig/Craig_CHT921.ir
+++ b/Speakers/Craig/Craig_CHT921.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Craig Electronics Speaker CHT921
 # 
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -15,13 +15,13 @@ protocol: NEC
 address: 00 00 00 00
 command: 03 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 01 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Speakers/Craig/Craig_CHT939.ir b/Speakers/Craig/Craig_CHT939.ir
index 38b550a6..256445e3 100644
--- a/Speakers/Craig/Craig_CHT939.ir
+++ b/Speakers/Craig/Craig_CHT939.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Craig Electronics Speaker CHT939
 # 
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: NEC
 address: 00 00 00 00
@@ -15,7 +15,7 @@ protocol: NEC
 address: 00 00 00 00
 command: 1F 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Speakers/Edifier/Edifier_R1280DB.ir b/Speakers/Edifier/Edifier_R1280DB.ir
index 3766a770..0827a87b 100644
--- a/Speakers/Edifier/Edifier_R1280DB.ir
+++ b/Speakers/Edifier/Edifier_R1280DB.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # Edifier R1280DB Speaker
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 E7 00 00
 command: 01 FE 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 E7 00 00
diff --git a/Speakers/Edifier/Edifier_R1280T.ir b/Speakers/Edifier/Edifier_R1280T.ir
index 46ecbad9..4062ddee 100644
--- a/Speakers/Edifier/Edifier_R1280T.ir
+++ b/Speakers/Edifier/Edifier_R1280T.ir
@@ -15,7 +15,7 @@ protocol: NECext
 address: 10 E7 00 00
 command: 3C C3 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 E7 00 00
diff --git a/Speakers/Edifier/Edifier_Speakers_RC31A.ir b/Speakers/Edifier/Edifier_Speakers_RC31A.ir
index 67a06e6a..33dc58a8 100644
--- a/Speakers/Edifier/Edifier_Speakers_RC31A.ir
+++ b/Speakers/Edifier/Edifier_Speakers_RC31A.ir
@@ -22,7 +22,7 @@ protocol: NECext
 address: 78 0E 00 00
 command: 00 FF 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 78 0E 00 00
diff --git a/Speakers/JBL/JBL_LSR4326P.ir b/Speakers/JBL/JBL_LSR4326P.ir
index f4b3df6e..83a16a3e 100644
--- a/Speakers/JBL/JBL_LSR4326P.ir
+++ b/Speakers/JBL/JBL_LSR4326P.ir
@@ -3,25 +3,25 @@ Version: 1
 # 
 # JBL Speakers LSR4326P
 #
-name: Power_Toggle
+name: POWER_Toggle
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 14 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 00 00 00 00
 command: 08 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 00 00 00 00
diff --git a/Speakers/JBL/JBL_On_Stage_IIIP_Speaker.ir b/Speakers/JBL/JBL_On_Stage_IIIP_Speaker.ir
index b71c2510..df052c40 100644
--- a/Speakers/JBL/JBL_On_Stage_IIIP_Speaker.ir
+++ b/Speakers/JBL/JBL_On_Stage_IIIP_Speaker.ir
@@ -15,7 +15,7 @@ protocol: NECext
 address: 40 AF 00 00
 command: 01 FE 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
diff --git a/Speakers/JVC/JVC_D62BM.ir b/Speakers/JVC/JVC_D62BM.ir
index 6d806c45..14ef7481 100644
--- a/Speakers/JVC/JVC_D62BM.ir
+++ b/Speakers/JVC/JVC_D62BM.ir
@@ -4,7 +4,7 @@ Version: 1
 
 # 
 
-name: Power
+name: POWER
 
 type: parsed
 
@@ -16,7 +16,7 @@ command: 53 AC 00 00
 
 # 
 
-name: Mute
+name: MUTE
 
 type: parsed
 
@@ -28,7 +28,7 @@ command: AD 52 00 00
 
 # 
 
-name: Vol_up
+name: VOL+
 
 type: parsed
 
@@ -40,7 +40,7 @@ command: 26 D9 00 00
 
 # 
 
-name: Vol_down
+name: VOL-
 
 type: parsed
 
diff --git a/Speakers/Sony/Sony_Amp_STR-DE875 b/Speakers/Sony/Sony_Amp_STR-DE875
index 9050f7a4..088522c3 100644
--- a/Speakers/Sony/Sony_Amp_STR-DE875
+++ b/Speakers/Sony/Sony_Amp_STR-DE875
@@ -3,31 +3,31 @@ Version: 1
 # 
 # Sony Amp STR-DE875
 #
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: SIRC
 address: 10 00 00 00
 command: 15 00 00 00
 # 
-name: Power_On
+name: POWER_On
 type: parsed
 protocol: SIRC
 address: 10 00 00 00
 command: 2E 00 00 00
 # 
-name: Power_Off
+name: POWER_Off
 type: parsed
 protocol: SIRC
 address: 10 00 00 00
 command: 2F 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 10 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 10 00 00 00
diff --git a/Speakers/Steljes/Steljes_Desktop_Speakers.ir b/Speakers/Steljes/Steljes_Desktop_Speakers.ir
index 9c415579..723402c6 100644
--- a/Speakers/Steljes/Steljes_Desktop_Speakers.ir
+++ b/Speakers/Steljes/Steljes_Desktop_Speakers.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Steljes Desktop Speakers
 #
-name: On_off
+name: POWER
 type: parsed
 protocol: NECext
 address: 85 23 00 00
@@ -21,7 +21,7 @@ protocol: NECext
 address: 85 23 00 00
 command: 47 B8 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 85 23 00 00
diff --git a/Speakers/creative/z5400.ir b/Speakers/creative/z5400.ir
index 67ad0bc4..d2fe4057 100644
--- a/Speakers/creative/z5400.ir
+++ b/Speakers/creative/z5400.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On_Off
+name: POWER
 type: parsed
 protocol: NEC
 address: 08 00 00 00
 command: 10 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 08 00 00 00
 command: 1A 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 08 00 00 00
 command: 0E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 08 00 00 00
diff --git a/Streaming_Devices/Roku/Jet_AFS-1000b.ir b/Streaming_Devices/Roku/Jet_AFS-1000b.ir
index 45735b9b..6bc840f0 100644
--- a/Streaming_Devices/Roku/Jet_AFS-1000b.ir
+++ b/Streaming_Devices/Roku/Jet_AFS-1000b.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On_off
+name: POWER
 type: parsed
 protocol: NEC
 address: 01 00 00 00
diff --git a/Streaming_Devices/Roku/Roku.ir b/Streaming_Devices/Roku/Roku.ir
index 3634b105..a690cbf0 100644
--- a/Streaming_Devices/Roku/Roku.ir
+++ b/Streaming_Devices/Roku/Roku.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 15 EA 00 00
 # 
-name: V_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
diff --git a/Streaming_Devices/Roku/Roku3.ir b/Streaming_Devices/Roku/Roku3.ir
index c8a037f1..098a7180 100644
--- a/Streaming_Devices/Roku/Roku3.ir
+++ b/Streaming_Devices/Roku/Roku3.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Roku
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: EA C7 00 00
@@ -21,19 +21,19 @@ protocol: NECext
 address: EA C7 00 00
 command: 66 99 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 0F F0 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 10 EF 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: EA C7 00 00
diff --git a/Streaming_Devices/Roku/Roku_Alternate.ir b/Streaming_Devices/Roku/Roku_Alternate.ir
index ee283ad9..88731c2d 100644
--- a/Streaming_Devices/Roku/Roku_Alternate.ir
+++ b/Streaming_Devices/Roku/Roku_Alternate.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: EA C7 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: EA C7 00 00
 command: 66 99 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 0F F0 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 10 EF 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: EA C7 00 00
diff --git a/TVs/Apex/APEX_LE4643T.ir b/TVs/Apex/APEX_LE4643T.ir
index a5fb9f95..0c9b8b83 100644
--- a/TVs/Apex/APEX_LE4643T.ir
+++ b/TVs/Apex/APEX_LE4643T.ir
@@ -63,7 +63,7 @@ protocol: NECext
 address: 00 7F 00 00
 command: 1A E5 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/TVs/Bauhn/Bauhn_tv.ir b/TVs/Bauhn/Bauhn_tv.ir
index 1f68dfef..3af53633 100644
--- a/TVs/Bauhn/Bauhn_tv.ir
+++ b/TVs/Bauhn/Bauhn_tv.ir
@@ -4,7 +4,7 @@ Version: 1
 # Bauhn TV
 # https://bauhn.com.au/
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 72 00 00
@@ -16,31 +16,31 @@ protocol: NECext
 address: 01 72 00 00
 command: 07 F8 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 01 72 00 00
 command: 48 B7 00 00
 # 
-name: Channel_down
+name: CH-
 type: parsed
 protocol: NECext
 address: 01 72 00 00
 command: 44 BB 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 72 00 00
 command: 0A F5 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 72 00 00
 command: 06 F9 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 72 00 00
diff --git a/TVs/Denver/Denver_LED-3271.ir b/TVs/Denver/Denver_LED-3271.ir
index 991d04fe..675c7b57 100644
--- a/TVs/Denver/Denver_LED-3271.ir
+++ b/TVs/Denver/Denver_LED-3271.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0A F5 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 00 7F 00 00
 command: 10 EF 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1E E1 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 00 7F 00 00
 command: 11 EE 00 00
 # 
-name: CH_Up
+name: CH+
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/TVs/Dynex/Dynex_DX-RC01A-12.ir b/TVs/Dynex/Dynex_DX-RC01A-12.ir
index 74f899f7..bc459ddc 100644
--- a/TVs/Dynex/Dynex_DX-RC01A-12.ir
+++ b/TVs/Dynex/Dynex_DX-RC01A-12.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 1D E2 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 0D F2 00 00
 # 
-name: Ch_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 0B F4 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 05 00 00
diff --git a/TVs/Dynex/Dynex_EN21669D.ir b/TVs/Dynex/Dynex_EN21669D.ir
index 9917d5f1..12dff208 100644
--- a/TVs/Dynex/Dynex_EN21669D.ir
+++ b/TVs/Dynex/Dynex_EN21669D.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Dynex EN-21669D TV
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -15,7 +15,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 1D E2 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -165,19 +165,19 @@ protocol: NECext
 address: 86 05 00 00
 command: 18 E7 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0C F3 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0D F2 00 00
 # 
-name: Ch_Up
+name: CH+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
diff --git a/TVs/Element/Element_100-Series_TV.ir b/TVs/Element/Element_100-Series_TV.ir
index 88bef91f..bcf77088 100644
--- a/TVs/Element/Element_100-Series_TV.ir
+++ b/TVs/Element/Element_100-Series_TV.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # Element 100 series TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 46 B9 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
@@ -75,25 +75,25 @@ protocol: NECext
 address: 02 7D 00 00
 command: 4F B0 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 0F F0 00 00
 # 
-name: Channel_down
+name: CH-
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 5A A5 00 00
 # 
-name: Volume_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 0C F3 00 00
 # 
-name: Volume_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
diff --git a/TVs/Element/Element_FullRemote.ir b/TVs/Element/Element_FullRemote.ir
index abb8bd70..1058bf08 100644
--- a/TVs/Element/Element_FullRemote.ir
+++ b/TVs/Element/Element_FullRemote.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 46 B9 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 02 7D 00 00
 command: 55 AA 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 0C F3 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 19 E6 00 00
 # 
-name: Ch_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
diff --git a/TVs/Element/Element_TV.ir b/TVs/Element/Element_TV.ir
index 24829eb4..9c96df68 100644
--- a/TVs/Element/Element_TV.ir
+++ b/TVs/Element/Element_TV.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 02 7D 00 00
 command: 5A A5 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
diff --git a/TVs/Emerson/Emerson_32FNT004.ir b/TVs/Emerson/Emerson_32FNT004.ir
index cb9864a4..eb3a20fc 100644
--- a/TVs/Emerson/Emerson_32FNT004.ir
+++ b/TVs/Emerson/Emerson_32FNT004.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Emerson TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
@@ -15,7 +15,7 @@ protocol: NECext
 address: 84 E0 00 00
 command: 40 BF 00 00
 # 
-name: Ch_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
@@ -27,19 +27,19 @@ protocol: NECext
 address: 84 E0 00 00
 command: 51 AE 00 00
 # 
-name: Vol_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 60 9F 00 00
 # 
-name: Vol_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 61 9E 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
diff --git a/TVs/Enseo/Enseo.ir b/TVs/Enseo/Enseo.ir
index 59d1dfb3..82dcfee8 100644
--- a/TVs/Enseo/Enseo.ir
+++ b/TVs/Enseo/Enseo.ir
@@ -4,19 +4,19 @@ Filetype: IR signals file
 #
 Version: 1
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 6E 00 00 00
@@ -28,13 +28,13 @@ protocol: NEC
 address: 6E 00 00 00
 command: 37 00 00 00
 #
-name: Channel_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: Channel_down
+name: CH-
 type: parsed
 protocol: NEC
 address: 6E 00 00 00
@@ -64,7 +64,7 @@ protocol: NEC
 address: 6E 00 00 00
 command: 3B 00 00 00
 #
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 6E 00 00 00
diff --git a/TVs/Fetch/Fetch_TV_Box_AUS.ir b/TVs/Fetch/Fetch_TV_Box_AUS.ir
index 177df4b0..255b1751 100644
--- a/TVs/Fetch/Fetch_TV_Box_AUS.ir
+++ b/TVs/Fetch/Fetch_TV_Box_AUS.ir
@@ -10,19 +10,19 @@ protocol: NECext
 address: 64 46 00 00
 command: E0 1F 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 64 46 00 00
 command: 5D A2 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 40 00 00 00
 command: 10 00 00 00
 # 
-name: Ch_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 64 46 00 00
diff --git a/TVs/Ffalcon/Ffalcon_SF1_Smart_TV.ir b/TVs/Ffalcon/Ffalcon_SF1_Smart_TV.ir
index 481403a8..2d102c4b 100644
--- a/TVs/Ffalcon/Ffalcon_SF1_Smart_TV.ir
+++ b/TVs/Ffalcon/Ffalcon_SF1_Smart_TV.ir
@@ -4,13 +4,13 @@ Version: 1
 # Ffalcon SF1 Smart TV
 # https://ffalcon.com.au/products/32sf1-series-hd-smart-tv/
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4000 4000 500 2000 500 2000 500 2000 500 2000 500 1000 500 1000 500 2000 500 1000 500 2000 500 1000 500 2000 500 1000 500 1000 500 1000 500 1000 500 1000 500 2000 500 2000 500 1000 500 2000 500 1000 500 2000 500 1000 500 2000 500 8500 4000 4000 500
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -76,25 +76,25 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4000 4000 500 2000 500 2000 500 2000 500 2000 500 1000 500 1000 500 2000 500 2000 500 1000 500 1000 500 1000 500 1000 500 1000 500 1000 500 1000 500 1000 500 2000 500 2000 500 1000 500 1000 500 2000 500 2000 500 2000 500 2000 500 8500 4000 4000 500
 #
-name: Vol_Up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4000 4000 500 2000 500 2000 500 2000 500 2000 500 1000 500 1000 500 2000 500 1000 500 2000 500 2000 500 2000 500 2000 500 1000 500 1000 500 1000 500 1000 500 2000 500 2000 500 1000 500 2000 500 1000 500 1000 500 1000 500 1000 500 8500 4000 4000 500
 #
-name: Vol_Down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4000 4000 500 2000 500 2000 500 2000 500 2000 500 1000 500 1000 500 2000 500 1000 500 2000 500 2000 500 2000 500 1000 500 1000 500 1000 500 1000 500 1000 500 2000 500 2000 500 1000 500 2000 500 1000 500 1000 500 1000 500 2000 500 8500 4000 4000 500
 #
-name: Prog_Up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4000 4000 500 2000 500 2000 500 2000 500 2000 500 1000 500 1000 500 2000 500 1000 500 2000 500 2000 500 1000 500 2000 500 1000 500 1000 500 1000 500 1000 500 2000 500 2000 500 1000 500 2000 500 1000 500 1000 500 2000 500 1000 500 8500 4000 4000 500
 #
-name: Prog_Down
+name: CH-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/Hisense/Hisense_55K3201GUWUS.ir b/TVs/Hisense/Hisense_55K3201GUWUS.ir
index ce117d0e..25a87766 100644
--- a/TVs/Hisense/Hisense_55K3201GUWUS.ir
+++ b/TVs/Hisense/Hisense_55K3201GUWUS.ir
@@ -3,25 +3,25 @@ Version: 1
 # 
 # Hisense 55K3201GUWUS
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 08 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 02 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 03 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -33,7 +33,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 0B 00 00 00
 # 
-name: CH_Up
+name: CH+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/Hisense/Hisense_RokuTV.ir b/TVs/Hisense/Hisense_RokuTV.ir
index 670e8086..9b424fa6 100644
--- a/TVs/Hisense/Hisense_RokuTV.ir
+++ b/TVs/Hisense/Hisense_RokuTV.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 15 EA 00 00
 # 
-name: V_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 14 EB 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/Hitachi/Hitachi_LE46H508.ir b/TVs/Hitachi/Hitachi_LE46H508.ir
index f5f559ac..5ccf2f8a 100644
--- a/TVs/Hitachi/Hitachi_LE46H508.ir
+++ b/TVs/Hitachi/Hitachi_LE46H508.ir
@@ -3,7 +3,7 @@ Version: 1
 #
 # Hitachi LE46H508 TV
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 50 00 00 00
@@ -141,25 +141,25 @@ protocol: NEC
 address: 50 00 00 00
 command: 7E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 50 00 00 00
 command: 0B 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 50 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 50 00 00 00
 command: 15 00 00 00
 # 
-name: CH_Up
+name: CH+
 type: parsed
 protocol: NEC
 address: 50 00 00 00
diff --git a/TVs/Insignia/Insignia.ir b/TVs/Insignia/Insignia.ir
index b586c376..b72700f0 100644
--- a/TVs/Insignia/Insignia.ir
+++ b/TVs/Insignia/Insignia.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Insignia TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -15,7 +15,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 1D E2 00 00
 # 
-name: Ch_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -27,19 +27,19 @@ protocol: NECext
 address: 86 05 00 00
 command: 0B F4 00 00
 # 
-name: Vol_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0C F3 00 00
 # 
-name: Vol_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0D F2 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 05 00 00
diff --git a/TVs/LG/LG_43NANO779PA.ir b/TVs/LG/LG_43NANO779PA.ir
index b877637b..7cad0b0a 100644
--- a/TVs/LG/LG_43NANO779PA.ir
+++ b/TVs/LG/LG_43NANO779PA.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On_Off
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -79,25 +79,25 @@ protocol: NEC
 address: 04 00 00 00
 command: 09 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 02 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 03 00 00 00
 # 
-name: Prog_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 00 00 00 00
 # 
-name: Prog_down
+name: CH-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/LG/LG_48LV340H.ir b/TVs/LG/LG_48LV340H.ir
index 96d044e0..2b688f69 100644
--- a/TVs/LG/LG_48LV340H.ir
+++ b/TVs/LG/LG_48LV340H.ir
@@ -3,7 +3,7 @@ Version: 1
 #
 # LG TV 48LV340H
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/LG/LG_4K_TV.ir b/TVs/LG/LG_4K_TV.ir
index a2ba8eb6..b97c8c63 100644
--- a/TVs/LG/LG_4K_TV.ir
+++ b/TVs/LG/LG_4K_TV.ir
@@ -9,19 +9,19 @@ protocol: NEC
 address: 04 00 00 00
 command: 08 00 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 08 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 02 00 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/LG/LG_55UN7300AUD.ir b/TVs/LG/LG_55UN7300AUD.ir
index 75e9d800..84ce839a 100644
--- a/TVs/LG/LG_55UN7300AUD.ir
+++ b/TVs/LG/LG_55UN7300AUD.ir
@@ -3,19 +3,19 @@ Version: 1
 # 
 # LG 55UN7300AUD TV
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 08 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 09 00 00 00
 # 
-name: VolumeDown
+name: VOL-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/LG/LG_AKB75095307.ir b/TVs/LG/LG_AKB75095307.ir
index cb4e182f..c37f069f 100644
--- a/TVs/LG/LG_AKB75095307.ir
+++ b/TVs/LG/LG_AKB75095307.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 08 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 02 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 03 00 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 00 00 00 00
 # 
-name: Channel_down
+name: CH-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 01 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/LG/LG_C1.ir b/TVs/LG/LG_C1.ir
index ce171c66..5b3b6f0b 100644
--- a/TVs/LG/LG_C1.ir
+++ b/TVs/LG/LG_C1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 08 00 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -19,7 +19,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 01 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/LG/LG_TV_42LF5800.ir b/TVs/LG/LG_TV_42LF5800.ir
index f4afb729..d2b1a027 100644
--- a/TVs/LG/LG_TV_42LF5800.ir
+++ b/TVs/LG/LG_TV_42LF5800.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # LG 42LF5800 (Smart LED TV)
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 08 00 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -21,7 +21,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 01 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/LG/Lg_c9_magic_remote.ir b/TVs/LG/Lg_c9_magic_remote.ir
index 669c17a8..10202bdf 100644
--- a/TVs/LG/Lg_c9_magic_remote.ir
+++ b/TVs/LG/Lg_c9_magic_remote.ir
@@ -2,9 +2,9 @@ Filetype: IR signals file
 Version: 1
 # 
 # LG magic remote for the LG C9
-# receiver on/off, voice control, scrolling and gyro do not use IR, and so are not in this file
+# receiver POWER, voice control, scrolling and gyro do not use IR, and so are not in this file
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -76,31 +76,31 @@ protocol: NEC
 address: 04 00 00 00
 command: 10 00 00 00
 # 
-name: Volume_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 02 00 00 00
 # 
-name: Volume_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 03 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 09 00 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 00 00 00 00
 # 
-name: Channel_down
+name: CH-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/LodgeNet/lodgenet_lrc3220.ir b/TVs/LodgeNet/lodgenet_lrc3220.ir
index a40cd006..a940d98d 100644
--- a/TVs/LodgeNet/lodgenet_lrc3220.ir
+++ b/TVs/LodgeNet/lodgenet_lrc3220.ir
@@ -4,7 +4,7 @@ Version: 1
 # Standard remote for hotel rooms
 # Lodgenet LRC3220
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 85 7C 00 00
@@ -70,7 +70,7 @@ protocol: NECext
 address: 85 7C 00 00
 command: 9A 65 00 00
 # 
-name: Ch_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 85 7C 00 00
@@ -82,7 +82,7 @@ protocol: NECext
 address: 85 7C 00 00
 command: 91 6E 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 85 7C 00 00
diff --git a/TVs/Matsui/Matsui_1435b.ir b/TVs/Matsui/Matsui_1435b.ir
index 0763d551..a61e9a51 100644
--- a/TVs/Matsui/Matsui_1435b.ir
+++ b/TVs/Matsui/Matsui_1435b.ir
@@ -81,13 +81,13 @@ protocol: Samsung32
 address: 17 00 00 00
 command: 09 00 00 00
 # 
-name: Channel_down
+name: CH-
 type: parsed
 protocol: Samsung32
 address: 17 00 00 00
 command: 11 00 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: Samsung32
 address: 17 00 00 00
@@ -111,13 +111,13 @@ protocol: Samsung32
 address: 17 00 00 00
 command: 1F 00 00 00
 # 
-name: Volume_down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 17 00 00 00
 command: 13 00 00 00
 # 
-name: Volume_up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 17 00 00 00
@@ -135,7 +135,7 @@ protocol: Samsung32
 address: 17 00 00 00
 command: 0E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 17 00 00 00
diff --git a/TVs/NEC/NEC.ir b/TVs/NEC/NEC.ir
index 2b8e86e3..1e955a80 100644
--- a/TVs/NEC/NEC.ir
+++ b/TVs/NEC/NEC.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -13,25 +13,25 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 8065 4004 517 509 499 502 495 1505 501 500 497 1502 493 1507 498 1476 519 1482 523 3984 526 499 498 1502 493 1507 498 1477 518 507 501 500 497 1503 492 509 499 17804 8064 4004 516 510 498 503 494 1505 500 501 496 1503 492 1508 497 1503 492 1484 521 3986 524 501 496 1503 492 1508 497 1503 492 509 499 502 495 1505 500 502 495 17808 8071 3999 522 504 493 507 501 1500 495 506 491 1508 497 1502 493 1507 498 1503 492 3991 519 506 491 1508 497 1503 492 1508 497 504 493 507 501 1499 496 506 491 17814 8065 4006 525 500 497 504 493 1507 498 502 495 1504 491 1509 496 1504 491 1510 496 3987 523 502 495 1504 502 1499 496 1504 501 500 497 503 494 1506 499 502 495 17807 8072 3997 524 502 495 505 492 1508 497 503 494 1505 501 1499 496 1479 516 1485 520 3987 523 501 496 1504 491 1509 496 1479 516 510 498 503 494 1505 500 502 495 17806 8073 3996 525 501 496 505 492 1507 498 503 494 1505 500 1499 496 1479 516 1485 520 3987 523 502 495 1504 501 1499 496 1479 516 510 498 503 494 1506 499 502 495
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 8069 3998 522 503 494 506 491 1509 496 505 492 1507 498 1501 494 1506 499 1502 493 3989 521 1503 492 1508 497 1503 492 508 500 1501 494 506 491 510 498 504 493 17810 8067 4003 517 508 500 501 496 1504 491 510 498 1502 493 1507 498 1501 494 1508 497 3984 526 1474 521 1504 501 1500 495 505 492 1509 496 505 492 508 500 502 495 17809 8069 4000 520 506 491 509 499 1501 494 507 501 1499 496 1503 492 1508 497 1504 491 3991 519 1480 525 1500 495 1505 500 500 497 1503 492 509 499 503 494 507 490 17809 8069 3999 521 505 492 508 500 1500 495 506 491 1508 497 1502 493 1507 498 1503 492 3990 520 1504 491 1509 496 1504 491 509 499 1501 494 507 501 501 496 505 492 17808 8070 3998 523 503 494 506 491 1509 496 504 493 1507 498 1501 494 1506 499 1502 493 3988 522 1502 493 1507 498 1502 493 507 501 1500 495 505 492 509 499 502 495
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 8066 4002 519 507 501 500 497 1503 492 508 500 1500 495 1480 525 1475 520 1506 499 3983 517 508 500 1500 495 1481 524 501 496 1504 491 510 498 503 494 507 501 18803 8073 3997 524 503 494 506 491 1483 522 504 493 1506 499 1476 519 1482 523 1478 517 3989 521 504 493 1482 523 1478 517 508 500 1476 519 507 501 500 497 505 492 18809 8066 4003 517 508 500 501 496 1503 492 509 499 1501 494 1480 525 1475 520 1481 524 3983 516 509 499 1501 494 1482 523 502 495 1505 500 500 497 504 493 508 500
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 8069 4000 520 480 517 508 500 1500 495 505 492 1508 497 1502 493 1506 499 1502 493 3989 521 1503 492 1509 496 503 494 1506 499 1501 494 506 491 510 498 504 493 17807 8072 3997 524 501 496 505 492 1508 497 502 495 1505 500 1499 496 1504 491 1510 495 3986 524 1500 495 1506 499 500 497 1503 492 1508 497 503 494 507 501 501 496 17804 8064 4004 517 509 499 501 496 1504 491 509 499 1500 495 1505 500 1499 496 1505 500 3980 520 1505 500 1500 495 505 492 1508 497 1502 493 508 500 501 496 505 492 17807 8072 3995 526 500 497 503 494 1506 499 501 496 1504 491 1508 497 1503 492 1509 496 3985 515 1509 496 1503 492 508 500 1500 495 1506 499 501 496 505 492 509 499 17803 8065 4003 518 508 500 501 496 1504 491 509 499 1502 493 1507 498 1502 493 1508 497 3985 525 1500 495 1505 500 500 497 1503 492 1508 497 504 493 508 500 501 496
 # 
-name: Ch_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/Nevir/NEVIR_NVR-7409-39HD-N.ir b/TVs/Nevir/NEVIR_NVR-7409-39HD-N.ir
index 5b296e28..44108c8f 100644
--- a/TVs/Nevir/NEVIR_NVR-7409-39HD-N.ir
+++ b/TVs/Nevir/NEVIR_NVR-7409-39HD-N.ir
@@ -165,7 +165,7 @@ protocol: NEC
 address: 01 00 00 00
 command: 41 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 01 00 00 00
diff --git a/TVs/Onn/Onn_Roku_TV.ir b/TVs/Onn/Onn_Roku_TV.ir
index b39c4e94..43f14848 100644
--- a/TVs/Onn/Onn_Roku_TV.ir
+++ b/TVs/Onn/Onn_Roku_TV.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: EA C7 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: EA C7 00 00
 command: 10 EF 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: EA C7 00 00
diff --git a/TVs/Panasonic/Panasonic_TC-P50S2.ir b/TVs/Panasonic/Panasonic_TC-P50S2.ir
index d3bd431e..e203a5e2 100644
--- a/TVs/Panasonic/Panasonic_TC-P50S2.ir
+++ b/TVs/Panasonic/Panasonic_TC-P50S2.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -115,19 +115,19 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 3476 1737 445 455 424 1295 443 457 422 451 418 455 424 449 420 454 415 458 421 452 417 456 423 450 419 454 425 448 421 1298 450 450 419 454 425 448 421 452 417 457 422 451 418 455 424 449 420 453 416 1303 445 455 424 449 420 453 416 457 422 451 418 456 423 449 420 454 415 458 421 1324 424 449 420 454 415 1331 417 1301 447 1299 449 452 417 456 423 1323 425 448 421 453 416 1330 418 1300 448 1326 422 1296 452
 # 
-name: Vol_Up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 3474 1765 418 455 424 1323 415 458 421 451 418 456 423 422 447 454 415 458 421 452 417 456 423 450 419 454 425 448 421 1325 423 423 446 454 425 448 421 452 417 456 423 450 419 454 425 448 421 452 417 1330 418 455 424 448 421 453 416 457 422 451 418 455 424 449 420 453 416 457 422 451 418 455 424 449 420 453 416 1331 417 455 424 449 420 453 416 458 421 452 417 456 423 450 419 1327 421 424 445 1329 419
 # 
-name: Vol_Down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 3475 1737 446 427 452 1294 444 456 423 423 446 454 425 421 448 452 417 456 423 423 446 455 424 449 420 425 444 457 422 1297 451 421 448 453 416 457 422 451 418 428 451 449 420 426 443 457 422 424 445 1301 447 426 443 458 421 451 418 456 423 449 420 454 415 458 421 452 417 1302 446 427 452 448 421 452 417 456 423 1296 452 448 421 453 416 1303 445 455 424 449 420 453 416 430 449 1297 451 421 448 1299 449
 # 
-name: Ch_Up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -139,7 +139,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 3480 1759 424 450 419 1300 448 452 417 456 423 450 419 454 425 448 421 452 417 457 422 451 418 455 424 449 420 453 416 1331 417 455 424 449 420 454 415 458 421 452 417 456 423 450 419 454 425 448 421 1325 423 450 419 455 424 448 421 453 416 457 422 451 418 455 424 449 420 1326 422 424 445 1329 419 426 443 1331 417 1302 446 454 425 420 449 1298 450 450 419 1328 420 452 417 1330 418 1301 447 425 444 1330 418
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/Philips/Philips_32PFL4208T.ir b/TVs/Philips/Philips_32PFL4208T.ir
index 3df91616..151523dc 100644
--- a/TVs/Philips/Philips_32PFL4208T.ir
+++ b/TVs/Philips/Philips_32PFL4208T.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: RC6
 address: 00 00 00 00
@@ -157,19 +157,19 @@ protocol: RC6
 address: 00 00 00 00
 command: 41 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: RC6
 address: 00 00 00 00
 command: 10 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: RC6
 address: 00 00 00 00
 command: 11 00 00 00
 # 
-name: Ch_Up
+name: CH+
 type: parsed
 protocol: RC6
 address: 00 00 00 00
@@ -205,7 +205,7 @@ protocol: RC6
 address: 00 00 00 00
 command: 5B 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: RC6
 address: 00 00 00 00
diff --git a/TVs/Philips/Philips_TV_14PV172_08.ir b/TVs/Philips/Philips_TV_14PV172_08.ir
index 1f2c0582..41641195 100644
--- a/TVs/Philips/Philips_TV_14PV172_08.ir
+++ b/TVs/Philips/Philips_TV_14PV172_08.ir
@@ -4,31 +4,31 @@ Version: 1
 # Philips 14PV172/08 CRT TV with VCR
 # To enter the service menu hold STOP on remote and PLAY on the tv for 5 seconds
 #
-name: Power
+name: POWER
 type: parsed
 protocol: RC5
 address: 00 00 00 00
 command: 0C 00 00 00
 # 
-name: Prog_up
+name: CH+
 type: parsed
 protocol: RC5X
 address: 00 00 00 00
 command: 10 00 00 00
 # 
-name: Prog_down
+name: CH-
 type: parsed
 protocol: RC5X
 address: 00 00 00 00
 command: 11 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: RC5X
 address: 00 00 00 00
 command: 16 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: RC5X
 address: 00 00 00 00
@@ -46,7 +46,7 @@ protocol: RC5
 address: 05 00 00 00
 command: 36 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: RC5
 address: 00 00 00 00
diff --git a/TVs/Philips/Philips_TV_Universal.ir b/TVs/Philips/Philips_TV_Universal.ir
index 822b6314..bc238122 100644
--- a/TVs/Philips/Philips_TV_Universal.ir
+++ b/TVs/Philips/Philips_TV_Universal.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Universal Philips TV Remote
 #
-name: Power
+name: POWER
 type: parsed
 protocol: RC6
 address: 00 00 00 00
@@ -177,25 +177,25 @@ protocol: RC6
 address: 00 00 00 00
 command: 76 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: RC6
 address: 00 00 00 00
 command: 0D 00 00 00
 # 
-name: Vol_UP
+name: VOL+
 type: parsed
 protocol: RC6
 address: 00 00 00 00
 command: 10 00 00 00
 # 
-name: Vol_DOWN
+name: VOL-
 type: parsed
 protocol: RC6
 address: 00 00 00 00
 command: 11 00 00 00
 # 
-name: CH_UP
+name: CH+
 type: parsed
 protocol: RC6
 address: 00 00 00 00
diff --git a/TVs/RCA/RCA_P46731AT_TV.ir b/TVs/RCA/RCA_P46731AT_TV.ir
index 6568e730..3f9cb875 100644
--- a/TVs/RCA/RCA_P46731AT_TV.ir
+++ b/TVs/RCA/RCA_P46731AT_TV.ir
@@ -10,7 +10,7 @@ duty_cycle: 0.330000
 data: 174 7834 176 2330 179 2325 174 2332 177 2327 182 2304 174 1334 182 2324 175 1331 174 1334 182 1305 179 2326 183 2322 177 1330 175 1312 183 1325 180 1326 179 1308 176 2330 179 1327 178 2327 182 2323 176 2329 180 1308 176 1331 175 8340 183 7826 174 2331 178 2327 182 2303 175 2332 177 2328 181 1325 180 2325 174 1313 182 1326 179 1327 178 2327 182 2323 176 1313 182 1324 181 1326 179 1308 177 1331 174 2331 178 1328 177 2328 181 2305 173 2334 175 1331 174 1332 173 8323 179 7848 183 2303 175 2332 178 2328 181 2323 176 2330 179 1327 178 2307 181 1327 178 1328 177 1329 176 2310 178 2328 181 1325 180 1326 179 1308 177 1332 173 1333 183 2322 177 1311 173 2333 176 2329 180 2325 174 1332 173 1315 180
 # 
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -46,7 +46,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 182 7824 176 2328 181 2323 176 2328 181 2324 175 1312 183 1323 182 2322 177 1330 175 2309 179 2325 174 1332 173 1333 183 1305 179 1327 178 1328 177 1328 177 2308 180 262 177 1885 175 295 175 861 174 2330 179 99 313 911 573 915 590 1916 180 64 349 1910 176 265 174 7896 177 3081 835 3912 182 2322 177 207 179 1942 180 2304 174 268 181 1881 179 263 176 889 177 264 175 886 583 1925 182 271 178 855 180 240 178 1907 174 2331 178 1327 178 1309 176 1329 590 916 589 919 173 306 175 833 181 317 174 1832 175 2329 180 1325 180 309 182 1833 174 1313 182 1325 180 289 181 1853 175 2329 180 8313 178 7845 176 2309 179 2325 174 2331 178 2326 173 1333 183 1304 180 2324 175 1332 173 2330 179 2325 174 1314 181 1325 180 1326 179 1327 178 1308 177 1330 175 2329 180 2324 175 1312 183 2322 177 1329 176 1329 176 2329 180 2304 174 8339 173 351 3575 3902 594 1911 588 1916 593 1911 588 1916 583 904 591 916 589 1915 594 911 584 1920 579 1907 592 915 590 915 591 916 579 908 597 909 596 909 586 1919 580 1907 179 1326 592 1912 597 908 587 901 594 1911 588 1916 593
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/RCA/RCA_TV.ir b/TVs/RCA/RCA_TV.ir
index 768e9953..1da2858f 100644
--- a/TVs/RCA/RCA_TV.ir
+++ b/TVs/RCA/RCA_TV.ir
@@ -67,25 +67,25 @@ protocol: RCA
 address: 0F 00 00 00
 command: 2A 00 00 00
 #
-name: CHANNEL_DOWN
+name: CH-
 type: parsed
 protocol: RCA
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: CHANNEL_UP
+name: CH+
 type: parsed
 protocol: RCA
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: VOLUME_DOWN
+name: VOL-
 type: parsed
 protocol: RCA
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_UP
+name: VOL+
 type: parsed
 protocol: RCA
 address: 0F 00 00 00
diff --git a/TVs/RCA/RCA_TV_2.ir b/TVs/RCA/RCA_TV_2.ir
index b8888abd..80236c06 100644
--- a/TVs/RCA/RCA_TV_2.ir
+++ b/TVs/RCA/RCA_TV_2.ir
@@ -3,13 +3,13 @@ Version: 1
 # 
 # RCA TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: A0 00 00 00
 command: 5F 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: A0 00 00 00
@@ -39,13 +39,13 @@ protocol: NEC
 address: A0 00 00 00
 command: 14 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: A0 00 00 00
 command: 40 00 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: NEC
 address: A0 00 00 00
@@ -75,7 +75,7 @@ protocol: NEC
 address: A0 00 00 00
 command: 10 00 00 00
 # 
-name: Chan_up
+name: CH+
 type: parsed
 protocol: NEC
 address: A0 00 00 00
diff --git a/TVs/Samsung/Samsung.ir b/TVs/Samsung/Samsung.ir
index a69a247e..238813fe 100644
--- a/TVs/Samsung/Samsung.ir
+++ b/TVs/Samsung/Samsung.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -61,19 +61,19 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 2D 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0B 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Samsung/Samsung_BN59.ir b/TVs/Samsung/Samsung_BN59.ir
index 60bd0792..344ca867 100644
--- a/TVs/Samsung/Samsung_BN59.ir
+++ b/TVs/Samsung/Samsung_BN59.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -61,7 +61,7 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 79 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Samsung/Samsung_BN5901178W.ir b/TVs/Samsung/Samsung_BN5901178W.ir
index 69e1af4d..c73d9076 100644
--- a/TVs/Samsung/Samsung_BN5901178W.ir
+++ b/TVs/Samsung/Samsung_BN5901178W.ir
@@ -93,19 +93,19 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 13 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0B 00 00 00
 # 
-name: Ch_Up
+name: CH+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -117,7 +117,7 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 10 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Samsung/Samsung_BN5901301A.ir b/TVs/Samsung/Samsung_BN5901301A.ir
index 072f472a..c2c2fb94 100644
--- a/TVs/Samsung/Samsung_BN5901301A.ir
+++ b/TVs/Samsung/Samsung_BN5901301A.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -13,19 +13,19 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 01 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0B 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -37,7 +37,7 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 6B 00 00 00
 # 
-name: Chan_up
+name: CH+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Samsung/Samsung_E6.ir b/TVs/Samsung/Samsung_E6.ir
index c43e24e5..8514ace1 100644
--- a/TVs/Samsung/Samsung_E6.ir
+++ b/TVs/Samsung/Samsung_E6.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Samsung/Samsung_H6300_TV.ir b/TVs/Samsung/Samsung_H6300_TV.ir
index cf8ce58f..2bae7eca 100644
--- a/TVs/Samsung/Samsung_H6300_TV.ir
+++ b/TVs/Samsung/Samsung_H6300_TV.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Samsung H6300 TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -87,25 +87,25 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 13 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0B 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0F 00 00 00
 # 
-name: CH_Up
+name: CH+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Samsung/Samsung_Smart_Remote.ir b/TVs/Samsung/Samsung_Smart_Remote.ir
index 9569ae30..fd59caa2 100644
--- a/TVs/Samsung/Samsung_Smart_Remote.ir
+++ b/TVs/Samsung/Samsung_Smart_Remote.ir
@@ -4,7 +4,7 @@ Version: 1
 # Samsung Smart Remote used on The Frame TVs
 # Usually the remote connects to the OneConnect via bluetooth, but can also detect IR.
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -52,25 +52,25 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 1222 1189 432 591 434 890 438 2385 439 585 440 1483 431 2092 439 1484 441 583 432 2092 439 884 434 2390 435 86917 331 925 330 373 338 642 331
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0F 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0B 00 00 00
 # 
-name: CH_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/Samsung/Samsung_TV.ir b/TVs/Samsung/Samsung_TV.ir
index 1defbea0..d6629c3e 100644
--- a/TVs/Samsung/Samsung_TV.ir
+++ b/TVs/Samsung/Samsung_TV.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -13,19 +13,19 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 01 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0F 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Samsung/Samsung_TV_Full.ir b/TVs/Samsung/Samsung_TV_Full.ir
index 8b2b096e..b4512fed 100644
--- a/TVs/Samsung/Samsung_TV_Full.ir
+++ b/TVs/Samsung/Samsung_TV_Full.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 02 00 00 00
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: e6 00 00 00
 # 
-name: Power Off Only
+name: POWER Off Only
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -109,19 +109,19 @@ protocol: Samsung32
 address: 07 00 00 00
 command: f6 00 00 00
 # 
-name: Volume+
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Volume-
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0b 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Samsung/Samsung_TV_HQ24ED470AK.ir b/TVs/Samsung/Samsung_TV_HQ24ED470AK.ir
index 6b581b98..2f19c5a8 100644
--- a/TVs/Samsung/Samsung_TV_HQ24ED470AK.ir
+++ b/TVs/Samsung/Samsung_TV_HQ24ED470AK.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Samsung TV HQ24ED470AK (Hospitality TV)
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -117,19 +117,19 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4503 4466 561 1666 572 1657 570 1658 569 531 562 565 538 563 540 535 568 558 545 1683 545 1657 570 1658 569 558 545 555 538 564 539 561 542 559 544 557 536 565 538 562 541 1687 540 561 542 1660 567 1687 540 561 542 1686 541 1660 567 1687 540 561 542 1686 541 533 570 557 536 1693 545 555 538 563 540 561 542 559 544 42963 4495 4471 567 1687 540 1661 566 1662 565 536 567 534 569 558 545 556 537 564 539 1662 565 1663 564 1689 538 563 540 534 569 558 545 556 537 563 540 561 542 559 544 556 537 1691 536 538 565 1689 538 1689 538 536 567 1687 540 1661 566 1661 566 561 542 1659 568 559 544 556 537 1691 536 564 539 559 556 537
 # 
-name: Vol_Up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4507 4464 564 1690 537 1691 536 1666 572 555 538 538 565 562 541 559 544 557 536 1693 545 1656 571 1657 570 557 536 565 538 563 540 561 542 558 545 1683 544 1657 570 1684 543 558 545 555 538 563 540 561 542 559 544 557 536 565 538 563 540 1688 539 1662 565 1663 564 1663 564 1664 563 564 539 536 567 560 543 558 545 42962 4496 4470 568 1686 541 1660 567 1661 566 560 543 558 545 556 537 564 539 561 542 1686 541 1660 567 1687 540 534 569 558 545 555 538 563 540 561 542 1686 541 1686 541 1686 541 533 570 557 536 565 538 563 540 560 543 558 545 555 538 563 540 1661 566 1687 540 1661 566 1661 566 1662 565 561 542 533 570 557 536 564 539
 # 
-name: Vol_Down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4506 4465 563 1692 546 1658 569 1659 568 559 544 557 536 565 538 563 540 561 542 1687 540 1662 565 1689 538 563 540 561 542 560 543 558 545 556 537 1665 562 1693 545 530 563 1692 546 555 538 564 539 562 541 560 543 558 545 556 537 1665 562 539 564 1690 537 1691 536 1692 535 1693 545 556 537 539 564 563 540 561 542 42974 4505 4464 564 1690 537 1665 562 1667 571 530 563 565 538 563 540 561 542 559 544 1684 543 1659 568 1661 566 561 542 559 544 557 536 565 538 563 540 1663 564 1690 537 563 540 1662 565 -559 558 545 556 537 564 539 562 541 1688 539 561 542 1687 540 1688 539 1688 539 1663 564 563 540 561 542 559 544 557 536
 # 
-name: CH_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -141,7 +141,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4506 4464 564 1691 536 1692 546 1656 571 556 537 564 539 562 541 560 543 558 545 1683 544 1684 543 1685 542 558 545 556 537 565 538 563 540 561 542 558 545 556 537 564 539 562 541 1687 540 561 542 558 545 556 537 1691 536 1665 562 1692 546 1656 571 556 537 1691 536 1692 546 1683 544 557 536 565 538 563 540 560 543 42966 4502 4466 562 1693 545 1683 544 1684 543 558 545 556 537 564 539 561 542 559 544 1684 543 1684 543 1658 569 558 545 530 563 564 539 562 541 560 543 558 535 566 537 564 539 562 541 1687 540 560 543 558 545 555 538 1691 536 1665 562 1693 545 1657 570 557 536 1666 572 1683 544 1658 569 557 546 529 564 563 540 561 542
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/Samsung/Samsung_UE75TU7125K.ir b/TVs/Samsung/Samsung_UE75TU7125K.ir
index 88859c4a..ebd0f67b 100644
--- a/TVs/Samsung/Samsung_UE75TU7125K.ir
+++ b/TVs/Samsung/Samsung_UE75TU7125K.ir
@@ -3,25 +3,25 @@ Version: 1
 # 
 # Samsung TV UE75TU7125K
 # 
-name: On_Off
+name: POWER
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 02 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 0B 00 00 00
 # 
-name: CH_Up
+name: CH+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -33,7 +33,7 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 10 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Sanyo/Sanyo_universal.ir b/TVs/Sanyo/Sanyo_universal.ir
index b733026c..61f845df 100644
--- a/TVs/Sanyo/Sanyo_universal.ir
+++ b/TVs/Sanyo/Sanyo_universal.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Sanyo Universal TV Remote
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 38 00 00 00
@@ -15,7 +15,7 @@ protocol: NEC
 address: 38 00 00 00
 command: 54 00 00 00
 # 
-name: V_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 38 00 00 00
@@ -27,13 +27,13 @@ protocol: NEC
 address: 38 00 00 00
 command: 0F 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 38 00 00 00
 command: 18 00 00 00
 # 
-name: Ch_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 38 00 00 00
diff --git a/TVs/Sceptre/Sceptre_H24.ir b/TVs/Sceptre/Sceptre_H24.ir
index 0fd25050..78332f00 100644
--- a/TVs/Sceptre/Sceptre_H24.ir
+++ b/TVs/Sceptre/Sceptre_H24.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Sceptre H24 Monitor and TV Tuner
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -15,25 +15,25 @@ protocol: SIRC
 address: 01 00 00 00
 command: 3C 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 13 00 00 00
 # 
-name: Chan_Up
+name: CH+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 10 00 00 00
 # 
-name: Chan_Down
+name: CH-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -165,7 +165,7 @@ protocol: SIRC
 address: 01 00 00 00
 command: 23 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -207,7 +207,7 @@ protocol: SIRC
 address: 01 00 00 00
 command: 39 00 00 00
 # 
-name: Power_Alt
+name: POWER_Alt
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/TVs/Sharp/Sharp_Roku_TV.ir b/TVs/Sharp/Sharp_Roku_TV.ir
index e6fddc46..4fc5edcd 100644
--- a/TVs/Sharp/Sharp_Roku_TV.ir
+++ b/TVs/Sharp/Sharp_Roku_TV.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -31,7 +31,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 03 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/Sharp/Sharp_tv.ir b/TVs/Sharp/Sharp_tv.ir
index 72fb67bd..d609d847 100644
--- a/TVs/Sharp/Sharp_tv.ir
+++ b/TVs/Sharp/Sharp_tv.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -13,7 +13,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 283 1745 378 690 335 705 330 735 311 729 306 707 359 706 329 710 336 704 362 703 332 1744 358 710 336 704 331 1771 331 737 309 47997 281 1721 381 687 307 733 334 758 277 736 310 1741 361 1744 358 1747 366 1714 357 1748 334 735 331 1746 336 1717 416 705 299 1725 377 41639 361 1692 379 741 284 756 279 734 332 760 275 738 308 731 335 730 305 735 311 702 333 1769 333 735 311 703 363 1739 332 736 330 47871 334 1772 330 738 308 732 303 789 277 736 310 1766 305 1775 338 1768 334 1771 331 1748 334 761 274 1776 306 1800 333 735 249 1828 274 41664 306 1774 328 792 223 790 256 784 282 783 252 787 259 755 280 811 255 758 277 762 273 1830 283 785 250 815 251 1800 250 817 280
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/Sony/Sony_Bravia.ir b/TVs/Sony/Sony_Bravia.ir
index 756afffd..ecc11662 100644
--- a/TVs/Sony/Sony_Bravia.ir
+++ b/TVs/Sony/Sony_Bravia.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 15 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 13 00 00 00
 # 
-name: Chan_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 8958 4449 510 4475 515 4444 515 2213 508 4477 513 2215 516 2212 509 2219 512 2217 514 2214 517 2211 540 2214 517 2211 510 4449 510 2218 513 4472 507 2220 511 30572 8960 2218 513 87698 8966 2211 510 87701 8963 2214 568
 # 
-name: Chan_down
+name: CH-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -73,7 +73,7 @@ protocol: SIRC
 address: 01 00 00 00
 command: 25 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/TVs/Sony/Sony_FW_75BZ40H.ir b/TVs/Sony/Sony_FW_75BZ40H.ir
index 578cbe26..a7173bae 100644
--- a/TVs/Sony/Sony_FW_75BZ40H.ir
+++ b/TVs/Sony/Sony_FW_75BZ40H.ir
@@ -16,7 +16,7 @@ protocol: SIRC15
 address: 1A 00 00 00
 command: 58 00 00 00
 # 
-name: On_off
+name: POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -202,13 +202,13 @@ protocol: SIRC
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: Volume_up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 12 00 00 00
 # 
-name: Volume_down
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -220,19 +220,19 @@ protocol: SIRC
 address: 01 00 00 00
 command: 17 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 14 00 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 10 00 00 00
 # 
-name: Channel_down
+name: CH-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/TVs/Sony/Sony_KD.ir b/TVs/Sony/Sony_KD.ir
index e73aa0b2..bb7507fd 100644
--- a/TVs/Sony/Sony_KD.ir
+++ b/TVs/Sony/Sony_KD.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 15 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -19,7 +19,7 @@ protocol: SIRC
 address: 01 00 00 00
 command: 13 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/TVs/Sony/Sony_X2182U.ir b/TVs/Sony/Sony_X2182U.ir
index e8ce2e26..00b0d731 100644
--- a/TVs/Sony/Sony_X2182U.ir
+++ b/TVs/Sony/Sony_X2182U.ir
@@ -5,13 +5,13 @@ Version: 1
 # Remote: RM-887
 # remote came with X2182U, but may actually be for a newer Trinitron TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 15 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -174,25 +174,25 @@ protocol: SIRC
 address: 03 00 00 00
 command: 4F 00 00 00
 # 
-name: Volume_up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 12 00 00 00
 # 
-name: Volume_down
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 13 00 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 10 00 00 00
 # 
-name: Channel_down
+name: CH-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/TVs/Sony/Sony_XBR.ir b/TVs/Sony/Sony_XBR.ir
index c68e06da..7e479c5c 100644
--- a/TVs/Sony/Sony_XBR.ir
+++ b/TVs/Sony/Sony_XBR.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On
+POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -61,13 +61,13 @@ protocol: SIRC15
 address: 97 00 00 00
 command: 23 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/TVs/Sony/Sony_XBR_RM-TD017.ir b/TVs/Sony/Sony_XBR_RM-TD017.ir
index 0b90cebe..6c851dea 100644
--- a/TVs/Sony/Sony_XBR_RM-TD017.ir
+++ b/TVs/Sony/Sony_XBR_RM-TD017.ir
@@ -3,37 +3,37 @@ Version: 1
 # 
 # Sony XBR TV (RM-TD017)
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 15 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 14 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 13 00 00 00
 # 
-name: Chan_Up
+name: CH+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 10 00 00 00
 # 
-name: Chan_Down
+name: CH-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/TVs/Sony/Sony_XBR_RMT-TX200U.ir b/TVs/Sony/Sony_XBR_RMT-TX200U.ir
index e0774052..fcd3665b 100644
--- a/TVs/Sony/Sony_XBR_RMT-TX200U.ir
+++ b/TVs/Sony/Sony_XBR_RMT-TX200U.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -13,19 +13,19 @@ protocol: SIRC
 address: 01 00 00 00
 command: 25 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
 command: 13 00 00 00
 # 
-name: Ch_up
+name: CH+
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
@@ -37,7 +37,7 @@ protocol: SIRC
 address: 01 00 00 00
 command: 11 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: SIRC
 address: 01 00 00 00
diff --git a/TVs/Sunbrite/Sunbrite.ir b/TVs/Sunbrite/Sunbrite.ir
index 1e75c1b3..603cd50b 100644
--- a/TVs/Sunbrite/Sunbrite.ir
+++ b/TVs/Sunbrite/Sunbrite.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: On
+POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -61,19 +61,19 @@ protocol: NEC
 address: 04 00 00 00
 command: 2F 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 02 00 00 00
 command: 1F 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 02 00 00 00
 command: 1E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 02 00 00 00
diff --git a/TVs/TCL/TCL_32S327.ir b/TVs/TCL/TCL_32S327.ir
index 9817f892..e28ca563 100644
--- a/TVs/TCL/TCL_32S327.ir
+++ b/TVs/TCL/TCL_32S327.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 17 E8 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 0F F0 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: EA C7 00 00
diff --git a/TVs/TCL/TCL_ROKU_US.ir b/TVs/TCL/TCL_ROKU_US.ir
index 03da345e..59fc95f5 100644
--- a/TVs/TCL/TCL_ROKU_US.ir
+++ b/TVs/TCL/TCL_ROKU_US.ir
@@ -3,7 +3,7 @@ Version: 1
 #
 # TCL Roku TV Remote US by socks
 #
-name: Power_tcl
+name: POWER_tcl
 type: parsed
 protocol: NECext
 address: EA C7 00 00
diff --git a/TVs/TCL/TCL_Roku_TV.ir b/TVs/TCL/TCL_Roku_TV.ir
index eca10d6a..54b80042 100644
--- a/TVs/TCL/TCL_Roku_TV.ir
+++ b/TVs/TCL/TCL_Roku_TV.ir
@@ -4,13 +4,13 @@ Version: 1
 # TCL Roku TV Remote (Netflix, Hulu, Roku Channel, ESPN+) - Noah
 # https://www.tcl.com/us/en/products/home-theater/5-series/tcl-65-class-5-series-4k-uhd-dolby-vision-hdr-roku-smart-tv-65s525
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 97 68 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: EA C7 00 00
@@ -22,7 +22,7 @@ protocol: NECext
 address: EA C7 00 00
 command: 10 EF 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: EA C7 00 00
diff --git a/TVs/TCL/TCL_UnknownModel1.ir b/TVs/TCL/TCL_UnknownModel1.ir
index 37ca4caa..8e184c86 100644
--- a/TVs/TCL/TCL_UnknownModel1.ir
+++ b/TVs/TCL/TCL_UnknownModel1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -61,13 +61,13 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4011 3984 512 1986 518 1980 513 1985 519 1980 513 985 517 981 511 1988 516 983 519 979 513 1986 518 1980 513 1985 519 980 512 987 515 984 518 981 510 1987 517 1982 511 987 515 1983 521 1978 515 983 519 980 511 987 515 8184 4012 3982 514 1984 520 1978 515 1983 510 1988 516 983 519 980 511 1986 518 981 510 988 514 1984 520 1979 514 1983 521 979 512 986 516 982 520 979 512 1985 519 1980 513 985 517 1981 512 1986 518 982 510 989 513 985 517
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 4009 3986 511 1988 516 1982 511 1987 517 1981 512 1012 490 1009 493 1979 514 1010 492 1981 512 1986 518 1980 513 1985 519 979 513 1012 490 1009 493 1006 486 1986 518 1981 512 985 517 1982 511 987 515 1010 492 1006 486 1013 489 8184 4013 3982 515 1983 510 1988 516 1982 511 1987 517 1007 485 1014 488 1985 519 1005 487 1986 518 1981 512 1986 518 1980 513 1011 491 1008 494 1004 488 1011 491 1982 511 1987 517 1007 485 1988 516 1009 493 1005 487 1012 490 1009 493
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -85,7 +85,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 4015 3980 516 1982 511 1987 517 1982 511 1987 516 1981 512 1986 517 1981 512 1012 490 982 520 979 512 1986 518 1007 485 1014 488 1011 491 1007 495 1004 487 985 517 1008 494 1005 486 1986 518 1980 513 1985 519 1006 486 1987 517 8181 4015 3980 516 1981 512 1986 518 1981 512 1986 517 1980 513 1985 519 1979 514 1010 492 1007 485 988 514 1985 519 1005 487 986 516 1009 493 979 513 1013 489 983 519 1006 486 1013 489 1984 519 1978 515 1983 520 978 513 1985 518
 # 
-name: Ch_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/TCL/TCL_UnknownModel2.ir b/TVs/TCL/TCL_UnknownModel2.ir
index 1e29006a..80c2a2f2 100644
--- a/TVs/TCL/TCL_UnknownModel2.ir
+++ b/TVs/TCL/TCL_UnknownModel2.ir
@@ -1,6 +1,6 @@
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: EA C7 00 00
@@ -30,19 +30,19 @@ protocol: NECext
 address: EA C7 00 00
 command: 2D D2 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 20 DF 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 0F F0 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: EA C7 00 00
diff --git a/TVs/TCL/TCL_UnknownModel3.ir b/TVs/TCL/TCL_UnknownModel3.ir
index a2b25767..b8ffcc5f 100644
--- a/TVs/TCL/TCL_UnknownModel3.ir
+++ b/TVs/TCL/TCL_UnknownModel3.ir
@@ -2,7 +2,7 @@ Version: 1
 # 
 # TCL TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: EA C7 00 00
@@ -32,19 +32,19 @@ protocol: NECext
 address: EA C7 00 00
 command: 2D D2 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 20 DF 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: EA C7 00 00
 command: 0F F0 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: EA C7 00 00
diff --git a/TVs/Telefunken/Telefunken_L55U405B4CW.ir b/TVs/Telefunken/Telefunken_L55U405B4CW.ir
index f30b43f3..e7c5571a 100644
--- a/TVs/Telefunken/Telefunken_L55U405B4CW.ir
+++ b/TVs/Telefunken/Telefunken_L55U405B4CW.ir
@@ -3,19 +3,19 @@ Version: 1
 # 
 # Telefunken TV L55U405B4CW
 #
-name: Power
+name: POWER
 type: parsed
 protocol: RC5
 address: 01 00 00 00
 command: 0C 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: RC5
 address: 01 00 00 00
 command: 10 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: RC5
 address: 01 00 00 00
diff --git a/TVs/Telekom/Telekom_Entertain.ir b/TVs/Telekom/Telekom_Entertain.ir
index 39578b91..335a699f 100644
--- a/TVs/Telekom/Telekom_Entertain.ir
+++ b/TVs/Telekom/Telekom_Entertain.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Telekom Entertain Remote (IPTV Box, German ISP)
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -171,19 +171,19 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 327 606 320 284 642 290 313 590 315 288 638 597 641 589 316 287 639 592 313 289 314 288 315 287 639
 # 
-name: Vol_up
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 331 601 314 289 647 285 308 595 320 282 644 591 647 584 321 282 644 587 318 285 641 290 313 583 332
 # 
-name: Vol_down
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
 data: 330 632 294 281 645 288 315 585 320 284 642 593 645 585 320 284 642 589 649 583 644 586 329
 # 
-name: Mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
@@ -195,7 +195,7 @@ frequency: 38000
 duty_cycle: 0.330000
 data: 327 635 291 285 641 292 311 591 314 289 637 598 640 591 314 289 637 595 643 289 314 282 311 585 330
 # 
-name: Ch_up
+name: CH+
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/TVs/Toshiba/Toshiba_32AV502U.ir b/TVs/Toshiba/Toshiba_32AV502U.ir
index ff8915f7..adf216d8 100644
--- a/TVs/Toshiba/Toshiba_32AV502U.ir
+++ b/TVs/Toshiba/Toshiba_32AV502U.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 40 00 00 00
 command: 12 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 40 00 00 00
 command: 1A 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 40 00 00 00
 command: 1E 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 40 00 00 00
diff --git a/TVs/Toshiba/Toshiba_43LF421U21.ir b/TVs/Toshiba/Toshiba_43LF421U21.ir
index 0d8a1dae..e89228e6 100644
--- a/TVs/Toshiba/Toshiba_43LF421U21.ir
+++ b/TVs/Toshiba/Toshiba_43LF421U21.ir
@@ -1,9 +1,9 @@
 Filetype: IR signals file
 Version: 1
 # 
-# Toshiba Fire TV, Model 43LF421U21, only power because the rest of the buttons are bluetooth
+# Toshiba Fire TV, Model 43LF421U21, only POWER because the rest of the buttons are bluetooth
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
diff --git a/TVs/Toshiba/Toshiba_CT-90325.ir b/TVs/Toshiba/Toshiba_CT-90325.ir
index 7c8f4ff1..daa3b19e 100644
--- a/TVs/Toshiba/Toshiba_CT-90325.ir
+++ b/TVs/Toshiba/Toshiba_CT-90325.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 40 00 00 00
 command: 12 00 00 00
 # 
-name: Volume_Up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 40 00 00 00
 command: 1A 00 00 00
 # 
-name: Volume_Down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 40 00 00 00
 command: 1E 00 00 00
 # 
-name: Channel_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 40 00 00 00
 command: 1B 00 00 00
 # 
-name: Channel_Down
+name: CH-
 type: parsed
 protocol: NEC
 address: 40 00 00 00
@@ -37,7 +37,7 @@ protocol: NEC
 address: 40 00 00 00
 command: 0F 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 40 00 00 00
diff --git a/TVs/Toshiba/Toshiba_FireTV.ir b/TVs/Toshiba/Toshiba_FireTV.ir
index 8661ff43..89ea8e19 100644
--- a/TVs/Toshiba/Toshiba_FireTV.ir
+++ b/TVs/Toshiba/Toshiba_FireTV.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
diff --git a/TVs/Viore/Viore_TV_LC37VF72.ir b/TVs/Viore/Viore_TV_LC37VF72.ir
index 68711c81..3955b8d6 100644
--- a/TVs/Viore/Viore_TV_LC37VF72.ir
+++ b/TVs/Viore/Viore_TV_LC37VF72.ir
@@ -3,19 +3,19 @@ Version: 1
 # 
 # Viore TV LC37VF72
 #
-name: PowerToggle
+name: POWERToggle
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 02 00 00 00
 # 
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 07 00 00 00
 # 
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -27,7 +27,7 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 0F 00 00 00
 # 
-name: Ch_Up
+name: CH+
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
diff --git a/TVs/Vizio/Vizio.ir b/TVs/Vizio/Vizio.ir
index e9cc9df5..d21fdd41 100644
--- a/TVs/Vizio/Vizio.ir
+++ b/TVs/Vizio/Vizio.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -13,19 +13,19 @@ protocol: NEC
 address: 04 00 00 00
 command: 2F 00 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 02 00 00 00
 # 
-name: Vol_down
+name: VOL-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 03 00 00 00
 # 
-name: Ch_up
+name: CH+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -37,7 +37,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 01 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/Vizio/Vizio_XRT136.ir b/TVs/Vizio/Vizio_XRT136.ir
index 87ac043f..6137ffb4 100644
--- a/TVs/Vizio/Vizio_XRT136.ir
+++ b/TVs/Vizio/Vizio_XRT136.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Vizio TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -15,7 +15,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 2F 00 00 00
 # 
-name: Ch_UP
+name: CH+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -27,13 +27,13 @@ protocol: NEC
 address: 04 00 00 00
 command: 01 00 00 00
 # 
-name: Vol_UP
+name: VOL+
 type: parsed
 protocol: NEC
 address: 04 00 00 00
 command: 02 00 00 00
 # 
-name: Vol_DOWN
+name: VOL-
 type: parsed
 protocol: NEC
 address: 04 00 00 00
@@ -93,7 +93,7 @@ protocol: NEC
 address: 04 00 00 00
 command: 49 00 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NEC
 address: 04 00 00 00
diff --git a/TVs/Wbox/Wbox_TV.ir b/TVs/Wbox/Wbox_TV.ir
index 10b84b1e..db2b903b 100644
--- a/TVs/Wbox/Wbox_TV.ir
+++ b/TVs/Wbox/Wbox_TV.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Wbox TV
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -39,13 +39,13 @@ protocol: NECext
 address: 40 40 00 00
 command: 0D F2 00 00
 # 
-name: Vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 15 EA 00 00
 # 
-name: Vol_dwn
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -81,7 +81,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 0C F3 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/TVs/Westinghouse/Westinghouse.ir b/TVs/Westinghouse/Westinghouse.ir
index 6f254ef8..1b059452 100644
--- a/TVs/Westinghouse/Westinghouse.ir
+++ b/TVs/Westinghouse/Westinghouse.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 # 
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 46 B9 00 00
 # 
-name: V_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 0C F3 00 00
 # 
-name: V_dwn
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 02 7D 00 00
 command: 0D F2 00 00
 # 
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 02 7D 00 00
 command: 45 BA 00 00
 # 
-name: Ch_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
 command: 0F F0 00 00
 # 
-name: Ch_dwn
+name: CH-
 type: parsed
 protocol: NECext
 address: 02 7D 00 00
diff --git a/VCR/Panasonic/Panasonic_VCR_PV9662.ir b/VCR/Panasonic/Panasonic_VCR_PV9662.ir
index bad35f82..5474981b 100644
--- a/VCR/Panasonic/Panasonic_VCR_PV9662.ir
+++ b/VCR/Panasonic/Panasonic_VCR_PV9662.ir
@@ -3,7 +3,7 @@ Version: 1
 # 
 # Panasonic PV-9662 VCR
 # 
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.330000
diff --git a/_CSV-IRDB_/0-9/2wire/Unknown_2wire/32_159.ir b/_CSV-IRDB_/0-9/2wire/Unknown_2wire/32_159.ir
index 571c287b..91c368ca 100644
--- a/_CSV-IRDB_/0-9/2wire/Unknown_2wire/32_159.ir
+++ b/_CSV-IRDB_/0-9/2wire/Unknown_2wire/32_159.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 00 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 01 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 02 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 03 00 00 00
 #
-name: X_KEY_ORANGE
+name: X_ORANGE
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 04 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 05 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 06 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 07 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 09 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 0A 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 0C 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 0F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 10 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 11 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
 command: 12 00 00 00
 #
-name: X_KEY_PURPLE
+name: X_PURPLE
 type: parsed
 protocol: NECext
 address: 20 9F 00 00
diff --git a/_CSV-IRDB_/0-9/3M/Projector/134_-1.ir b/_CSV-IRDB_/0-9/3M/Projector/134_-1.ir
index 8e63a5db..06b89498 100644
--- a/_CSV-IRDB_/0-9/3M/Projector/134_-1.ir
+++ b/_CSV-IRDB_/0-9/3M/Projector/134_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 86 00 00 00
 command: 2A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 30 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 00 00 00
diff --git a/_CSV-IRDB_/0-9/3M/Video_Projector/134_-1.ir b/_CSV-IRDB_/0-9/3M/Video_Projector/134_-1.ir
index b6b559ac..9819e71f 100644
--- a/_CSV-IRDB_/0-9/3M/Video_Projector/134_-1.ir
+++ b/_CSV-IRDB_/0-9/3M/Video_Projector/134_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 86 00 00 00
 command: 2A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 30 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 00 00 00
diff --git a/_CSV-IRDB_/A/ABIT/DVD_WINDVD/1_-1.ir b/_CSV-IRDB_/A/ABIT/DVD_WINDVD/1_-1.ir
index 1be489ca..dac64679 100644
--- a/_CSV-IRDB_/A/ABIT/DVD_WINDVD/1_-1.ir
+++ b/_CSV-IRDB_/A/ABIT/DVD_WINDVD/1_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -49,19 +49,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -73,43 +73,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -151,67 +151,67 @@ protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 44 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 45 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 46 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 47 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/A/ABS/SAT_8776/8_0.ir b/_CSV-IRDB_/A/ABS/SAT_8776/8_0.ir
index 07ca30fc..d3607092 100644
--- a/_CSV-IRDB_/A/ABS/SAT_8776/8_0.ir
+++ b/_CSV-IRDB_/A/ABS/SAT_8776/8_0.ir
@@ -1,181 +1,181 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: X_KEY_MUSIC
+name: X_MUSIC
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/A/ADB/SAT_ICAN3000/8_0.ir b/_CSV-IRDB_/A/ADB/SAT_ICAN3000/8_0.ir
index 3d0fc82d..78ddd7f9 100644
--- a/_CSV-IRDB_/A/ADB/SAT_ICAN3000/8_0.ir
+++ b/_CSV-IRDB_/A/ADB/SAT_ICAN3000/8_0.ir
@@ -1,139 +1,139 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: X_KEY_OPTIONS
+name: X_OPTIONS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -163,49 +163,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 21 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 22 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/A/ADB/Set_Top_Box/42_17.ir b/_CSV-IRDB_/A/ADB/Set_Top_Box/42_17.ir
index ad03ecfd..f9e1a0f2 100644
--- a/_CSV-IRDB_/A/ADB/Set_Top_Box/42_17.ir
+++ b/_CSV-IRDB_/A/ADB/Set_Top_Box/42_17.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: 2A 11 00 00
 command: 26 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 2A 11 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 2A 11 00 00
 command: 45 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 2A 11 00 00
diff --git a/_CSV-IRDB_/A/ADS/AUDIO_Tech/0_-1.ir b/_CSV-IRDB_/A/ADS/AUDIO_Tech/0_-1.ir
index a4ee7029..07d591a9 100644
--- a/_CSV-IRDB_/A/ADS/AUDIO_Tech/0_-1.ir
+++ b/_CSV-IRDB_/A/ADS/AUDIO_Tech/0_-1.ir
@@ -7,49 +7,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/A/ADS/TV_Instant/2_-1.ir b/_CSV-IRDB_/A/ADS/TV_Instant/2_-1.ir
index 12a0daf2..db0b2f4c 100644
--- a/_CSV-IRDB_/A/ADS/TV_Instant/2_-1.ir
+++ b/_CSV-IRDB_/A/ADS/TV_Instant/2_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: X_KEY_3
+name: X_3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: X_KEY_2
+name: X_2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: X_KEY_1
+name: X_1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -73,127 +73,127 @@ protocol: NECext
 address: 02 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 16 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 17 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 40 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 44 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 46 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 50 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 51 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 52 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 53 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -205,61 +205,61 @@ protocol: NECext
 address: 02 00 00 00
 command: 55 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 56 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 57 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 58 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 59 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/A/AIM/MCE_AIM-RC126/4_15.ir b/_CSV-IRDB_/A/AIM/MCE_AIM-RC126/4_15.ir
index b238328b..f1192236 100644
--- a/_CSV-IRDB_/A/AIM/MCE_AIM-RC126/4_15.ir
+++ b/_CSV-IRDB_/A/AIM/MCE_AIM-RC126/4_15.ir
@@ -1,289 +1,289 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 47 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 49 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 4A 00 00 00
 #
-name: KEY_KEYBOARD
+name: KEYBOARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/A/AIM/RADIO/129_129.ir b/_CSV-IRDB_/A/AIM/RADIO/129_129.ir
index 0cc1fafc..78f4ec67 100644
--- a/_CSV-IRDB_/A/AIM/RADIO/129_129.ir
+++ b/_CSV-IRDB_/A/AIM/RADIO/129_129.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 81 81 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 81 81 00 00
 command: 0B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 81 81 00 00
 command: 12 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 81 81 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 81 81 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 81 81 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 81 81 00 00
diff --git a/_CSV-IRDB_/A/ANITECH/TV/0_-1.ir b/_CSV-IRDB_/A/ANITECH/TV/0_-1.ir
index 19ed42f7..7e4d0275 100644
--- a/_CSV-IRDB_/A/ANITECH/TV/0_-1.ir
+++ b/_CSV-IRDB_/A/ANITECH/TV/0_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,31 +19,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/A/AOC/TV/0_189.ir b/_CSV-IRDB_/A/AOC/TV/0_189.ir
index ce605672..f5f2120a 100644
--- a/_CSV-IRDB_/A/AOC/TV/0_189.ir
+++ b/_CSV-IRDB_/A/AOC/TV/0_189.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 00 BD 00 00
 command: 05 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 0A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 00 BD 00 00
 command: 12 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -55,79 +55,79 @@ protocol: NECext
 address: 00 BD 00 00
 command: 14 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 15 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 16 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 17 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 18 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 BD 00 00
 command: 44 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
diff --git a/_CSV-IRDB_/A/AccessHD/CONVERTER_DTA1080U/0_191.ir b/_CSV-IRDB_/A/AccessHD/CONVERTER_DTA1080U/0_191.ir
index 27c3ef32..c2678cfe 100644
--- a/_CSV-IRDB_/A/AccessHD/CONVERTER_DTA1080U/0_191.ir
+++ b/_CSV-IRDB_/A/AccessHD/CONVERTER_DTA1080U/0_191.ir
@@ -1,169 +1,169 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 06 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 08 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 13 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 19 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 1A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 45 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 48 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 4A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 4C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 4D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 4E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 51 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 52 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 54 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 56 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
diff --git a/_CSV-IRDB_/A/AccessMedia/ThinBox/31_-1.ir b/_CSV-IRDB_/A/AccessMedia/ThinBox/31_-1.ir
index 9d1f2c3d..cd871bda 100644
--- a/_CSV-IRDB_/A/AccessMedia/ThinBox/31_-1.ir
+++ b/_CSV-IRDB_/A/AccessMedia/ThinBox/31_-1.ir
@@ -1,217 +1,217 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_QUESTION
+name: QUESTION
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 12 00 00 00
 #
-name: X_KEY_SWITCH
+name: X_SWITCH
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 13 00 00 00
 #
-name: X_KEY_MUSIC
+name: X_MUSIC
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 1E 00 00 00
 #
-name: X_KEY_OPT
+name: X_OPT
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 30 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 35 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 37 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 38 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
diff --git a/_CSV-IRDB_/A/Acer/Unknown_AT3201W/97_99.ir b/_CSV-IRDB_/A/Acer/Unknown_AT3201W/97_99.ir
index 5ad9a4da..e43b9599 100644
--- a/_CSV-IRDB_/A/Acer/Unknown_AT3201W/97_99.ir
+++ b/_CSV-IRDB_/A/Acer/Unknown_AT3201W/97_99.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: 61 63 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 61 63 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 61 63 00 00
 command: 0B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 61 63 00 00
@@ -91,85 +91,85 @@ protocol: NECext
 address: 61 63 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 1C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 61 63 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: 61 63 00 00
 command: 23 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 24 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 25 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 61 63 00 00
@@ -223,61 +223,61 @@ protocol: NECext
 address: 61 63 00 00
 command: 28 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 29 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 3A 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 3B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 3C 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 3D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 40 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 41 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 42 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 61 63 00 00
@@ -289,13 +289,13 @@ protocol: NECext
 address: 61 63 00 00
 command: 46 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 61 63 00 00
 command: 49 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 61 63 00 00
diff --git a/_CSV-IRDB_/A/Acer/Unknown_Aspire/4_15.ir b/_CSV-IRDB_/A/Acer/Unknown_Aspire/4_15.ir
index 09ccc325..54ad236e 100644
--- a/_CSV-IRDB_/A/Acer/Unknown_Aspire/4_15.ir
+++ b/_CSV-IRDB_/A/Acer/Unknown_Aspire/4_15.ir
@@ -1,271 +1,271 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_BACKSPACE
+name: BACKSPACE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_KPENTER
+name: KPENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_COMPOSE
+name: COMPOSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAYCD
+name: PLAYCD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSECD
+name: PAUSECD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOPCD
+name: STOPCD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXTSONG
+name: NEXTSONG
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUSSONG
+name: PREVIOUSSONG
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_KPSLASH
+name: KPSLASH
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_KPASTERISK
+name: KPASTERISK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_TV2
+name: TV2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/A/Acer/Unknown_RC-802/16_37.ir b/_CSV-IRDB_/A/Acer/Unknown_RC-802/16_37.ir
index 674453f9..38ac848f 100644
--- a/_CSV-IRDB_/A/Acer/Unknown_RC-802/16_37.ir
+++ b/_CSV-IRDB_/A/Acer/Unknown_RC-802/16_37.ir
@@ -7,151 +7,151 @@ protocol: NECext
 address: 10 25 00 00
 command: 00 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 01 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 02 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 06 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 07 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 08 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 0D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 10 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 11 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 12 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 13 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 14 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 15 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 16 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 17 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 19 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 1A 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 1B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 1C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 1D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 25 00 00
@@ -163,43 +163,43 @@ protocol: NECext
 address: 10 25 00 00
 command: 1F 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 41 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 43 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 44 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 45 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 46 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 10 25 00 00
@@ -217,67 +217,67 @@ protocol: NECext
 address: 10 25 00 00
 command: 49 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 4A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 4B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 4C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 4D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 50 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 51 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 52 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 53 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 54 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 10 25 00 00
 command: 55 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 10 25 00 00
diff --git a/_CSV-IRDB_/A/Acesonic/Karaoke/5_122.ir b/_CSV-IRDB_/A/Acesonic/Karaoke/5_122.ir
index 7eec5414..04bae420 100644
--- a/_CSV-IRDB_/A/Acesonic/Karaoke/5_122.ir
+++ b/_CSV-IRDB_/A/Acesonic/Karaoke/5_122.ir
@@ -217,7 +217,7 @@ protocol: NECext
 address: 05 7A 00 00
 command: 46 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 7A 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 05 7A 00 00
 command: 48 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 7A 00 00
diff --git a/_CSV-IRDB_/A/Acesonic/Karaoke/77_-1.ir b/_CSV-IRDB_/A/Acesonic/Karaoke/77_-1.ir
index 65e580bf..c9f04359 100644
--- a/_CSV-IRDB_/A/Acesonic/Karaoke/77_-1.ir
+++ b/_CSV-IRDB_/A/Acesonic/Karaoke/77_-1.ir
@@ -55,7 +55,7 @@ protocol: NECext
 address: 4D 00 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 4D 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 4D 00 00 00
 command: 48 00 00 00
 #
-name: KEY_DWN
+name: DWN
 type: parsed
 protocol: NECext
 address: 4D 00 00 00
diff --git a/_CSV-IRDB_/A/Aconatic/Unknown_AN-2121/2_-1.ir b/_CSV-IRDB_/A/Aconatic/Unknown_AN-2121/2_-1.ir
index dce776e9..cdeb76d2 100644
--- a/_CSV-IRDB_/A/Aconatic/Unknown_AN-2121/2_-1.ir
+++ b/_CSV-IRDB_/A/Aconatic/Unknown_AN-2121/2_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 80 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 81 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 82 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 84 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 85 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 86 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -55,37 +55,37 @@ protocol: NECext
 address: 02 00 00 00
 command: 88 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 89 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 02 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 90 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 91 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 92 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 93 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 02 00 00 00
 command: 95 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 96 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 97 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 98 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 99 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -187,43 +187,43 @@ protocol: NECext
 address: 02 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: C4 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: C5 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: C6 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: C7 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: C8 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: C9 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -235,37 +235,37 @@ protocol: NECext
 address: 02 00 00 00
 command: CB 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: CC 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: CD 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: CE 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: CF 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: D0 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 02 00 00 00
 command: D3 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/A/Acorp/Unknown_Acorp-878/134_107.ir b/_CSV-IRDB_/A/Acorp/Unknown_Acorp-878/134_107.ir
index 1bf1dab9..1a622dd2 100644
--- a/_CSV-IRDB_/A/Acorp/Unknown_Acorp-878/134_107.ir
+++ b/_CSV-IRDB_/A/Acorp/Unknown_Acorp-878/134_107.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -37,31 +37,31 @@ protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: X_KEY_6(unused)
+name: X_6(unused)
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/A/Adcom/AV_Preamplifier/26_-1.ir b/_CSV-IRDB_/A/Adcom/AV_Preamplifier/26_-1.ir
index 9a06b481..f1ddfc92 100644
--- a/_CSV-IRDB_/A/Adcom/AV_Preamplifier/26_-1.ir
+++ b/_CSV-IRDB_/A/Adcom/AV_Preamplifier/26_-1.ir
@@ -391,7 +391,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: D1 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -409,7 +409,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: D5 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
diff --git a/_CSV-IRDB_/A/Adcom/CD_Player/26_-1.ir b/_CSV-IRDB_/A/Adcom/CD_Player/26_-1.ir
index 883807a8..f83cd27d 100644
--- a/_CSV-IRDB_/A/Adcom/CD_Player/26_-1.ir
+++ b/_CSV-IRDB_/A/Adcom/CD_Player/26_-1.ir
@@ -73,13 +73,13 @@ protocol: NECext
 address: 1A 00 00 00
 command: 08 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
diff --git a/_CSV-IRDB_/A/Adcom/Pre-Amplifier/26_-1.ir b/_CSV-IRDB_/A/Adcom/Pre-Amplifier/26_-1.ir
index 68687a16..c09b418e 100644
--- a/_CSV-IRDB_/A/Adcom/Pre-Amplifier/26_-1.ir
+++ b/_CSV-IRDB_/A/Adcom/Pre-Amplifier/26_-1.ir
@@ -985,7 +985,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: D1 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -1033,7 +1033,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: D5 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
diff --git a/_CSV-IRDB_/A/Adcom/Pre-Amplifier/81_0.ir b/_CSV-IRDB_/A/Adcom/Pre-Amplifier/81_0.ir
index e269b618..8b8ffd99 100644
--- a/_CSV-IRDB_/A/Adcom/Pre-Amplifier/81_0.ir
+++ b/_CSV-IRDB_/A/Adcom/Pre-Amplifier/81_0.ir
@@ -169,7 +169,7 @@ protocol: NECext
 address: 51 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 51 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 51 00 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 51 00 00 00
diff --git a/_CSV-IRDB_/A/Adcom/Receiver/26_-1.ir b/_CSV-IRDB_/A/Adcom/Receiver/26_-1.ir
index 5e0a86a5..a63ee7bb 100644
--- a/_CSV-IRDB_/A/Adcom/Receiver/26_-1.ir
+++ b/_CSV-IRDB_/A/Adcom/Receiver/26_-1.ir
@@ -109,13 +109,13 @@ protocol: NECext
 address: 1A 00 00 00
 command: 51 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 55 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -343,7 +343,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: D0 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -361,7 +361,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: D4 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
diff --git a/_CSV-IRDB_/A/Adelphia/Cable_Box/1_-1.ir b/_CSV-IRDB_/A/Adelphia/Cable_Box/1_-1.ir
index c022259b..3bd0ee73 100644
--- a/_CSV-IRDB_/A/Adelphia/Cable_Box/1_-1.ir
+++ b/_CSV-IRDB_/A/Adelphia/Cable_Box/1_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/A/Advanced_Acoustics/Unknown_Acoustic/36_75.ir b/_CSV-IRDB_/A/Advanced_Acoustics/Unknown_Acoustic/36_75.ir
index 9dd1c33e..6fbaa7e4 100644
--- a/_CSV-IRDB_/A/Advanced_Acoustics/Unknown_Acoustic/36_75.ir
+++ b/_CSV-IRDB_/A/Advanced_Acoustics/Unknown_Acoustic/36_75.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 24 4B 00 00
 command: 08 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 24 4B 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 24 4B 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 24 4B 00 00
 command: 14 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 24 4B 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 24 4B 00 00
 command: 4C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 24 4B 00 00
 command: 50 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 24 4B 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 24 4B 00 00
diff --git a/_CSV-IRDB_/A/Aesthetix/Pre-Amplifier/16_-1.ir b/_CSV-IRDB_/A/Aesthetix/Pre-Amplifier/16_-1.ir
index 5825e82d..f5282fb6 100644
--- a/_CSV-IRDB_/A/Aesthetix/Pre-Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/A/Aesthetix/Pre-Amplifier/16_-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 03 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Mini_System/110_0.ir b/_CSV-IRDB_/A/Aiwa/Mini_System/110_0.ir
index 60f55bbe..c1061806 100644
--- a/_CSV-IRDB_/A/Aiwa/Mini_System/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Mini_System/110_0.ir
@@ -115,13 +115,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Receiver/16_-1.ir b/_CSV-IRDB_/A/Aiwa/Receiver/16_-1.ir
index fd047763..e458b5f2 100644
--- a/_CSV-IRDB_/A/Aiwa/Receiver/16_-1.ir
+++ b/_CSV-IRDB_/A/Aiwa/Receiver/16_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA-RC-5VP05/127_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA-RC-5VP05/127_0.ir
index 4bc8f94c..b1098e4d 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA-RC-5VP05/127_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA-RC-5VP05/127_0.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 46 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 7F 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/110_0.ir
index 0e7e3aac..75dc7248 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -127,31 +127,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/118_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/118_0.ir
index 91228e9e..3fe97043 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/118_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/118_0.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 76 00 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 76 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 15 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 18 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 76 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/127_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/127_0.ir
index 0b771979..4800869a 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/127_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/127_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -85,37 +85,37 @@ protocol: NECext
 address: 7F 00 00 00
 command: 10 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 12 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 7F 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 40 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 7F 00 00 00
 command: 51 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 7F 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 81 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 83 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 84 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 89 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/72_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/72_0.ir
index 86fd42dc..ed08a1cf 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/72_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_AIWA/72_0.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 48 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 48 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 48 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 48 00 00 00
 command: 05 00 00 00
 #
-name: v_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 48 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 48 00 00 00
 command: 11 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 48 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_AWIA-RC-ZVR04/128_123.ir b/_CSV-IRDB_/A/Aiwa/Unknown_AWIA-RC-ZVR04/128_123.ir
index 11f83ff1..b9d9ed2e 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_AWIA-RC-ZVR04/128_123.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_AWIA-RC-ZVR04/128_123.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 0D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 0E 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -109,37 +109,37 @@ protocol: NECext
 address: 80 7B 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 17 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -163,43 +163,43 @@ protocol: NECext
 address: 80 7B 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 1F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 41 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 42 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 45 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 49 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 4A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 80 7B 00 00
 command: 4C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 4D 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_HIFI/112_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_HIFI/112_0.ir
index f60d17c1..496845cd 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_HIFI/112_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_HIFI/112_0.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 70 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -103,37 +103,37 @@ protocol: NECext
 address: 70 00 00 00
 command: 80 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C4 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C5 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C6 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C7 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 70 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-6AS07/112_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-6AS07/112_0.ir
index f2fb4952..52483256 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-6AS07/112_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-6AS07/112_0.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 70 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -61,91 +61,91 @@ protocol: NECext
 address: 70 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 91 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 92 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 93 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 94 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 95 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 96 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 97 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 98 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 99 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C4 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C5 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C6 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 70 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-7AS06/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-7AS06/110_0.ir
index 5029dd0d..60c3ba73 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-7AS06/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-7AS06/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -127,31 +127,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-8AS04/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-8AS04/110_0.ir
index a7a5b52f..76d886d2 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-8AS04/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-8AS04/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -121,61 +121,61 @@ protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-8AT02/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-8AT02/110_0.ir
index cbb30681..67422a0b 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-8AT02/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-8AT02/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-AVT02/123_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-AVT02/123_0.ir
index 86c6cff3..3bc6f0e2 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-AVT02/123_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-AVT02/123_0.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 43 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 90 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: C4 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-BVR02/110_-1.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-BVR02/110_-1.ir
index 8f7956f8..6edfaef7 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-BVR02/110_-1.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-BVR02/110_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 82 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 83 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -187,25 +187,25 @@ protocol: NECext
 address: 6E 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 90 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: B3 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: B5 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-C105/118_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-C105/118_0.ir
index 02699efe..3875d731 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-C105/118_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-C105/118_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 76 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 76 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 15 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 76 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-CAS10/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-CAS10/110_0.ir
index 37a95fe9..2a46a0d7 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-CAS10/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-CAS10/110_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -91,37 +91,37 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: 6E 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 73 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 85 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-L01/112_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-L01/112_0.ir
index 278aa540..5864fe36 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-L01/112_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-L01/112_0.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 00 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 70 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 70 00 00 00
 command: 52 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 70 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -133,91 +133,91 @@ protocol: NECext
 address: 70 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 91 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 92 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 93 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 94 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 95 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 96 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 97 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 98 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 99 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C4 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C5 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C6 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 70 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-L60E/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-L60E/110_0.ir
index 27087f41..d7839e71 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-L60E/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-L60E/110_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-T503/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-T503/110_0.ir
index e0c19477..4984a2fa 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-T503/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-T503/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -133,31 +133,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-T504/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-T504/110_0.ir
index 64e90038..9e17e2ca 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-T504/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-T504/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -127,31 +127,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TD3/112_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TD3/112_0.ir
index 494d563f..2eddfead 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TD3/112_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TD3/112_0.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 00 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 70 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -73,79 +73,79 @@ protocol: NECext
 address: 70 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 91 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 92 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 93 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 94 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 95 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 96 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 97 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 98 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 99 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C4 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN320EX/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN320EX/110_0.ir
index 62d3abf0..2f56473a 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN320EX/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN320EX/110_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN330/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN330/110_0.ir
index fe7e4ba2..8c73a0d9 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN330/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN330/110_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -115,43 +115,43 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN360/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN360/110_0.ir
index 894e0f54..23a34905 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN360/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN360/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -133,61 +133,61 @@ protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN500EX/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN500EX/110_0.ir
index 2078bba6..2a83a02c 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN500EX/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN500EX/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -133,61 +133,61 @@ protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN520EX/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN520EX/110_0.ir
index 2d53f0ea..ab7c6d35 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN520EX/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-TN520EX/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -127,61 +127,61 @@ protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-X97/134_19.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-X97/134_19.ir
index cb04b226..7b7b6323 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-X97/134_19.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-X97/134_19.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 86 13 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 13 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 13 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 86 13 00 00
 command: 13 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 86 13 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 86 13 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 13 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 86 13 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-XR-MD201/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-XR-MD201/110_0.ir
index 5e539708..02c3d789 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-XR-MD201/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-XR-MD201/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -127,49 +127,49 @@ protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 70 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 73 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAS02/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAS02/110_0.ir
index 7b283709..5a4f4782 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAS02/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAS02/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAS10/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAS10/110_0.ir
index e654a288..5837b02e 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAS10/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAS10/110_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -73,43 +73,43 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAT04/112_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAT04/112_0.ir
index 0a7f88e5..0f367b98 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAT04/112_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZAT04/112_0.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 70 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -103,37 +103,37 @@ protocol: NECext
 address: 70 00 00 00
 command: 80 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C4 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C5 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C6 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C7 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 70 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZVR02/127_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZVR02/127_0.ir
index e3ee2319..4cb3da8d 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZVR02/127_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_RC-ZVR02/127_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 7F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 7F 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 7F 00 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 40 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 7F 00 00 00
 command: 42 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 7F 00 00 00
 command: 47 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 7F 00 00 00
 command: 74 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -307,7 +307,7 @@ protocol: NECext
 address: 7F 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_S79/72_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_S79/72_0.ir
index cd72da8e..6b7094ce 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_S79/72_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_S79/72_0.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 48 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 48 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 48 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 48 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 48 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 48 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 48 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 48 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 48 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 48 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 48 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 48 00 00 00
 command: 11 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 48 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_hu/112_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_hu/112_0.ir
index 4e4845eb..b99db640 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_hu/112_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_hu/112_0.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 70 00 00 00
 command: 13 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 70 00 00 00
@@ -25,97 +25,97 @@ protocol: NECext
 address: 70 00 00 00
 command: 52 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 53 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 91 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 92 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 93 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 94 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 95 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 96 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 97 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 98 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 99 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C4 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C5 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 70 00 00 00
 command: C6 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 70 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_rc-c003/118_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_rc-c003/118_0.ir
index 67f6067b..595fe9dc 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_rc-c003/118_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_rc-c003/118_0.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 76 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 76 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 76 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 76 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 76 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 76 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 76 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 76 00 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 76 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 76 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 76 00 00 00
@@ -175,61 +175,61 @@ protocol: NECext
 address: 76 00 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 41 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 43 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 46 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 48 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 76 00 00 00
 command: 49 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 76 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_rc-tn380b/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_rc-tn380b/110_0.ir
index 98a85516..bb12c39c 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_rc-tn380b/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_rc-tn380b/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: X_KEY_0KC
+name: X_0KC
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -223,19 +223,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 50 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 51 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 52 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_rc-tz650/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_rc-tz650/110_0.ir
index fe47473b..f6271872 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_rc-tz650/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_rc-tz650/110_0.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -169,25 +169,25 @@ protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 44 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Aiwa/Unknown_rc6as14/110_0.ir b/_CSV-IRDB_/A/Aiwa/Unknown_rc6as14/110_0.ir
index 2c5ee91b..d4c6d456 100644
--- a/_CSV-IRDB_/A/Aiwa/Unknown_rc6as14/110_0.ir
+++ b/_CSV-IRDB_/A/Aiwa/Unknown_rc6as14/110_0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -127,31 +127,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 41 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/A/Akai/Unknown_AKAI-RC-AAV2100/160_160.ir b/_CSV-IRDB_/A/Akai/Unknown_AKAI-RC-AAV2100/160_160.ir
index 8d1d2f1c..bb49b324 100644
--- a/_CSV-IRDB_/A/Akai/Unknown_AKAI-RC-AAV2100/160_160.ir
+++ b/_CSV-IRDB_/A/Akai/Unknown_AKAI-RC-AAV2100/160_160.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: A0 A0 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
 command: 04 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
 command: 05 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: A0 A0 00 00
 command: 09 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: A0 A0 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: A0 A0 00 00
 command: 0E 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
 command: 0F 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: A0 A0 00 00
 command: 14 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: A0 A0 00 00
 command: 16 00 00 00
 #
-name: X_KEY_2Ch
+name: X_2Ch
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: A0 A0 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
 command: 1F 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
 command: 60 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A0 A0 00 00
diff --git a/_CSV-IRDB_/A/Akai/Unknown_Akai-RC-61A/11_11.ir b/_CSV-IRDB_/A/Akai/Unknown_Akai-RC-61A/11_11.ir
index f4e28705..0846c88f 100644
--- a/_CSV-IRDB_/A/Akai/Unknown_Akai-RC-61A/11_11.ir
+++ b/_CSV-IRDB_/A/Akai/Unknown_Akai-RC-61A/11_11.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 09 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0A 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0B 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0C 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 14 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 18 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
diff --git a/_CSV-IRDB_/A/Akai/Unknown_Akai-RC-V23E/137_119.ir b/_CSV-IRDB_/A/Akai/Unknown_Akai-RC-V23E/137_119.ir
index 9da6f944..16ea1288 100644
--- a/_CSV-IRDB_/A/Akai/Unknown_Akai-RC-V23E/137_119.ir
+++ b/_CSV-IRDB_/A/Akai/Unknown_Akai-RC-V23E/137_119.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 01 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 06 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 89 77 00 00
 command: 0E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 16 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 89 77 00 00
 command: 59 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 89 77 00 00
diff --git a/_CSV-IRDB_/A/Akai/Unknown_RC-C79/141_-1.ir b/_CSV-IRDB_/A/Akai/Unknown_RC-C79/141_-1.ir
index 32a76c59..1221c18f 100644
--- a/_CSV-IRDB_/A/Akai/Unknown_RC-C79/141_-1.ir
+++ b/_CSV-IRDB_/A/Akai/Unknown_RC-C79/141_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 09 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 8D 00 00 00
 command: 0C 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 8D 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 8D 00 00 00
 command: 14 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
@@ -139,109 +139,109 @@ protocol: NECext
 address: 8D 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 19 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 41 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 43 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 46 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 48 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 49 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
diff --git a/_CSV-IRDB_/A/Akai/Unknown_RC-W152E/137_119.ir b/_CSV-IRDB_/A/Akai/Unknown_RC-W152E/137_119.ir
index 1b6bb011..bbbcbef2 100644
--- a/_CSV-IRDB_/A/Akai/Unknown_RC-W152E/137_119.ir
+++ b/_CSV-IRDB_/A/Akai/Unknown_RC-W152E/137_119.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 06 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 07 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -49,49 +49,49 @@ protocol: NECext
 address: 89 77 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 0E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 13 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 16 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 89 77 00 00
 command: 4E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -145,37 +145,37 @@ protocol: NECext
 address: 89 77 00 00
 command: 54 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 55 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 59 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 89 77 00 00
diff --git a/_CSV-IRDB_/A/Akai/Unknown_akai/131_101.ir b/_CSV-IRDB_/A/Akai/Unknown_akai/131_101.ir
index 58908eeb..5ecc1c84 100644
--- a/_CSV-IRDB_/A/Akai/Unknown_akai/131_101.ir
+++ b/_CSV-IRDB_/A/Akai/Unknown_akai/131_101.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 83 65 00 00
 command: 01 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 02 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 83 65 00 00
 command: 05 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 83 65 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 83 65 00 00
 command: 1D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 83 65 00 00
 command: 42 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 43 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 83 65 00 00
 command: 46 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 83 65 00 00
 command: 52 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 83 65 00 00
 command: 57 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 83 65 00 00
 command: 5C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 65 00 00
diff --git a/_CSV-IRDB_/A/Akai/Unknown_akai/139_-1.ir b/_CSV-IRDB_/A/Akai/Unknown_akai/139_-1.ir
index 686da0db..458cbe11 100644
--- a/_CSV-IRDB_/A/Akai/Unknown_akai/139_-1.ir
+++ b/_CSV-IRDB_/A/Akai/Unknown_akai/139_-1.ir
@@ -67,43 +67,43 @@ protocol: NECext
 address: 8B 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: 90 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: 91 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: 92 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: 93 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: 94 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 8B 00 00 00
 command: 97 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: C0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 8B 00 00 00
 command: C9 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
 command: CA 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 8B 00 00 00
diff --git a/_CSV-IRDB_/A/Akai/Unknown_rc-c37/141_-1.ir b/_CSV-IRDB_/A/Akai/Unknown_rc-c37/141_-1.ir
index 8d7e169f..8f27a4e0 100644
--- a/_CSV-IRDB_/A/Akai/Unknown_rc-c37/141_-1.ir
+++ b/_CSV-IRDB_/A/Akai/Unknown_rc-c37/141_-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 8D 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 8D 00 00 00
 command: 14 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
@@ -103,31 +103,31 @@ protocol: NECext
 address: 8D 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 8D 00 00 00
diff --git a/_CSV-IRDB_/A/Aopen/Media_PC/4_-1.ir b/_CSV-IRDB_/A/Aopen/Media_PC/4_-1.ir
index 0ce5b16f..1b943fde 100644
--- a/_CSV-IRDB_/A/Aopen/Media_PC/4_-1.ir
+++ b/_CSV-IRDB_/A/Aopen/Media_PC/4_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/A/Aopen/Unknown_RC-R470/4_-1.ir b/_CSV-IRDB_/A/Aopen/Unknown_RC-R470/4_-1.ir
index 32d438c1..5c92d2ee 100644
--- a/_CSV-IRDB_/A/Aopen/Unknown_RC-R470/4_-1.ir
+++ b/_CSV-IRDB_/A/Aopen/Unknown_RC-R470/4_-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -49,127 +49,127 @@ protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -193,25 +193,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 48 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -223,55 +223,55 @@ protocol: NECext
 address: 04 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MP3
+name: MP3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 55 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 56 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/A/Apex/Unknown_AD-600A/4_-1.ir b/_CSV-IRDB_/A/Apex/Unknown_AD-600A/4_-1.ir
index 085794bd..168f983c 100644
--- a/_CSV-IRDB_/A/Apex/Unknown_AD-600A/4_-1.ir
+++ b/_CSV-IRDB_/A/Apex/Unknown_AD-600A/4_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 48 00 00 00
 #
-name: KEY_MINUS
+name: MINUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 49 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 50 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -283,25 +283,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/A/Apex/Unknown_DV-R200/0_238.ir b/_CSV-IRDB_/A/Apex/Unknown_DV-R200/0_238.ir
index a79f0b3a..7d0586a4 100644
--- a/_CSV-IRDB_/A/Apex/Unknown_DV-R200/0_238.ir
+++ b/_CSV-IRDB_/A/Apex/Unknown_DV-R200/0_238.ir
@@ -19,37 +19,37 @@ protocol: NECext
 address: 00 EE 00 00
 command: 05 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 09 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 EE 00 00
 command: 11 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 00 EE 00 00
 command: 13 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -97,43 +97,43 @@ protocol: NECext
 address: 00 EE 00 00
 command: 16 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 17 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 18 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 1B 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 41 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 42 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -145,97 +145,97 @@ protocol: NECext
 address: 00 EE 00 00
 command: 44 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 45 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 46 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 47 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 48 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 49 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 51 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 52 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 53 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -253,19 +253,19 @@ protocol: NECext
 address: 00 EE 00 00
 command: 56 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 57 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 58 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
diff --git a/_CSV-IRDB_/A/Apex/Unknown_DV-R383/0_238.ir b/_CSV-IRDB_/A/Apex/Unknown_DV-R383/0_238.ir
index 1b0efd00..7c222062 100644
--- a/_CSV-IRDB_/A/Apex/Unknown_DV-R383/0_238.ir
+++ b/_CSV-IRDB_/A/Apex/Unknown_DV-R383/0_238.ir
@@ -19,37 +19,37 @@ protocol: NECext
 address: 00 EE 00 00
 command: 05 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 07 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 09 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 00 EE 00 00
 command: 10 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 00 EE 00 00
 command: 13 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 00 EE 00 00
 command: 15 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 17 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -115,49 +115,49 @@ protocol: NECext
 address: 00 EE 00 00
 command: 1B 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 41 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 42 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 43 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 44 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 45 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 46 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -169,67 +169,67 @@ protocol: NECext
 address: 00 EE 00 00
 command: 48 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 49 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4B 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 4F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 51 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 52 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 00 EE 00 00
 command: 57 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
 command: 58 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 EE 00 00
diff --git a/_CSV-IRDB_/A/Apex/Unknown_K12B-C2/64_-1.ir b/_CSV-IRDB_/A/Apex/Unknown_K12B-C2/64_-1.ir
index e54bc364..ac40ab7e 100644
--- a/_CSV-IRDB_/A/Apex/Unknown_K12B-C2/64_-1.ir
+++ b/_CSV-IRDB_/A/Apex/Unknown_K12B-C2/64_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 41 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 46 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 47 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/A/Apex/Unknown_K12K-C5/64_-1.ir b/_CSV-IRDB_/A/Apex/Unknown_K12K-C5/64_-1.ir
index 36ceef12..da609c26 100644
--- a/_CSV-IRDB_/A/Apex/Unknown_K12K-C5/64_-1.ir
+++ b/_CSV-IRDB_/A/Apex/Unknown_K12K-C5/64_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -121,43 +121,43 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 41 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 46 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/A/Apex/Unknown_RM-1200/4_-1.ir b/_CSV-IRDB_/A/Apex/Unknown_RM-1200/4_-1.ir
index 45dafcf3..72b3f511 100644
--- a/_CSV-IRDB_/A/Apex/Unknown_RM-1200/4_-1.ir
+++ b/_CSV-IRDB_/A/Apex/Unknown_RM-1200/4_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -61,139 +61,139 @@ protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 50 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -259,25 +259,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/A/Apex/Unknown_RM-2600/1_-1.ir b/_CSV-IRDB_/A/Apex/Unknown_RM-2600/1_-1.ir
index 5af4b20f..ebea8cda 100644
--- a/_CSV-IRDB_/A/Apex/Unknown_RM-2600/1_-1.ir
+++ b/_CSV-IRDB_/A/Apex/Unknown_RM-2600/1_-1.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -49,19 +49,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -103,19 +103,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -175,37 +175,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 43 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 44 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 45 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -241,19 +241,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 56 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/A/Apple/MP3_Player/238_135.ir b/_CSV-IRDB_/A/Apple/MP3_Player/238_135.ir
index e8cf53d0..5d983767 100644
--- a/_CSV-IRDB_/A/Apple/MP3_Player/238_135.ir
+++ b/_CSV-IRDB_/A/Apple/MP3_Player/238_135.ir
@@ -43,7 +43,7 @@ protocol: NECext
 address: EE 87 00 00
 command: 05 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: EE 87 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: EE 87 00 00
 command: 06 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: EE 87 00 00
diff --git a/_CSV-IRDB_/A/Apple/Unknown_CD/14_-1.ir b/_CSV-IRDB_/A/Apple/Unknown_CD/14_-1.ir
index b21a2936..10c8e427 100644
--- a/_CSV-IRDB_/A/Apple/Unknown_CD/14_-1.ir
+++ b/_CSV-IRDB_/A/Apple/Unknown_CD/14_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -67,31 +67,31 @@ protocol: NECext
 address: 0E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 0E 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 36 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 0E 00 00 00
 command: 42 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 51 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 7D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
diff --git a/_CSV-IRDB_/A/Apple/iPod/238_135.ir b/_CSV-IRDB_/A/Apple/iPod/238_135.ir
index f2a66393..095b076d 100644
--- a/_CSV-IRDB_/A/Apple/iPod/238_135.ir
+++ b/_CSV-IRDB_/A/Apple/iPod/238_135.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: EE 87 00 00
 command: 04 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: EE 87 00 00
 command: 05 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: EE 87 00 00
diff --git a/_CSV-IRDB_/A/Aragon/Pre-Amplifier/31_-1.ir b/_CSV-IRDB_/A/Aragon/Pre-Amplifier/31_-1.ir
index f0985b80..ab027a0e 100644
--- a/_CSV-IRDB_/A/Aragon/Pre-Amplifier/31_-1.ir
+++ b/_CSV-IRDB_/A/Aragon/Pre-Amplifier/31_-1.ir
@@ -217,7 +217,7 @@ protocol: NECext
 address: 1F 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 1F 00 00 00
 command: 29 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1F 00 00 00
diff --git a/_CSV-IRDB_/A/Arcam/DVD_Player/25_-1.ir b/_CSV-IRDB_/A/Arcam/DVD_Player/25_-1.ir
index 3160192e..003c2d9b 100644
--- a/_CSV-IRDB_/A/Arcam/DVD_Player/25_-1.ir
+++ b/_CSV-IRDB_/A/Arcam/DVD_Player/25_-1.ir
@@ -1309,7 +1309,7 @@ protocol: NECext
 address: 19 00 00 00
 command: 7B 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/A/Arcam/Music_System/16_-1.ir b/_CSV-IRDB_/A/Arcam/Music_System/16_-1.ir
index d4502b99..d43545d1 100644
--- a/_CSV-IRDB_/A/Arcam/Music_System/16_-1.ir
+++ b/_CSV-IRDB_/A/Arcam/Music_System/16_-1.ir
@@ -103,13 +103,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Arcam/Pre-Amplifier/16_-1.ir b/_CSV-IRDB_/A/Arcam/Pre-Amplifier/16_-1.ir
index 18ef9f47..a6f4e150 100644
--- a/_CSV-IRDB_/A/Arcam/Pre-Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/A/Arcam/Pre-Amplifier/16_-1.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Arcam/Receiver/16_-1.ir b/_CSV-IRDB_/A/Arcam/Receiver/16_-1.ir
index db87daa7..12a87d23 100644
--- a/_CSV-IRDB_/A/Arcam/Receiver/16_-1.ir
+++ b/_CSV-IRDB_/A/Arcam/Receiver/16_-1.ir
@@ -439,13 +439,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_+_A
+name: VOL+_A
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+_B
+name: VOL+_B
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -463,7 +463,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -475,13 +475,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-_A
+name: VOL-_A
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-_B
+name: VOL-_B
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -499,7 +499,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -1183,7 +1183,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 78 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Arcam/Receiver/19_-1.ir b/_CSV-IRDB_/A/Arcam/Receiver/19_-1.ir
index eabe313e..b1c5886e 100644
--- a/_CSV-IRDB_/A/Arcam/Receiver/19_-1.ir
+++ b/_CSV-IRDB_/A/Arcam/Receiver/19_-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 13 00 00 00
diff --git a/_CSV-IRDB_/A/Arcam/Surround_Receiver/16_-1.ir b/_CSV-IRDB_/A/Arcam/Surround_Receiver/16_-1.ir
index c38b4a77..78d49535 100644
--- a/_CSV-IRDB_/A/Arcam/Surround_Receiver/16_-1.ir
+++ b/_CSV-IRDB_/A/Arcam/Surround_Receiver/16_-1.ir
@@ -109,25 +109,25 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+_A
+name: VOL+_A
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+_B
+name: VOL+_B
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-_A
+name: VOL-_A
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-_B
+name: VOL-_B
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Arcam/Unknown_AV200/16_-1.ir b/_CSV-IRDB_/A/Arcam/Unknown_AV200/16_-1.ir
index 501cc9e4..3a5822ae 100644
--- a/_CSV-IRDB_/A/Arcam/Unknown_AV200/16_-1.ir
+++ b/_CSV-IRDB_/A/Arcam/Unknown_AV200/16_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 02 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 04 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 06 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 08 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -103,19 +103,19 @@ protocol: NECext
 address: 10 00 00 00
 command: 36 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 37 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 38 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -127,31 +127,31 @@ protocol: NECext
 address: 10 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 50 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 51 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 55 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Arcam/Unknown_Arcam/16_-1.ir b/_CSV-IRDB_/A/Arcam/Unknown_Arcam/16_-1.ir
index bbe95827..60d63638 100644
--- a/_CSV-IRDB_/A/Arcam/Unknown_Arcam/16_-1.ir
+++ b/_CSV-IRDB_/A/Arcam/Unknown_Arcam/16_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 00 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 04 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 06 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 10 00 00 00
 command: 36 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 37 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 38 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Architectural_Audio/Amplifier/132_132.ir b/_CSV-IRDB_/A/Architectural_Audio/Amplifier/132_132.ir
index 8c20da12..eff91dfd 100644
--- a/_CSV-IRDB_/A/Architectural_Audio/Amplifier/132_132.ir
+++ b/_CSV-IRDB_/A/Architectural_Audio/Amplifier/132_132.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 84 00 00
 command: 05 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 84 00 00
diff --git a/_CSV-IRDB_/A/Architectural_Audio/Multi-Zone_Receiver/130_130.ir b/_CSV-IRDB_/A/Architectural_Audio/Multi-Zone_Receiver/130_130.ir
index 23dc90ef..384d6d3d 100644
--- a/_CSV-IRDB_/A/Architectural_Audio/Multi-Zone_Receiver/130_130.ir
+++ b/_CSV-IRDB_/A/Architectural_Audio/Multi-Zone_Receiver/130_130.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 82 82 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 82 82 00 00
 command: 11 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 82 82 00 00
diff --git a/_CSV-IRDB_/A/Aristona/Unknown_5525/0_-1.ir b/_CSV-IRDB_/A/Aristona/Unknown_5525/0_-1.ir
index 8b1161be..7c0f8779 100644
--- a/_CSV-IRDB_/A/Aristona/Unknown_5525/0_-1.ir
+++ b/_CSV-IRDB_/A/Aristona/Unknown_5525/0_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/A/Aristona/Unknown_9067/5_-1.ir b/_CSV-IRDB_/A/Aristona/Unknown_9067/5_-1.ir
index 8d767595..bddc0275 100644
--- a/_CSV-IRDB_/A/Aristona/Unknown_9067/5_-1.ir
+++ b/_CSV-IRDB_/A/Aristona/Unknown_9067/5_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: x/power
+name: x/POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: x/mute
+name: x/MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -319,7 +319,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -331,7 +331,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -355,7 +355,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -367,25 +367,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 52 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/A/Askey/Unknown_AS-218/134_107.ir b/_CSV-IRDB_/A/Askey/Unknown_AS-218/134_107.ir
index 7cc36671..532af08c 100644
--- a/_CSV-IRDB_/A/Askey/Unknown_AS-218/134_107.ir
+++ b/_CSV-IRDB_/A/Askey/Unknown_AS-218/134_107.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/A/Aspire_Digital/Unknown_Digital/8_-1.ir b/_CSV-IRDB_/A/Aspire_Digital/Unknown_Digital/8_-1.ir
index 3aff975c..5c0c8433 100644
--- a/_CSV-IRDB_/A/Aspire_Digital/Unknown_Digital/8_-1.ir
+++ b/_CSV-IRDB_/A/Aspire_Digital/Unknown_Digital/8_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -19,55 +19,55 @@ protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -115,61 +115,61 @@ protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 40 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -223,25 +223,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -253,43 +253,43 @@ protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 54 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 56 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -301,43 +301,43 @@ protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 59 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/A/Astro/Satellite/8_-1.ir b/_CSV-IRDB_/A/Astro/Satellite/8_-1.ir
index a2c709db..be1a56df 100644
--- a/_CSV-IRDB_/A/Astro/Satellite/8_-1.ir
+++ b/_CSV-IRDB_/A/Astro/Satellite/8_-1.ir
@@ -115,13 +115,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/A/Astro/Unknown_ASR340/0_253.ir b/_CSV-IRDB_/A/Astro/Unknown_ASR340/0_253.ir
index ece11f00..0ceffacb 100644
--- a/_CSV-IRDB_/A/Astro/Unknown_ASR340/0_253.ir
+++ b/_CSV-IRDB_/A/Astro/Unknown_ASR340/0_253.ir
@@ -1,169 +1,169 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 03 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 04 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 05 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 06 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 07 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 08 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 0A 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 19 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 1A 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 1B 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 1C 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
 command: 1D 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 FD 00 00
diff --git a/_CSV-IRDB_/A/Asus/Unknown_Digital/0_239.ir b/_CSV-IRDB_/A/Asus/Unknown_Digital/0_239.ir
index 7ffb844e..ceb70164 100644
--- a/_CSV-IRDB_/A/Asus/Unknown_Digital/0_239.ir
+++ b/_CSV-IRDB_/A/Asus/Unknown_Digital/0_239.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 01 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 00 EF 00 00
 command: 08 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 00 EF 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
@@ -49,19 +49,19 @@ protocol: NECext
 address: 00 EF 00 00
 command: 0C 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 0E 00 00 00
 #
-name: quick_power
+name: quick_POWER
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
diff --git a/_CSV-IRDB_/A/Asus/Unknown_RC1974502/4_15.ir b/_CSV-IRDB_/A/Asus/Unknown_RC1974502/4_15.ir
index 9d42fa49..06975d49 100644
--- a/_CSV-IRDB_/A/Asus/Unknown_RC1974502/4_15.ir
+++ b/_CSV-IRDB_/A/Asus/Unknown_RC1974502/4_15.ir
@@ -1,277 +1,277 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_H
+name: H
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_S
+name: S
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/A/Asus/Unknown_TVBox/134_107.ir b/_CSV-IRDB_/A/Asus/Unknown_TVBox/134_107.ir
index b123062b..ea07c3d2 100644
--- a/_CSV-IRDB_/A/Asus/Unknown_TVBox/134_107.ir
+++ b/_CSV-IRDB_/A/Asus/Unknown_TVBox/134_107.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/A/Aten/Unknown_VS-431/0_-1.ir b/_CSV-IRDB_/A/Aten/Unknown_VS-431/0_-1.ir
index dc9f8907..4dce7b50 100644
--- a/_CSV-IRDB_/A/Aten/Unknown_VS-431/0_-1.ir
+++ b/_CSV-IRDB_/A/Aten/Unknown_VS-431/0_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/A/Atlanta_DTH/Unknown_DTH/5_-1.ir b/_CSV-IRDB_/A/Atlanta_DTH/Unknown_DTH/5_-1.ir
index 93aefa09..24a31ba9 100644
--- a/_CSV-IRDB_/A/Atlanta_DTH/Unknown_DTH/5_-1.ir
+++ b/_CSV-IRDB_/A/Atlanta_DTH/Unknown_DTH/5_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -25,25 +25,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -73,61 +73,61 @@ protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/A/Atlantic_Technology/Surround_Processor/64_64.ir b/_CSV-IRDB_/A/Atlantic_Technology/Surround_Processor/64_64.ir
index 95a13674..5c794c24 100644
--- a/_CSV-IRDB_/A/Atlantic_Technology/Surround_Processor/64_64.ir
+++ b/_CSV-IRDB_/A/Atlantic_Technology/Surround_Processor/64_64.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 72 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/A/AudioSource/Unknown_SS-Three/6_1.ir b/_CSV-IRDB_/A/AudioSource/Unknown_SS-Three/6_1.ir
index 39b89182..f4a12134 100644
--- a/_CSV-IRDB_/A/AudioSource/Unknown_SS-Three/6_1.ir
+++ b/_CSV-IRDB_/A/AudioSource/Unknown_SS-Three/6_1.ir
@@ -73,19 +73,19 @@ protocol: NECext
 address: 06 00 00 00
 command: 22 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 06 01 00 00
 command: 40 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 41 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 06 01 00 00
diff --git a/_CSV-IRDB_/A/Audio_Access/Pre-Amplifier/133_83.ir b/_CSV-IRDB_/A/Audio_Access/Pre-Amplifier/133_83.ir
index abaef89e..ff86c2f5 100644
--- a/_CSV-IRDB_/A/Audio_Access/Pre-Amplifier/133_83.ir
+++ b/_CSV-IRDB_/A/Audio_Access/Pre-Amplifier/133_83.ir
@@ -133,13 +133,13 @@ protocol: NECext
 address: 85 53 00 00
 command: 8C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 85 53 00 00
 command: 8D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 85 53 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 85 53 00 00
 command: 96 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 85 53 00 00
diff --git a/_CSV-IRDB_/A/Audio_Refinement/Amplifier/20_-1.ir b/_CSV-IRDB_/A/Audio_Refinement/Amplifier/20_-1.ir
index 57c61644..91e334a1 100644
--- a/_CSV-IRDB_/A/Audio_Refinement/Amplifier/20_-1.ir
+++ b/_CSV-IRDB_/A/Audio_Refinement/Amplifier/20_-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/A/Audio_Research/Pre-Amplifier/7_-1.ir b/_CSV-IRDB_/A/Audio_Research/Pre-Amplifier/7_-1.ir
index 8d1e8438..57e40daa 100644
--- a/_CSV-IRDB_/A/Audio_Research/Pre-Amplifier/7_-1.ir
+++ b/_CSV-IRDB_/A/Audio_Research/Pre-Amplifier/7_-1.ir
@@ -175,7 +175,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+_A
+name: VOL+_A
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+_B
+name: VOL+_B
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: VOLUME_-_A
+name: VOL-_A
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: VOLUME_-_B
+name: VOL-_B
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/A/Audiovox/Unknown_SIR/16_-1.ir b/_CSV-IRDB_/A/Audiovox/Unknown_SIR/16_-1.ir
index 26c295e2..73f9b87c 100644
--- a/_CSV-IRDB_/A/Audiovox/Unknown_SIR/16_-1.ir
+++ b/_CSV-IRDB_/A/Audiovox/Unknown_SIR/16_-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 02 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 04 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 10 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 14 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -115,31 +115,31 @@ protocol: NECext
 address: 10 00 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 18 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/Audiovox/Unknown_Sirius/16_-1.ir b/_CSV-IRDB_/A/Audiovox/Unknown_Sirius/16_-1.ir
index 4e999bcf..8c5622f8 100644
--- a/_CSV-IRDB_/A/Audiovox/Unknown_Sirius/16_-1.ir
+++ b/_CSV-IRDB_/A/Audiovox/Unknown_Sirius/16_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 00 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -31,25 +31,25 @@ protocol: NECext
 address: 10 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -61,25 +61,25 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 14 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 10 00 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 18 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/AutumnWave/Unknown_Onair/8_-1.ir b/_CSV-IRDB_/A/AutumnWave/Unknown_Onair/8_-1.ir
index 21f55a70..844f763e 100644
--- a/_CSV-IRDB_/A/AutumnWave/Unknown_Onair/8_-1.ir
+++ b/_CSV-IRDB_/A/AutumnWave/Unknown_Onair/8_-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -85,121 +85,121 @@ protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -211,73 +211,73 @@ protocol: NECext
 address: 08 00 00 00
 command: 22 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 23 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 24 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 26 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 27 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 28 00 00 00
 #
-name: KEY_F5
+name: F5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 29 00 00 00
 #
-name: KEY_F6
+name: F6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_F7
+name: F7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_F8
+name: F8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/A/Avermedia/Unknown_AVerTV5/0_237.ir b/_CSV-IRDB_/A/Avermedia/Unknown_AVerTV5/0_237.ir
index 0f1bf9a8..012cc0cb 100644
--- a/_CSV-IRDB_/A/Avermedia/Unknown_AVerTV5/0_237.ir
+++ b/_CSV-IRDB_/A/Avermedia/Unknown_AVerTV5/0_237.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -67,19 +67,19 @@ protocol: NECext
 address: 00 ED 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 0C 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 0F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 00 ED 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 13 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 00 ED 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 00 ED 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
diff --git a/_CSV-IRDB_/A/Avermedia/Unknown_Avermedia/64_-1.ir b/_CSV-IRDB_/A/Avermedia/Unknown_Avermedia/64_-1.ir
index 1d315803..8580b582 100644
--- a/_CSV-IRDB_/A/Avermedia/Unknown_Avermedia/64_-1.ir
+++ b/_CSV-IRDB_/A/Avermedia/Unknown_Avermedia/64_-1.ir
@@ -7,61 +7,61 @@ protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 18 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/A/Avermedia/Unknown_RM-H7/0_237.ir b/_CSV-IRDB_/A/Avermedia/Unknown_RM-H7/0_237.ir
index 745b5824..f4faa286 100644
--- a/_CSV-IRDB_/A/Avermedia/Unknown_RM-H7/0_237.ir
+++ b/_CSV-IRDB_/A/Avermedia/Unknown_RM-H7/0_237.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 ED 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -79,37 +79,37 @@ protocol: NECext
 address: 00 ED 00 00
 command: 0E 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 0F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 10 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 13 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 ED 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 00 ED 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
@@ -163,37 +163,37 @@ protocol: NECext
 address: 00 ED 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 40 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 41 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
 command: 42 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 ED 00 00
diff --git a/_CSV-IRDB_/A/Avermedia/Unknown_RM-KV/4_-1.ir b/_CSV-IRDB_/A/Avermedia/Unknown_RM-KV/4_-1.ir
index ff22485e..aefd7c37 100644
--- a/_CSV-IRDB_/A/Avermedia/Unknown_RM-KV/4_-1.ir
+++ b/_CSV-IRDB_/A/Avermedia/Unknown_RM-KV/4_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -43,103 +43,103 @@ protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 04 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 42 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 44 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -229,37 +229,37 @@ protocol: NECext
 address: 04 00 00 00
 command: 46 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 47 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 48 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 49 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_DOT
+name: DOT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/A/Avex/Unknown_AVEX-AV5609/5_-1.ir b/_CSV-IRDB_/A/Avex/Unknown_AVEX-AV5609/5_-1.ir
index 0b8f8f6d..23c647ed 100644
--- a/_CSV-IRDB_/A/Avex/Unknown_AVEX-AV5609/5_-1.ir
+++ b/_CSV-IRDB_/A/Avex/Unknown_AVEX-AV5609/5_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -13,19 +13,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -61,31 +61,31 @@ protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/A/Avex/Unknown_AVEX-RC501/5_-1.ir b/_CSV-IRDB_/A/Avex/Unknown_AVEX-RC501/5_-1.ir
index 0ce1dc60..8a427002 100644
--- a/_CSV-IRDB_/A/Avex/Unknown_AVEX-RC501/5_-1.ir
+++ b/_CSV-IRDB_/A/Avex/Unknown_AVEX-RC501/5_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/A/Avtoolbox/Unknown_hdswitch/32_-1.ir b/_CSV-IRDB_/A/Avtoolbox/Unknown_hdswitch/32_-1.ir
index 1affd3e1..fcf6752c 100644
--- a/_CSV-IRDB_/A/Avtoolbox/Unknown_hdswitch/32_-1.ir
+++ b/_CSV-IRDB_/A/Avtoolbox/Unknown_hdswitch/32_-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/A/Axion/Unknown_AXN-6075/2_255.ir b/_CSV-IRDB_/A/Axion/Unknown_AXN-6075/2_255.ir
index 4951b6fa..6ac71fbf 100644
--- a/_CSV-IRDB_/A/Axion/Unknown_AXN-6075/2_255.ir
+++ b/_CSV-IRDB_/A/Axion/Unknown_AXN-6075/2_255.ir
@@ -7,133 +7,133 @@ protocol: NECext
 address: 02 FF 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 07 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 08 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 0A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 0B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 0D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 0F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 10 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 12 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 1B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 1C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
@@ -145,55 +145,55 @@ protocol: NECext
 address: 02 FF 00 00
 command: 1E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 44 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 48 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 49 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 50 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 51 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 54 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 55 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
diff --git a/_CSV-IRDB_/A/Axonix/MediaMax/17_20.ir b/_CSV-IRDB_/A/Axonix/MediaMax/17_20.ir
index 3f57cf9c..de205de0 100644
--- a/_CSV-IRDB_/A/Axonix/MediaMax/17_20.ir
+++ b/_CSV-IRDB_/A/Axonix/MediaMax/17_20.ir
@@ -37,13 +37,13 @@ protocol: NECext
 address: 11 14 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-_B
+name: VOL-_B
 type: parsed
 protocol: NECext
 address: 11 14 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 11 14 00 00
 command: 29 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 2D 00 00 00
 #
-name: VOLUME_+_B
+name: VOL+_B
 type: parsed
 protocol: NECext
 address: 11 14 00 00
diff --git a/_CSV-IRDB_/A/Axonix/Media_Server/17_-1.ir b/_CSV-IRDB_/A/Axonix/Media_Server/17_-1.ir
index 37763d05..04b23183 100644
--- a/_CSV-IRDB_/A/Axonix/Media_Server/17_-1.ir
+++ b/_CSV-IRDB_/A/Axonix/Media_Server/17_-1.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 4C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 4E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/A/Ayre/Amplifier/16_-1.ir b/_CSV-IRDB_/A/Ayre/Amplifier/16_-1.ir
index 7f3bef6f..1505b0f3 100644
--- a/_CSV-IRDB_/A/Ayre/Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/A/Ayre/Amplifier/16_-1.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/A/AzBox/Unknown_S700/1_4.ir b/_CSV-IRDB_/A/AzBox/Unknown_S700/1_4.ir
index d7814a37..56d505d2 100644
--- a/_CSV-IRDB_/A/AzBox/Unknown_S700/1_4.ir
+++ b/_CSV-IRDB_/A/AzBox/Unknown_S700/1_4.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 01 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 02 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 03 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 04 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 01 04 00 00
 command: 06 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 07 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 04 00 00
@@ -79,73 +79,73 @@ protocol: NECext
 address: 01 04 00 00
 command: 0C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 0F 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 11 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 12 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 13 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 04 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 01 04 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 1B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 04 00 00
@@ -181,37 +181,37 @@ protocol: NECext
 address: 01 04 00 00
 command: 1E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 1F 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 40 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 42 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 43 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 44 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 01 04 00 00
@@ -235,25 +235,25 @@ protocol: NECext
 address: 01 04 00 00
 command: 49 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 55 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 56 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 01 04 00 00
 command: 58 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 01 04 00 00
diff --git a/_CSV-IRDB_/A/anysee/Unknown_anysee/8_-1.ir b/_CSV-IRDB_/A/anysee/Unknown_anysee/8_-1.ir
index 776ad273..570eda9c 100644
--- a/_CSV-IRDB_/A/anysee/Unknown_anysee/8_-1.ir
+++ b/_CSV-IRDB_/A/anysee/Unknown_anysee/8_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -79,55 +79,55 @@ protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -169,37 +169,37 @@ protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -211,55 +211,55 @@ protocol: NECext
 address: 08 00 00 00
 command: 22 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 24 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 25 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/A/audiosonic/Unknown_TXCD-1240/129_129.ir b/_CSV-IRDB_/A/audiosonic/Unknown_TXCD-1240/129_129.ir
index dfcabea8..27d6b93c 100644
--- a/_CSV-IRDB_/A/audiosonic/Unknown_TXCD-1240/129_129.ir
+++ b/_CSV-IRDB_/A/audiosonic/Unknown_TXCD-1240/129_129.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 81 81 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 81 81 00 00
 command: 12 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 81 81 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 81 81 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 81 81 00 00
 command: 60 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 81 81 00 00
diff --git a/_CSV-IRDB_/B/B.A.T/Pre-Amplifier/16_-1.ir b/_CSV-IRDB_/B/B.A.T/Pre-Amplifier/16_-1.ir
index ce525837..cec3b025 100644
--- a/_CSV-IRDB_/B/B.A.T/Pre-Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/B/B.A.T/Pre-Amplifier/16_-1.ir
@@ -37,13 +37,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/B/BBK/Unknown_PV400s/80_-1.ir b/_CSV-IRDB_/B/BBK/Unknown_PV400s/80_-1.ir
index c498c373..a07e8574 100644
--- a/_CSV-IRDB_/B/BBK/Unknown_PV400s/80_-1.ir
+++ b/_CSV-IRDB_/B/BBK/Unknown_PV400s/80_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 09 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -49,31 +49,31 @@ protocol: NECext
 address: 50 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 13 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 14 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -91,37 +91,37 @@ protocol: NECext
 address: 50 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 50 00 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 56 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 57 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 59 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/B/BBK/Unknown_Popcorn/4_203.ir b/_CSV-IRDB_/B/BBK/Unknown_Popcorn/4_203.ir
index d505a8f1..681c454e 100644
--- a/_CSV-IRDB_/B/BBK/Unknown_Popcorn/4_203.ir
+++ b/_CSV-IRDB_/B/BBK/Unknown_Popcorn/4_203.ir
@@ -1,301 +1,301 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 01 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 03 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 07 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 09 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 0A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 0D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 0E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 11 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 12 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 13 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 15 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 17 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 1A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 1B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 1D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 41 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 42 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 43 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 46 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 47 00 00 00
 #
-name: KEY_FILE
+name: FILE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 48 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4C 00 00 00
 #
-name: KEY_SUSPEND
+name: SUSPEND
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4E 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 52 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 53 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 54 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 55 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 56 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 57 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 58 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 59 00 00 00
 #
-name: KEY_CAPSLOCK
+name: CAPSLOCK
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 5A 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 5B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 5C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
diff --git a/_CSV-IRDB_/B/BBK/Unknown_RC022-03R/73_-1.ir b/_CSV-IRDB_/B/BBK/Unknown_RC022-03R/73_-1.ir
index 4f1c3dc7..fb9ab9a6 100644
--- a/_CSV-IRDB_/B/BBK/Unknown_RC022-03R/73_-1.ir
+++ b/_CSV-IRDB_/B/BBK/Unknown_RC022-03R/73_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 00 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -31,37 +31,37 @@ protocol: NECext
 address: 49 00 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 06 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 49 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 49 00 00 00
 command: 11 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 12 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 13 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 49 00 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 49 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 41 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -175,37 +175,37 @@ protocol: NECext
 address: 49 00 00 00
 command: 43 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 44 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 45 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 46 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 47 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 48 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -217,49 +217,49 @@ protocol: NECext
 address: 49 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 51 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -277,13 +277,13 @@ protocol: NECext
 address: 49 00 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 49 00 00 00
diff --git a/_CSV-IRDB_/B/BORK/Unknown_DV/8_-1.ir b/_CSV-IRDB_/B/BORK/Unknown_DV/8_-1.ir
index 56ef9deb..f3b0422d 100644
--- a/_CSV-IRDB_/B/BORK/Unknown_DV/8_-1.ir
+++ b/_CSV-IRDB_/B/BORK/Unknown_DV/8_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -91,49 +91,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -223,49 +223,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -277,25 +277,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 56 00 00 00
 #
-name: KEY_KEYBOARD
+name: KEYBOARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/B/Barco/Unknown_barcoRC5/0_-1.ir b/_CSV-IRDB_/B/Barco/Unknown_barcoRC5/0_-1.ir
index e1be7f88..f69b0964 100644
--- a/_CSV-IRDB_/B/Barco/Unknown_barcoRC5/0_-1.ir
+++ b/_CSV-IRDB_/B/Barco/Unknown_barcoRC5/0_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: audio-mute
+name: audio-MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,19 +241,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -265,31 +265,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_F5
+name: F5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/B/Barco/Video_Projector/0_-1.ir b/_CSV-IRDB_/B/Barco/Video_Projector/0_-1.ir
index ad5d23a0..35e76794 100644
--- a/_CSV-IRDB_/B/Barco/Video_Projector/0_-1.ir
+++ b/_CSV-IRDB_/B/Barco/Video_Projector/0_-1.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/B/Barix/CD_Jukebox/0_127.ir b/_CSV-IRDB_/B/Barix/CD_Jukebox/0_127.ir
index 45595bb2..6507588c 100644
--- a/_CSV-IRDB_/B/Barix/CD_Jukebox/0_127.ir
+++ b/_CSV-IRDB_/B/Barix/CD_Jukebox/0_127.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 00 7F 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/_CSV-IRDB_/B/Beko/Unknown_Beko/7_-1.ir b/_CSV-IRDB_/B/Beko/Unknown_Beko/7_-1.ir
index 7acf7c72..de29b8ac 100644
--- a/_CSV-IRDB_/B/Beko/Unknown_Beko/7_-1.ir
+++ b/_CSV-IRDB_/B/Beko/Unknown_Beko/7_-1.ir
@@ -97,7 +97,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/B/Beko/Unknown_TV/0_-1.ir b/_CSV-IRDB_/B/Beko/Unknown_TV/0_-1.ir
index d3f75fc4..038c6165 100644
--- a/_CSV-IRDB_/B/Beko/Unknown_TV/0_-1.ir
+++ b/_CSV-IRDB_/B/Beko/Unknown_TV/0_-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,67 +37,67 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: X_KEY_1_X_CHANNELS
+name: X_1_X_CHANNELS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,37 +169,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/B/Belkin/Unknown_F5X019/27_-1.ir b/_CSV-IRDB_/B/Belkin/Unknown_F5X019/27_-1.ir
index d88f70d4..f2e85edf 100644
--- a/_CSV-IRDB_/B/Belkin/Unknown_F5X019/27_-1.ir
+++ b/_CSV-IRDB_/B/Belkin/Unknown_F5X019/27_-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 41 00 00 00
 #
-name: key_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 41 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 43 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 46 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 48 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 49 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 49 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 61 00 00 00
 #
-name: KEY_DIRECT
+name: DIRECT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 62 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 70 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/B/Bell/Satellite/128_0.ir b/_CSV-IRDB_/B/Bell/Satellite/128_0.ir
index 89ed12c2..8c2ee1cb 100644
--- a/_CSV-IRDB_/B/Bell/Satellite/128_0.ir
+++ b/_CSV-IRDB_/B/Bell/Satellite/128_0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/B/Bell/Satellite/24_0.ir b/_CSV-IRDB_/B/Bell/Satellite/24_0.ir
index 7fe124c4..b0446e66 100644
--- a/_CSV-IRDB_/B/Bell/Satellite/24_0.ir
+++ b/_CSV-IRDB_/B/Bell/Satellite/24_0.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 16 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 1B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/B/Bell_ExpressVu/Satellite/16_0.ir b/_CSV-IRDB_/B/Bell_ExpressVu/Satellite/16_0.ir
index 2d1bb706..c14079de 100644
--- a/_CSV-IRDB_/B/Bell_ExpressVu/Satellite/16_0.ir
+++ b/_CSV-IRDB_/B/Bell_ExpressVu/Satellite/16_0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 19 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/B/Bellagio/Unknown_P807/32_-1.ir b/_CSV-IRDB_/B/Bellagio/Unknown_P807/32_-1.ir
index 1d04f91c..3fdf254c 100644
--- a/_CSV-IRDB_/B/Bellagio/Unknown_P807/32_-1.ir
+++ b/_CSV-IRDB_/B/Bellagio/Unknown_P807/32_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -13,73 +13,73 @@ protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 18 00 00 00
 #
-name: X_KEY_1/all
+name: X_1/all
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -133,43 +133,43 @@ protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 42 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -205,31 +205,31 @@ protocol: NECext
 address: 20 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/B/BenQ/Projector/48_-1.ir b/_CSV-IRDB_/B/BenQ/Projector/48_-1.ir
index 920400a6..085df07c 100644
--- a/_CSV-IRDB_/B/BenQ/Projector/48_-1.ir
+++ b/_CSV-IRDB_/B/BenQ/Projector/48_-1.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 18 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/B/BenQ/Unknown_DV3080/96_-1.ir b/_CSV-IRDB_/B/BenQ/Unknown_DV3080/96_-1.ir
index 75d5a8e9..34f29d88 100644
--- a/_CSV-IRDB_/B/BenQ/Unknown_DV3080/96_-1.ir
+++ b/_CSV-IRDB_/B/BenQ/Unknown_DV3080/96_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 00 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 60 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 60 00 00 00
 command: 11 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 60 00 00 00
@@ -97,49 +97,49 @@ protocol: NECext
 address: 60 00 00 00
 command: 13 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 19 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 42 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 60 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 60 00 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 60 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 60 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 51 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 60 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 60 00 00 00
 command: 58 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 60 00 00 00
diff --git a/_CSV-IRDB_/B/BenQ/Unknown_MP620/0_48.ir b/_CSV-IRDB_/B/BenQ/Unknown_MP620/0_48.ir
index fefcce40..7805cc58 100644
--- a/_CSV-IRDB_/B/BenQ/Unknown_MP620/0_48.ir
+++ b/_CSV-IRDB_/B/BenQ/Unknown_MP620/0_48.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 02 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 03 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 04 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 05 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 30 00 00
@@ -55,31 +55,31 @@ protocol: NECext
 address: 00 30 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 30 00 00
diff --git a/_CSV-IRDB_/B/BenQ/Unknown_W1070/0_48.ir b/_CSV-IRDB_/B/BenQ/Unknown_W1070/0_48.ir
index 31429bc9..cee2984c 100644
--- a/_CSV-IRDB_/B/BenQ/Unknown_W1070/0_48.ir
+++ b/_CSV-IRDB_/B/BenQ/Unknown_W1070/0_48.ir
@@ -25,37 +25,37 @@ protocol: NECext
 address: 00 30 00 00
 command: 08 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 30 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 00 30 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 30 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 00 30 00 00
 command: 41 00 00 00
 #
-name: KEY_SUSPEND
+name: SUSPEND
 type: parsed
 protocol: NECext
 address: 00 30 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 00 30 00 00
 command: 4E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 30 00 00
 command: 4F 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 00 30 00 00
diff --git a/_CSV-IRDB_/B/Bench/Unknown_kh2800/48_-1.ir b/_CSV-IRDB_/B/Bench/Unknown_kh2800/48_-1.ir
index 4a5c9b24..21ee4d17 100644
--- a/_CSV-IRDB_/B/Bench/Unknown_kh2800/48_-1.ir
+++ b/_CSV-IRDB_/B/Bench/Unknown_kh2800/48_-1.ir
@@ -19,31 +19,31 @@ protocol: NECext
 address: 30 00 00 00
 command: 04 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 05 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 06 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 09 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 30 00 00 00
 command: 11 00 00 00
 #
-name: X_KEY_1EXT
+name: X_1EXT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 56 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/B/Bluesky/Unknown_DV900/5_-1.ir b/_CSV-IRDB_/B/Bluesky/Unknown_DV900/5_-1.ir
index 7718b3f5..fa0057a6 100644
--- a/_CSV-IRDB_/B/Bluesky/Unknown_DV900/5_-1.ir
+++ b/_CSV-IRDB_/B/Bluesky/Unknown_DV900/5_-1.ir
@@ -1,199 +1,199 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_DIRECTORY
+name: DIRECTORY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_CAMERA
+name: CAMERA
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/2-Channel_Preamp/11_79.ir b/_CSV-IRDB_/B/BnK_Components/2-Channel_Preamp/11_79.ir
index f8f9d1ad..6fa1143c 100644
--- a/_CSV-IRDB_/B/BnK_Components/2-Channel_Preamp/11_79.ir
+++ b/_CSV-IRDB_/B/BnK_Components/2-Channel_Preamp/11_79.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/11_79.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/11_79.ir
index 11b91f9e..a9280e1e 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/11_79.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/11_79.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/123_72.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/123_72.ir
index 8c08a68f..0f633b59 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/123_72.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/123_72.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 7B 48 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 7B 48 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 7B 48 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7B 48 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/139_71.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/139_71.ir
index 71731166..78d516d1 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/139_71.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/139_71.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 8B 47 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 8B 47 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 8B 47 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 8B 47 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 8B 47 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/187_-1.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/187_-1.ir
index b44324fe..b2a5c340 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/187_-1.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/187_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: BB 00 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: BB 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: BB 00 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: BB 00 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/203_67.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/203_67.ir
index 1b9809b4..44f8531c 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/203_67.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/203_67.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: CB 43 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: CB 43 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: CB 43 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: CB 43 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: CB 43 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/219_66.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/219_66.ir
index 24bae856..ff4d4a7f 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/219_66.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/219_66.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: DB 42 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: DB 42 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: DB 42 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: DB 42 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/242_208.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/242_208.ir
index 9cbc3872..7ab9b140 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/242_208.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/242_208.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: F2 D0 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: F2 D0 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: F2 D0 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: F2 D0 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: F2 D0 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: F2 D0 00 00
 command: 24 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: F2 D0 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/243_192.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/243_192.ir
index 032a5ad9..3c0dd46d 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/243_192.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/243_192.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: F3 C0 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: F3 C0 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: F3 C0 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: F3 C0 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/251_64.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/251_64.ir
index 8af08317..6a843532 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/251_64.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/251_64.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: FB 40 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: FB 40 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: FB 40 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: FB 40 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/27_78.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/27_78.ir
index b813b71a..1495fc51 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/27_78.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/27_78.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/43_77.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/43_77.ir
index 06d136b8..edd1a604 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/43_77.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/43_77.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 2B 4D 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 2B 4D 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 2B 4D 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 2B 4D 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 2B 4D 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/59_76.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/59_76.ir
index 73615951..8ab43a6b 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/59_76.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/59_76.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 3B 4C 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 3B 4C 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 3B 4C 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 3B 4C 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/75_75.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/75_75.ir
index 61ea1323..3acc3b97 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/75_75.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/75_75.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 4B 4B 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 4B 4B 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 4B 4B 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 4B 4B 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 4B 4B 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/91_74.ir b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/91_74.ir
index 60be1b88..9be06dfa 100644
--- a/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/91_74.ir
+++ b/_CSV-IRDB_/B/BnK_Components/6-Zone_Receiver/91_74.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 5B 4A 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 5B 4A 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 5B 4A 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 5B 4A 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/0_-1.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/0_-1.ir
index fa019eb2..b3a07ee3 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/0_-1.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/0_-1.ir
@@ -91,13 +91,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/103_137.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/103_137.ir
index 8549a60d..24c757ad 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/103_137.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/103_137.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 67 89 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 67 89 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 67 89 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/108_57.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/108_57.ir
index fe042d0d..40bc152d 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/108_57.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/108_57.ir
@@ -115,13 +115,13 @@ protocol: NECext
 address: 6C 39 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6C 39 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6C 39 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/111_9.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/111_9.ir
index f6a7a0be..3c2dc607 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/111_9.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/111_9.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 6F 09 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6F 09 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6F 09 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/119_-1.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/119_-1.ir
index 2920140c..926d5fb2 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/119_-1.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/119_-1.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: 77 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 77 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 77 00 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 77 00 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/123_72.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/123_72.ir
index 8c08a68f..0f633b59 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/123_72.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/123_72.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 7B 48 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 7B 48 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 7B 48 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7B 48 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/127_8.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/127_8.ir
index 37e18ca1..1d482c92 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/127_8.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/127_8.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 7F 08 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7F 08 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7F 08 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/128_247.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/128_247.ir
index 4bec0502..feb5b40a 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/128_247.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/128_247.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 80 F7 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 F7 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 F7 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/135_135.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/135_135.ir
index 6e161624..9b774706 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/135_135.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/135_135.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 87 87 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 87 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 87 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/143_7.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/143_7.ir
index 044de1ee..f79c0faa 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/143_7.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/143_7.ir
@@ -127,7 +127,7 @@ protocol: NECext
 address: 8F 07 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 8F 07 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 8F 07 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 8F 07 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/159_6.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/159_6.ir
index 8a9f57f8..56032b04 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/159_6.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/159_6.ir
@@ -103,13 +103,13 @@ protocol: NECext
 address: 9F 06 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9F 06 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9F 06 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/15_15.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/15_15.ir
index 3f8fa037..1aceb1d0 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/15_15.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/15_15.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 0F 0F 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 0F 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 0F 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/167_133.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/167_133.ir
index f9314603..a5656238 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/167_133.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/167_133.ir
@@ -103,13 +103,13 @@ protocol: NECext
 address: A7 85 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A7 85 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A7 85 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/172_53.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/172_53.ir
index be9fcd3a..69f741b6 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/172_53.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/172_53.ir
@@ -139,13 +139,13 @@ protocol: NECext
 address: AC 35 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: AC 35 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: AC 35 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/183_132.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/183_132.ir
index 9c7ddbe4..85aa9c82 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/183_132.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/183_132.ir
@@ -91,13 +91,13 @@ protocol: NECext
 address: B7 84 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: B7 84 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: B7 84 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/187_-1.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/187_-1.ir
index b44324fe..b2a5c340 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/187_-1.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/187_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: BB 00 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: BB 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: BB 00 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: BB 00 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/192_243.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/192_243.ir
index e8d4c8a2..3690a298 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/192_243.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/192_243.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: C0 F3 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: C0 F3 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: C0 F3 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/199_131.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/199_131.ir
index 5581abd3..d63ef924 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/199_131.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/199_131.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: C7 83 00 00
 command: 03 00 00 00
 #
-name: 021_VOLUME_-
+name: 021_VOL-
 type: parsed
 protocol: NECext
 address: C7 83 00 00
 command: 23 00 00 00
 #
-name: 021_VOLUME_+
+name: 021_VOL+
 type: parsed
 protocol: NECext
 address: C7 83 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/204_-1.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/204_-1.ir
index 0a4b4a26..f5de3daf 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/204_-1.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/204_-1.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: CC 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: CC 00 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: CC 00 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/219_66.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/219_66.ir
index a65f705b..f0281094 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/219_66.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/219_66.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: DB 42 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: DB 42 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: DB 42 00 00
 command: 23 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: DB 42 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: DB 42 00 00
 command: 24 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: DB 42 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/223_2.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/223_2.ir
index f4cfd75d..7ee80995 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/223_2.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/223_2.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: DF 02 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: DF 02 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: DF 02 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/239_1.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/239_1.ir
index 03e53ef5..bc076f66 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/239_1.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/239_1.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: EF 01 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: EF 01 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: EF 01 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/23_142.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/23_142.ir
index f9a75035..465813ed 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/23_142.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/23_142.ir
@@ -115,13 +115,13 @@ protocol: NECext
 address: 17 8E 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 17 8E 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 17 8E 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/242_208.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/242_208.ir
index 2c5532a4..6ed6ae8e 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/242_208.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/242_208.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: F2 D0 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: F2 D0 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: F2 D0 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: F2 D0 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/243_192.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/243_192.ir
index 360f272b..8558f248 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/243_192.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/243_192.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: F3 C0 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: F3 C0 00 00
@@ -235,19 +235,19 @@ protocol: NECext
 address: F3 C0 00 00
 command: 23 00 00 00
 #
-name: 016_VOLUME_-
+name: 016_VOL-
 type: parsed
 protocol: NECext
 address: F3 C0 00 00
 command: 23 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: F3 C0 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: F3 C0 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: F3 C0 00 00
 command: 24 00 00 00
 #
-name: 016_VOLUME_+
+name: 016_VOL+
 type: parsed
 protocol: NECext
 address: F3 C0 00 00
 command: 24 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: F3 C0 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/247_128.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/247_128.ir
index d692746a..f48246f4 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/247_128.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/247_128.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: F7 80 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: F7 80 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: F7 80 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/251_64.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/251_64.ir
index 8af08317..6a843532 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/251_64.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/251_64.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: FB 40 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: FB 40 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: FB 40 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: FB 40 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/255_-1.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/255_-1.ir
index 2b42910b..3d7542b5 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/255_-1.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/255_-1.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: FF 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: FF 00 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: FF 00 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/31_14.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/31_14.ir
index 9aa34849..f71a1075 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/31_14.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/31_14.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 1F 0E 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1F 0E 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1F 0E 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/39_141.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/39_141.ir
index 9e69a5cb..1fc7c2e7 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/39_141.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/39_141.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 27 8D 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 27 8D 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 27 8D 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/44_61.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/44_61.ir
index 2cf91cfc..104c2697 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/44_61.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/44_61.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: 2C 3D 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 2C 3D 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 2C 3D 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 2C 3D 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/59_76.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/59_76.ir
index 73615951..8ab43a6b 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/59_76.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/59_76.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 3B 4C 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 3B 4C 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 3B 4C 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 3B 4C 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/63_12.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/63_12.ir
index 3a09eb9f..8ef6f49b 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/63_12.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/63_12.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 3F 0C 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 3F 0C 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 3F 0C 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/64_251.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/64_251.ir
index c814a1d1..1f5d6c10 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/64_251.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/64_251.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 40 FB 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 FB 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 FB 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/71_139.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/71_139.ir
index c60ae7b5..fb964052 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/71_139.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/71_139.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 47 8B 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 47 8B 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 47 8B 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/76_59.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/76_59.ir
index 2bfd5564..3a561729 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/76_59.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/76_59.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 4C 3B 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 4C 3B 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 4C 3B 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/7_143.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/7_143.ir
index a60d9397..feb1b85d 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/7_143.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/7_143.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 07 8F 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 8F 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 8F 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/91_74.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/91_74.ir
index 60be1b88..9be06dfa 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/91_74.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/91_74.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 5B 4A 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 5B 4A 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 5B 4A 00 00
 command: 23 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 5B 4A 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/95_10.ir b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/95_10.ir
index d3d8348c..c46db552 100644
--- a/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/95_10.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Matrix_Switcher/95_10.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 5F 0A 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 5F 0A 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 5F 0A 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Pre-Amplifier/11_79.ir b/_CSV-IRDB_/B/BnK_Components/Pre-Amplifier/11_79.ir
index 73b1a1db..578b023a 100644
--- a/_CSV-IRDB_/B/BnK_Components/Pre-Amplifier/11_79.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Pre-Amplifier/11_79.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Pre-Amplifier/27_78.ir b/_CSV-IRDB_/B/BnK_Components/Pre-Amplifier/27_78.ir
index 0bed78a8..8c5d6bb9 100644
--- a/_CSV-IRDB_/B/BnK_Components/Pre-Amplifier/27_78.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Pre-Amplifier/27_78.ir
@@ -37,7 +37,7 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
@@ -601,13 +601,13 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 22 00 00 00
 #
-name: MASTER_VOLUME_-
+name: MASTER_VOL-
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
 command: 23 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
@@ -631,13 +631,13 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 23 00 00 00
 #
-name: MASTER_VOLUME_+
+name: MASTER_VOL+
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
 command: 24 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Receiver/27_78.ir b/_CSV-IRDB_/B/BnK_Components/Receiver/27_78.ir
index 29dc7cc0..c918e788 100644
--- a/_CSV-IRDB_/B/BnK_Components/Receiver/27_78.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Receiver/27_78.ir
@@ -583,13 +583,13 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 22 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
 command: 23 00 00 00
 #
-name: 00_VOLUME_-
+name: 00_VOL-
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
@@ -607,13 +607,13 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
 command: 24 00 00 00
 #
-name: 00_VOLUME_+
+name: 00_VOL+
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Surround_Processor/11_79.ir b/_CSV-IRDB_/B/BnK_Components/Surround_Processor/11_79.ir
index a14b0435..7fa58b42 100644
--- a/_CSV-IRDB_/B/BnK_Components/Surround_Processor/11_79.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Surround_Processor/11_79.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 02 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 0B 4F 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 4F 00 00
diff --git a/_CSV-IRDB_/B/BnK_Components/Surround_Processor/27_78.ir b/_CSV-IRDB_/B/BnK_Components/Surround_Processor/27_78.ir
index 2549520c..15d89d42 100644
--- a/_CSV-IRDB_/B/BnK_Components/Surround_Processor/27_78.ir
+++ b/_CSV-IRDB_/B/BnK_Components/Surround_Processor/27_78.ir
@@ -211,7 +211,7 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 1B 4E 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 4E 00 00
diff --git a/_CSV-IRDB_/B/Bose/CCF_Conversion/186_85.ir b/_CSV-IRDB_/B/Bose/CCF_Conversion/186_85.ir
index d450ded6..c3099cdf 100644
--- a/_CSV-IRDB_/B/Bose/CCF_Conversion/186_85.ir
+++ b/_CSV-IRDB_/B/Bose/CCF_Conversion/186_85.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA 55 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA 55 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA 55 00 00
@@ -37,25 +37,25 @@ protocol: NECext
 address: BA 55 00 00
 command: 06 00 00 00
 #
-name: CENTER_VOLUME_-
+name: CENTER_VOL-
 type: parsed
 protocol: NECext
 address: BA 55 00 00
 command: 08 00 00 00
 #
-name: CENTER_VOLUME_+
+name: CENTER_VOL+
 type: parsed
 protocol: NECext
 address: BA 55 00 00
 command: 09 00 00 00
 #
-name: SURROUND_VOLUME_-
+name: SURROUND_VOL-
 type: parsed
 protocol: NECext
 address: BA 55 00 00
 command: 0A 00 00 00
 #
-name: SURROUND_VOLUME_+
+name: SURROUND_VOL+
 type: parsed
 protocol: NECext
 address: BA 55 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_1.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_1.ir
index 4a0e4d53..3ef715fa 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_1.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_1.ir
@@ -151,7 +151,7 @@ protocol: NECext
 address: BA 01 00 00
 command: 49 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: BA 01 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_136.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_136.ir
index 4418b8b6..6f012c09 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_136.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_136.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: BA 88 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-_ZONE_#1
+name: VOL-_ZONE_#1
 type: parsed
 protocol: NECext
 address: BA 88 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: BA 88 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+_ZONE_#1
+name: VOL+_ZONE_#1
 type: parsed
 protocol: NECext
 address: BA 88 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_160.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_160.ir
index 68cec9b3..447a9f9b 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_160.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_160.ir
@@ -31,13 +31,13 @@ protocol: NECext
 address: BA A0 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA A0 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA A0 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: BA A0 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA A0 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA A0 00 00
@@ -421,7 +421,7 @@ protocol: NECext
 address: BA A0 00 00
 command: 4C 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: BA A0 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_176.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_176.ir
index 98172ab8..02ca45f1 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_176.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_176.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA B0 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B0 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B0 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_177.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_177.ir
index fd1e8252..741f86a4 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_177.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_177.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: BA B1 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B1 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B1 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B1 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B1 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_178.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_178.ir
index 93e9fe75..a72f9a72 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_178.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_178.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: BA B2 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B2 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B2 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B2 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B2 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_179.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_179.ir
index 1928c47c..bf223611 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_179.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_179.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: BA B3 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B3 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B3 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B3 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B3 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_180.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_180.ir
index 2e8fde88..da07924d 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_180.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_180.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: BA B4 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B4 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B4 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B4 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B4 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_181.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_181.ir
index 4eb11bca..fe97647c 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_181.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_181.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA B5 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B5 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B5 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_182.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_182.ir
index 9458923b..e542fc0c 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_182.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_182.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA B6 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B6 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B6 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_183.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_183.ir
index 5d401981..49b226ce 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_183.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_183.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: BA B7 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B7 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: BA B7 00 00
 command: 19 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B7 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_184.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_184.ir
index 70a63e96..f5c69606 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_184.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_184.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA B8 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B8 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B8 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_185.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_185.ir
index 88fd16ea..193e705b 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_185.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_185.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA B9 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA B9 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA B9 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_186.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_186.ir
index 357f3d04..8d4c751a 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_186.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_186.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA BA 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA BA 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA BA 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_187.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_187.ir
index a0f3b203..69356092 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_187.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_187.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA BB 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA BB 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA BB 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_188.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_188.ir
index 08676cdd..75661f6b 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_188.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_188.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA BC 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA BC 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA BC 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_189.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_189.ir
index 572f8b3c..f68433bd 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_189.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_189.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA BD 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA BD 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA BD 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_190.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_190.ir
index 0cd8ec17..f03aa5d5 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_190.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_190.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA BE 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA BE 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA BE 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_191.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_191.ir
index 6569e5b5..8d709ce5 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_191.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_191.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA BF 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA BF 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA BF 00 00
diff --git a/_CSV-IRDB_/B/Bose/Lifestyle/186_85.ir b/_CSV-IRDB_/B/Bose/Lifestyle/186_85.ir
index d1e6fd9b..11796735 100644
--- a/_CSV-IRDB_/B/Bose/Lifestyle/186_85.ir
+++ b/_CSV-IRDB_/B/Bose/Lifestyle/186_85.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA 55 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA 55 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA 55 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: BA 55 00 00
 command: 4B 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: BA 55 00 00
diff --git a/_CSV-IRDB_/B/Bose/Media_Center/186_136.ir b/_CSV-IRDB_/B/Bose/Media_Center/186_136.ir
index 5a57b6bf..5215aed6 100644
--- a/_CSV-IRDB_/B/Bose/Media_Center/186_136.ir
+++ b/_CSV-IRDB_/B/Bose/Media_Center/186_136.ir
@@ -169,7 +169,7 @@ protocol: NECext
 address: BA 88 00 00
 command: 49 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: BA 88 00 00
diff --git a/_CSV-IRDB_/B/Bose/Music_Center/186_133.ir b/_CSV-IRDB_/B/Bose/Music_Center/186_133.ir
index 3e50490c..67f18b6e 100644
--- a/_CSV-IRDB_/B/Bose/Music_Center/186_133.ir
+++ b/_CSV-IRDB_/B/Bose/Music_Center/186_133.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA 85 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA 85 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA 85 00 00
diff --git a/_CSV-IRDB_/B/Bose/Music_Center/186_213.ir b/_CSV-IRDB_/B/Bose/Music_Center/186_213.ir
index 9fa6701d..9acb00ee 100644
--- a/_CSV-IRDB_/B/Bose/Music_Center/186_213.ir
+++ b/_CSV-IRDB_/B/Bose/Music_Center/186_213.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA D5 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA D5 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA D5 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: BA D5 00 00
 command: 4B 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: BA D5 00 00
diff --git a/_CSV-IRDB_/B/Bose/Music_Center/186_229.ir b/_CSV-IRDB_/B/Bose/Music_Center/186_229.ir
index a7253f51..73fba222 100644
--- a/_CSV-IRDB_/B/Bose/Music_Center/186_229.ir
+++ b/_CSV-IRDB_/B/Bose/Music_Center/186_229.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA E5 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA E5 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA E5 00 00
diff --git a/_CSV-IRDB_/B/Bose/Music_Center/186_85.ir b/_CSV-IRDB_/B/Bose/Music_Center/186_85.ir
index 1658fbda..d8aef650 100644
--- a/_CSV-IRDB_/B/Bose/Music_Center/186_85.ir
+++ b/_CSV-IRDB_/B/Bose/Music_Center/186_85.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA 55 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA 55 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA 55 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: BA 55 00 00
 command: 4B 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: BA 55 00 00
diff --git a/_CSV-IRDB_/B/Bose/Receiver/186_160.ir b/_CSV-IRDB_/B/Bose/Receiver/186_160.ir
index 5a694b45..917d0fd0 100644
--- a/_CSV-IRDB_/B/Bose/Receiver/186_160.ir
+++ b/_CSV-IRDB_/B/Bose/Receiver/186_160.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA A0 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA A0 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA A0 00 00
diff --git a/_CSV-IRDB_/B/Bose/Receiver/186_75.ir b/_CSV-IRDB_/B/Bose/Receiver/186_75.ir
index 286c4b1d..e76b95f9 100644
--- a/_CSV-IRDB_/B/Bose/Receiver/186_75.ir
+++ b/_CSV-IRDB_/B/Bose/Receiver/186_75.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: BA 4B 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA 4B 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: BA 4B 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA 4B 00 00
@@ -661,7 +661,7 @@ protocol: NECext
 address: BA 4B 00 00
 command: 8C 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: BA 4B 00 00
diff --git a/_CSV-IRDB_/B/Bose/System/186_85.ir b/_CSV-IRDB_/B/Bose/System/186_85.ir
index a54ddf4c..8dfbb2e8 100644
--- a/_CSV-IRDB_/B/Bose/System/186_85.ir
+++ b/_CSV-IRDB_/B/Bose/System/186_85.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: BA 55 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: BA 55 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: BA 55 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: BA 55 00 00
 command: 4B 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: BA 55 00 00
diff --git a/_CSV-IRDB_/B/Bose/Tuner/186_85.ir b/_CSV-IRDB_/B/Bose/Tuner/186_85.ir
index 393b08ba..e106909d 100644
--- a/_CSV-IRDB_/B/Bose/Tuner/186_85.ir
+++ b/_CSV-IRDB_/B/Bose/Tuner/186_85.ir
@@ -73,7 +73,7 @@ protocol: NECext
 address: BA 55 00 00
 command: 4B 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: BA 55 00 00
diff --git a/_CSV-IRDB_/B/Bose/Unknown_Wave/-1_-1.ir b/_CSV-IRDB_/B/Bose/Unknown_Wave/-1_-1.ir
index 3f7c4afa..8e33de3d 100644
--- a/_CSV-IRDB_/B/Bose/Unknown_Wave/-1_-1.ir
+++ b/_CSV-IRDB_/B/Bose/Unknown_Wave/-1_-1.ir
@@ -13,31 +13,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -55,43 +55,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 24 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 24 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 30 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 32 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -103,19 +103,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 50 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 50 00 00 00
 #
-name: X_KEY_EJECT_CD
+name: X_EJECT_CD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/B/Bush/Unknown_4400/0_-1.ir b/_CSV-IRDB_/B/Bush/Unknown_4400/0_-1.ir
index 235218a7..94acfe90 100644
--- a/_CSV-IRDB_/B/Bush/Unknown_4400/0_-1.ir
+++ b/_CSV-IRDB_/B/Bush/Unknown_4400/0_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,37 +79,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/B/Bush/Unknown_DFTA1xi/8_-1.ir b/_CSV-IRDB_/B/Bush/Unknown_DFTA1xi/8_-1.ir
index 8e8b9464..544176ee 100644
--- a/_CSV-IRDB_/B/Bush/Unknown_DFTA1xi/8_-1.ir
+++ b/_CSV-IRDB_/B/Bush/Unknown_DFTA1xi/8_-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -85,43 +85,43 @@ protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: X_KEY_VOLUMENDOWN
+name: X_VOLUMENDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -133,61 +133,61 @@ protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 21 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 22 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 34 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/B/Bush/Unknown_WS6680/0_-1.ir b/_CSV-IRDB_/B/Bush/Unknown_WS6680/0_-1.ir
index ef96ded0..6654b4d5 100644
--- a/_CSV-IRDB_/B/Bush/Unknown_WS6680/0_-1.ir
+++ b/_CSV-IRDB_/B/Bush/Unknown_WS6680/0_-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,85 +55,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/CAT/Unknown_CS-907/0_191.ir b/_CSV-IRDB_/C/CAT/Unknown_CS-907/0_191.ir
index 063161db..3db9f69a 100644
--- a/_CSV-IRDB_/C/CAT/Unknown_CS-907/0_191.ir
+++ b/_CSV-IRDB_/C/CAT/Unknown_CS-907/0_191.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 00 BF 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 00 BF 00 00
 command: 07 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 08 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 00 BF 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
@@ -67,37 +67,37 @@ protocol: NECext
 address: 00 BF 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 10 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 12 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 00 BF 00 00
 command: 18 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 19 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 00 BF 00 00
 command: 1F 00 00 00
 #
-name: X_KEY_3Stereo
+name: X_3Stereo
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 40 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 00 BF 00 00
 command: 44 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 00 BF 00 00
 command: 47 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 48 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 49 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 00 BF 00 00
 command: 57 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
 command: 59 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 BF 00 00
diff --git a/_CSV-IRDB_/C/CAT/Unknown_DVD-1122/0_-1.ir b/_CSV-IRDB_/C/CAT/Unknown_DVD-1122/0_-1.ir
index b50cbc76..9083f29d 100644
--- a/_CSV-IRDB_/C/CAT/Unknown_DVD-1122/0_-1.ir
+++ b/_CSV-IRDB_/C/CAT/Unknown_DVD-1122/0_-1.ir
@@ -13,151 +13,151 @@ protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,25 +169,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,25 +217,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/CAT/Unknown_KF-9816/0_-1.ir b/_CSV-IRDB_/C/CAT/Unknown_KF-9816/0_-1.ir
index 26ae815a..1822b8a0 100644
--- a/_CSV-IRDB_/C/CAT/Unknown_KF-9816/0_-1.ir
+++ b/_CSV-IRDB_/C/CAT/Unknown_KF-9816/0_-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,31 +49,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,67 +91,67 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,43 +163,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/CIS_BOX/DSS/183_-1.ir b/_CSV-IRDB_/C/CIS_BOX/DSS/183_-1.ir
index 775c0f4c..7e23621e 100644
--- a/_CSV-IRDB_/C/CIS_BOX/DSS/183_-1.ir
+++ b/_CSV-IRDB_/C/CIS_BOX/DSS/183_-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: B7 00 00 00
 command: 0B 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: B7 00 00 00
diff --git a/_CSV-IRDB_/C/CIS_BOX/Receiver/121_-1.ir b/_CSV-IRDB_/C/CIS_BOX/Receiver/121_-1.ir
index e453ade0..633a911b 100644
--- a/_CSV-IRDB_/C/CIS_BOX/Receiver/121_-1.ir
+++ b/_CSV-IRDB_/C/CIS_BOX/Receiver/121_-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 79 00 00 00
 command: 11 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/C/CIS_BOX/Receiver/16_-1.ir b/_CSV-IRDB_/C/CIS_BOX/Receiver/16_-1.ir
index cff68794..c27f1418 100644
--- a/_CSV-IRDB_/C/CIS_BOX/Receiver/16_-1.ir
+++ b/_CSV-IRDB_/C/CIS_BOX/Receiver/16_-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 0C 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/C/CIS_BOX/Receiver/25_107.ir b/_CSV-IRDB_/C/CIS_BOX/Receiver/25_107.ir
index cd657a53..9503c70c 100644
--- a/_CSV-IRDB_/C/CIS_BOX/Receiver/25_107.ir
+++ b/_CSV-IRDB_/C/CIS_BOX/Receiver/25_107.ir
@@ -43,7 +43,7 @@ protocol: NECext
 address: 19 6B 00 00
 command: 25 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 19 6B 00 00
diff --git a/_CSV-IRDB_/C/CIS_BOX/Receiver/48_-1.ir b/_CSV-IRDB_/C/CIS_BOX/Receiver/48_-1.ir
index 6d95867a..10f91b04 100644
--- a/_CSV-IRDB_/C/CIS_BOX/Receiver/48_-1.ir
+++ b/_CSV-IRDB_/C/CIS_BOX/Receiver/48_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/C/CIS_BOX/TV/1_-1.ir b/_CSV-IRDB_/C/CIS_BOX/TV/1_-1.ir
index bd2d9588..21c72f34 100644
--- a/_CSV-IRDB_/C/CIS_BOX/TV/1_-1.ir
+++ b/_CSV-IRDB_/C/CIS_BOX/TV/1_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/C/CIS_BOX/VCR/2_-1.ir b/_CSV-IRDB_/C/CIS_BOX/VCR/2_-1.ir
index 19da0a89..f8a98253 100644
--- a/_CSV-IRDB_/C/CIS_BOX/VCR/2_-1.ir
+++ b/_CSV-IRDB_/C/CIS_BOX/VCR/2_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/C/COSMEL/Unknown_COSMEL/2_-1.ir b/_CSV-IRDB_/C/COSMEL/Unknown_COSMEL/2_-1.ir
index 97b8affd..ad85510d 100644
--- a/_CSV-IRDB_/C/COSMEL/Unknown_COSMEL/2_-1.ir
+++ b/_CSV-IRDB_/C/COSMEL/Unknown_COSMEL/2_-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 0D 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/C/Cambridge_Audio/DVD_Player/7_-1.ir b/_CSV-IRDB_/C/Cambridge_Audio/DVD_Player/7_-1.ir
index 504c8d59..92073418 100644
--- a/_CSV-IRDB_/C/Cambridge_Audio/DVD_Player/7_-1.ir
+++ b/_CSV-IRDB_/C/Cambridge_Audio/DVD_Player/7_-1.ir
@@ -199,7 +199,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 51 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 55 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/C/Cambridge_Audio/Receiver/192_192.ir b/_CSV-IRDB_/C/Cambridge_Audio/Receiver/192_192.ir
index b8b81baa..52228cdb 100644
--- a/_CSV-IRDB_/C/Cambridge_Audio/Receiver/192_192.ir
+++ b/_CSV-IRDB_/C/Cambridge_Audio/Receiver/192_192.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: C0 C0 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: C0 C0 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
diff --git a/_CSV-IRDB_/C/Cambridge_Audio/Receiver/192_63.ir b/_CSV-IRDB_/C/Cambridge_Audio/Receiver/192_63.ir
index 5bf9e75f..8feaf5eb 100644
--- a/_CSV-IRDB_/C/Cambridge_Audio/Receiver/192_63.ir
+++ b/_CSV-IRDB_/C/Cambridge_Audio/Receiver/192_63.ir
@@ -43,7 +43,7 @@ protocol: NECext
 address: C0 3F 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: C0 3F 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: C0 3F 00 00
 command: 5D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: C0 3F 00 00
diff --git a/_CSV-IRDB_/C/Cambridge_Audio/Unknown_Audio/192_192.ir b/_CSV-IRDB_/C/Cambridge_Audio/Unknown_Audio/192_192.ir
index 7f3370e7..a301ffd6 100644
--- a/_CSV-IRDB_/C/Cambridge_Audio/Unknown_Audio/192_192.ir
+++ b/_CSV-IRDB_/C/Cambridge_Audio/Unknown_Audio/192_192.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: C0 C0 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: C0 C0 00 00
 command: 04 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: C0 C0 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: C0 C0 00 00
 command: 0E 00 00 00
 #
-name: X_KEY_1_DIRECT
+name: X_1_DIRECT
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: C0 C0 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: C0 C0 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: C0 C0 00 00
 command: 1D 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
@@ -157,31 +157,31 @@ protocol: NECext
 address: C0 C0 00 00
 command: 20 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
 command: 21 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
 command: 22 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
 command: 23 00 00 00
 #
-name: X_KEY_VIDEO2
+name: X_VIDEO2
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
 command: 24 00 00 00
 #
-name: X_KEY_VIDEO3
+name: X_VIDEO3
 type: parsed
 protocol: NECext
 address: C0 C0 00 00
diff --git a/_CSV-IRDB_/C/Cambridge_Audio/Unknown_X40A/16_-1.ir b/_CSV-IRDB_/C/Cambridge_Audio/Unknown_X40A/16_-1.ir
index c26151d1..7c1c7b14 100644
--- a/_CSV-IRDB_/C/Cambridge_Audio/Unknown_X40A/16_-1.ir
+++ b/_CSV-IRDB_/C/Cambridge_Audio/Unknown_X40A/16_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 00 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -31,43 +31,43 @@ protocol: NECext
 address: 10 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 05 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/C/Canalsat/Unknown_CanalSat/10_-1.ir b/_CSV-IRDB_/C/Canalsat/Unknown_CanalSat/10_-1.ir
index 9d667908..07b12941 100644
--- a/_CSV-IRDB_/C/Canalsat/Unknown_CanalSat/10_-1.ir
+++ b/_CSV-IRDB_/C/Canalsat/Unknown_CanalSat/10_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/C/Canalsat/Unknown_CanalSatHD/10_-1.ir b/_CSV-IRDB_/C/Canalsat/Unknown_CanalSatHD/10_-1.ir
index 7c66cbf0..b4dea8f6 100644
--- a/_CSV-IRDB_/C/Canalsat/Unknown_CanalSatHD/10_-1.ir
+++ b/_CSV-IRDB_/C/Canalsat/Unknown_CanalSatHD/10_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -103,55 +103,55 @@ protocol: NECext
 address: 0A 00 00 00
 command: 22 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 37 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -229,31 +229,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/C/Canon/Unknown_CAM/133_118.ir b/_CSV-IRDB_/C/Canon/Unknown_CAM/133_118.ir
index da46f616..fc7d85d3 100644
--- a/_CSV-IRDB_/C/Canon/Unknown_CAM/133_118.ir
+++ b/_CSV-IRDB_/C/Canon/Unknown_CAM/133_118.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 85 76 00 00
 command: 0D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 1B 00 00 00
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 1C 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 85 76 00 00
diff --git a/_CSV-IRDB_/C/Canon/Unknown_WL-D77/133_118.ir b/_CSV-IRDB_/C/Canon/Unknown_WL-D77/133_118.ir
index 01585c50..853a460a 100644
--- a/_CSV-IRDB_/C/Canon/Unknown_WL-D77/133_118.ir
+++ b/_CSV-IRDB_/C/Canon/Unknown_WL-D77/133_118.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -25,25 +25,25 @@ protocol: NECext
 address: 85 76 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 04 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 05 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 07 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 12 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 85 76 00 00
 command: 1B 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 1C 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 85 76 00 00
 command: 24 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 25 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 2C 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 34 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 3B 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 85 76 00 00
diff --git a/_CSV-IRDB_/C/Canon/Unknown_WL-D80/133_118.ir b/_CSV-IRDB_/C/Canon/Unknown_WL-D80/133_118.ir
index 597bff6c..6ff85990 100644
--- a/_CSV-IRDB_/C/Canon/Unknown_WL-D80/133_118.ir
+++ b/_CSV-IRDB_/C/Canon/Unknown_WL-D80/133_118.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -25,19 +25,19 @@ protocol: NECext
 address: 85 76 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 04 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 05 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 12 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -61,25 +61,25 @@ protocol: NECext
 address: 85 76 00 00
 command: 1B 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 1C 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 85 76 00 00
 command: 24 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 25 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 28 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 36 00 00 00
 #
-name: X_KEY_2_bit_audio_out
+name: X_2_bit_audio_out
 type: parsed
 protocol: NECext
 address: 85 76 00 00
diff --git a/_CSV-IRDB_/C/Canon/Unknown_WL-DC100/202_177.ir b/_CSV-IRDB_/C/Canon/Unknown_WL-DC100/202_177.ir
index de49aaf5..877af3a5 100644
--- a/_CSV-IRDB_/C/Canon/Unknown_WL-DC100/202_177.ir
+++ b/_CSV-IRDB_/C/Canon/Unknown_WL-DC100/202_177.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: CA B1 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: CA B1 00 00
 command: 40 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: CA B1 00 00
 command: 41 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: CA B1 00 00
 command: 42 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: CA B1 00 00
diff --git a/_CSV-IRDB_/C/Canon/Unknown_WL-V1/129_6.ir b/_CSV-IRDB_/C/Canon/Unknown_WL-V1/129_6.ir
index 237a567a..15618a5e 100644
--- a/_CSV-IRDB_/C/Canon/Unknown_WL-V1/129_6.ir
+++ b/_CSV-IRDB_/C/Canon/Unknown_WL-V1/129_6.ir
@@ -7,37 +7,37 @@ protocol: NECext
 address: 81 06 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 81 06 00 00
@@ -61,43 +61,43 @@ protocol: NECext
 address: 81 06 00 00
 command: 09 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 0A 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 0B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 0C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 0E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 81 06 00 00
 command: 0F 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 81 06 00 00
diff --git a/_CSV-IRDB_/C/Canon/Unknown_canon/133_118.ir b/_CSV-IRDB_/C/Canon/Unknown_canon/133_118.ir
index 3ee9574d..4424b153 100644
--- a/_CSV-IRDB_/C/Canon/Unknown_canon/133_118.ir
+++ b/_CSV-IRDB_/C/Canon/Unknown_canon/133_118.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 85 76 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 04 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 05 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 12 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 85 76 00 00
 command: 1B 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 1C 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 85 76 00 00
 command: 24 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 85 76 00 00
 command: 25 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 34 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 85 76 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 85 76 00 00
 command: 3B 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 85 76 00 00
diff --git a/_CSV-IRDB_/C/Captain/Unknown_7100usb/4_250.ir b/_CSV-IRDB_/C/Captain/Unknown_7100usb/4_250.ir
index a14c3398..38ee932d 100644
--- a/_CSV-IRDB_/C/Captain/Unknown_7100usb/4_250.ir
+++ b/_CSV-IRDB_/C/Captain/Unknown_7100usb/4_250.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 0A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 13 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 FA 00 00
diff --git a/_CSV-IRDB_/C/Carver/Pre-Amplifier/135_123.ir b/_CSV-IRDB_/C/Carver/Pre-Amplifier/135_123.ir
index dbf8553f..89a797cd 100644
--- a/_CSV-IRDB_/C/Carver/Pre-Amplifier/135_123.ir
+++ b/_CSV-IRDB_/C/Carver/Pre-Amplifier/135_123.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: 87 7B 00 00
 command: 40 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 7B 00 00
 command: 42 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 7B 00 00
diff --git a/_CSV-IRDB_/C/Carver/Pre-Amplifier/16_-1.ir b/_CSV-IRDB_/C/Carver/Pre-Amplifier/16_-1.ir
index d951acf3..44d02c71 100644
--- a/_CSV-IRDB_/C/Carver/Pre-Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/C/Carver/Pre-Amplifier/16_-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/C/Cary_Audio_Design/CD_Player/4_-1.ir b/_CSV-IRDB_/C/Cary_Audio_Design/CD_Player/4_-1.ir
index 487ed088..adb65e00 100644
--- a/_CSV-IRDB_/C/Cary_Audio_Design/CD_Player/4_-1.ir
+++ b/_CSV-IRDB_/C/Cary_Audio_Design/CD_Player/4_-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: AMP_VOLUME_-
+name: AMP_VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 24 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 2A 00 00 00
 #
-name: AMP_VOLUME_+
+name: AMP_VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/C/Cary_Audio_Design/DVD_Player/23_-1.ir b/_CSV-IRDB_/C/Cary_Audio_Design/DVD_Player/23_-1.ir
index da402f78..a087665f 100644
--- a/_CSV-IRDB_/C/Cary_Audio_Design/DVD_Player/23_-1.ir
+++ b/_CSV-IRDB_/C/Cary_Audio_Design/DVD_Player/23_-1.ir
@@ -199,13 +199,13 @@ protocol: NECext
 address: 17 00 00 00
 command: 22 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 17 00 00 00
 command: 23 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 17 00 00 00
diff --git a/_CSV-IRDB_/C/Cary_Audio_Design/Receiver/19_-1.ir b/_CSV-IRDB_/C/Cary_Audio_Design/Receiver/19_-1.ir
index 75276662..5b5c0546 100644
--- a/_CSV-IRDB_/C/Cary_Audio_Design/Receiver/19_-1.ir
+++ b/_CSV-IRDB_/C/Cary_Audio_Design/Receiver/19_-1.ir
@@ -67,13 +67,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 4F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 50 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 13 00 00 00
diff --git a/_CSV-IRDB_/C/Casio/Unknown_CMD-40/170_-1.ir b/_CSV-IRDB_/C/Casio/Unknown_CMD-40/170_-1.ir
index c0600348..06b8a01c 100644
--- a/_CSV-IRDB_/C/Casio/Unknown_CMD-40/170_-1.ir
+++ b/_CSV-IRDB_/C/Casio/Unknown_CMD-40/170_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: AA 00 00 00
diff --git a/_CSV-IRDB_/C/Cce/Unknown_RC-27/0_-1.ir b/_CSV-IRDB_/C/Cce/Unknown_RC-27/0_-1.ir
index ee824096..567acec0 100644
--- a/_CSV-IRDB_/C/Cce/Unknown_RC-27/0_-1.ir
+++ b/_CSV-IRDB_/C/Cce/Unknown_RC-27/0_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Cce/Unknown_RC-28b/0_-1.ir b/_CSV-IRDB_/C/Cce/Unknown_RC-28b/0_-1.ir
index 5a0ad21f..78b6026c 100644
--- a/_CSV-IRDB_/C/Cce/Unknown_RC-28b/0_-1.ir
+++ b/_CSV-IRDB_/C/Cce/Unknown_RC-28b/0_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Cce/Unknown_TV-CCE/4_-1.ir b/_CSV-IRDB_/C/Cce/Unknown_TV-CCE/4_-1.ir
index b898598f..368dcf76 100644
--- a/_CSV-IRDB_/C/Cce/Unknown_TV-CCE/4_-1.ir
+++ b/_CSV-IRDB_/C/Cce/Unknown_TV-CCE/4_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -79,61 +79,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/C/Cce/Unknown_VCR-CCE/21_-1.ir b/_CSV-IRDB_/C/Cce/Unknown_VCR-CCE/21_-1.ir
index 0537b448..f9c0cfce 100644
--- a/_CSV-IRDB_/C/Cce/Unknown_VCR-CCE/21_-1.ir
+++ b/_CSV-IRDB_/C/Cce/Unknown_VCR-CCE/21_-1.ir
@@ -139,7 +139,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 16 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/C/Centrum/Unknown_Gemini/29_-1.ir b/_CSV-IRDB_/C/Centrum/Unknown_Gemini/29_-1.ir
index 9b1b3805..d0fa9a99 100644
--- a/_CSV-IRDB_/C/Centrum/Unknown_Gemini/29_-1.ir
+++ b/_CSV-IRDB_/C/Centrum/Unknown_Gemini/29_-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 00 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 03 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 06 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 09 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 15 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 20 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -133,43 +133,43 @@ protocol: NECext
 address: 1D 00 00 00
 command: 23 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 29 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 1D 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -193,25 +193,25 @@ protocol: NECext
 address: 1D 00 00 00
 command: 34 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 36 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 37 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
diff --git a/_CSV-IRDB_/C/Centrum/Unknown_rc5/29_-1.ir b/_CSV-IRDB_/C/Centrum/Unknown_rc5/29_-1.ir
index 4933d5f4..27c95fd1 100644
--- a/_CSV-IRDB_/C/Centrum/Unknown_rc5/29_-1.ir
+++ b/_CSV-IRDB_/C/Centrum/Unknown_rc5/29_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 00 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 06 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 09 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 1D 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 20 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 1D 00 00 00
 command: 23 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 29 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 1D 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -199,25 +199,25 @@ protocol: NECext
 address: 1D 00 00 00
 command: 34 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 36 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 37 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
diff --git a/_CSV-IRDB_/C/Century_Concept/Unknown_dvd/0_246.ir b/_CSV-IRDB_/C/Century_Concept/Unknown_dvd/0_246.ir
index 5d7d4d3f..6c9c334c 100644
--- a/_CSV-IRDB_/C/Century_Concept/Unknown_dvd/0_246.ir
+++ b/_CSV-IRDB_/C/Century_Concept/Unknown_dvd/0_246.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 80 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 81 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 82 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 83 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 84 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 85 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 86 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 87 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -67,31 +67,31 @@ protocol: NECext
 address: 00 F6 00 00
 command: 8A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 8B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 8C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 8D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 8E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
diff --git a/_CSV-IRDB_/C/Chaparral/Unknown_11-5315-1/128_103.ir b/_CSV-IRDB_/C/Chaparral/Unknown_11-5315-1/128_103.ir
index 4459d606..3b9a765c 100644
--- a/_CSV-IRDB_/C/Chaparral/Unknown_11-5315-1/128_103.ir
+++ b/_CSV-IRDB_/C/Chaparral/Unknown_11-5315-1/128_103.ir
@@ -1,163 +1,163 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 10 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 13 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 17 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 18 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 19 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 1F 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 44 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 4C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 4D 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 4E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 50 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 54 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 56 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 59 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 5A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 67 00 00
 command: 5D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 67 00 00
diff --git a/_CSV-IRDB_/C/Citation/Surround_Processor/132_66.ir b/_CSV-IRDB_/C/Citation/Surround_Processor/132_66.ir
index c4e56a49..55ddcacb 100644
--- a/_CSV-IRDB_/C/Citation/Surround_Processor/132_66.ir
+++ b/_CSV-IRDB_/C/Citation/Surround_Processor/132_66.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 84 42 00 00
 command: 17 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 42 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 84 42 00 00
 command: 57 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 42 00 00
diff --git a/_CSV-IRDB_/C/Citizen/Unknown_JX-2022C/0_-1.ir b/_CSV-IRDB_/C/Citizen/Unknown_JX-2022C/0_-1.ir
index 82e9ab58..c4dba25b 100644
--- a/_CSV-IRDB_/C/Citizen/Unknown_JX-2022C/0_-1.ir
+++ b/_CSV-IRDB_/C/Citizen/Unknown_JX-2022C/0_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,97 +13,97 @@ protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,73 +115,73 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,25 +193,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -247,31 +247,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Classe_Audio/DVD_Player/200_-1.ir b/_CSV-IRDB_/C/Classe_Audio/DVD_Player/200_-1.ir
index 516f658c..6b1aded9 100644
--- a/_CSV-IRDB_/C/Classe_Audio/DVD_Player/200_-1.ir
+++ b/_CSV-IRDB_/C/Classe_Audio/DVD_Player/200_-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: C8 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: C8 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: C8 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: C8 00 00 00
diff --git a/_CSV-IRDB_/C/Classe_Audio/Pre-Amplifier/25_-1.ir b/_CSV-IRDB_/C/Classe_Audio/Pre-Amplifier/25_-1.ir
index 17009b58..57e35f6c 100644
--- a/_CSV-IRDB_/C/Classe_Audio/Pre-Amplifier/25_-1.ir
+++ b/_CSV-IRDB_/C/Classe_Audio/Pre-Amplifier/25_-1.ir
@@ -37,7 +37,7 @@ protocol: NECext
 address: 19 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 19 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/C/Coby/TV/0_127.ir b/_CSV-IRDB_/C/Coby/TV/0_127.ir
index 8550dea2..9b50b735 100644
--- a/_CSV-IRDB_/C/Coby/TV/0_127.ir
+++ b/_CSV-IRDB_/C/Coby/TV/0_127.ir
@@ -85,7 +85,7 @@ protocol: NECext
 address: 00 7F 00 00
 command: 1B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 00 7F 00 00
 command: 5E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/_CSV-IRDB_/C/Comcast/Cable_Box/0_-1.ir b/_CSV-IRDB_/C/Comcast/Cable_Box/0_-1.ir
index a097af85..03d7f2aa 100644
--- a/_CSV-IRDB_/C/Comcast/Cable_Box/0_-1.ir
+++ b/_CSV-IRDB_/C/Comcast/Cable_Box/0_-1.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Comcast/Cable_Box/15_-1.ir b/_CSV-IRDB_/C/Comcast/Cable_Box/15_-1.ir
index a5ddc8a4..1ff99c11 100644
--- a/_CSV-IRDB_/C/Comcast/Cable_Box/15_-1.ir
+++ b/_CSV-IRDB_/C/Comcast/Cable_Box/15_-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/C/Comcast/Cable_Box/1_-1.ir b/_CSV-IRDB_/C/Comcast/Cable_Box/1_-1.ir
index 626392c2..b17c5e8d 100644
--- a/_CSV-IRDB_/C/Comcast/Cable_Box/1_-1.ir
+++ b/_CSV-IRDB_/C/Comcast/Cable_Box/1_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/C/Comcast/Cable_Box/62_16.ir b/_CSV-IRDB_/C/Comcast/Cable_Box/62_16.ir
index a7c14b1c..944a7f71 100644
--- a/_CSV-IRDB_/C/Comcast/Cable_Box/62_16.ir
+++ b/_CSV-IRDB_/C/Comcast/Cable_Box/62_16.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: 3E 10 00 00
 command: 0D 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 3E 10 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 3E 10 00 00
 command: 0E 00 00 00
 #
-name: CHAN_DOWN
+name: CH-
 type: parsed
 protocol: NECext
 address: 3E 10 00 00
diff --git a/_CSV-IRDB_/C/Comcast/Digital_Cable/15_-1.ir b/_CSV-IRDB_/C/Comcast/Digital_Cable/15_-1.ir
index 69e884db..74c4a0c5 100644
--- a/_CSV-IRDB_/C/Comcast/Digital_Cable/15_-1.ir
+++ b/_CSV-IRDB_/C/Comcast/Digital_Cable/15_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/C/Comcast/HD_Cable_with_DVR/0_-1.ir b/_CSV-IRDB_/C/Comcast/HD_Cable_with_DVR/0_-1.ir
index 390df15b..7d90ee1f 100644
--- a/_CSV-IRDB_/C/Comcast/HD_Cable_with_DVR/0_-1.ir
+++ b/_CSV-IRDB_/C/Comcast/HD_Cable_with_DVR/0_-1.ir
@@ -91,7 +91,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Commodore/Unknown_cdtv/0_-1.ir b/_CSV-IRDB_/C/Commodore/Unknown_cdtv/0_-1.ir
index 7b71c506..bba65310 100644
--- a/_CSV-IRDB_/C/Commodore/Unknown_cdtv/0_-1.ir
+++ b/_CSV-IRDB_/C/Commodore/Unknown_cdtv/0_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,85 +13,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,49 +103,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Compro/Unknown_DVB-T200/128_126.ir b/_CSV-IRDB_/C/Compro/Unknown_DVB-T200/128_126.ir
index 1e43fe5d..588339b2 100644
--- a/_CSV-IRDB_/C/Compro/Unknown_DVB-T200/128_126.ir
+++ b/_CSV-IRDB_/C/Compro/Unknown_DVB-T200/128_126.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: 80 7E 00 00
 command: 00 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 01 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 02 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
@@ -37,169 +37,169 @@ protocol: NECext
 address: 80 7E 00 00
 command: 05 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 06 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 08 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 09 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0F 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 10 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 12 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 15 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 17 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 18 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1F 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 40 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 80 7E 00 00
 command: 42 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 43 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
diff --git a/_CSV-IRDB_/C/Compro/Unknown_VideoMate-K300/4_15.ir b/_CSV-IRDB_/C/Compro/Unknown_VideoMate-K300/4_15.ir
index 08439d1d..393a6ca8 100644
--- a/_CSV-IRDB_/C/Compro/Unknown_VideoMate-K300/4_15.ir
+++ b/_CSV-IRDB_/C/Compro/Unknown_VideoMate-K300/4_15.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -127,43 +127,43 @@ protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -193,43 +193,43 @@ protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 47 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -241,49 +241,49 @@ protocol: NECext
 address: 04 0F 00 00
 command: 49 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 4A 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 50 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/C/Conrad/Unknown_006/56_-1.ir b/_CSV-IRDB_/C/Conrad/Unknown_006/56_-1.ir
index d5794d47..4633abad 100644
--- a/_CSV-IRDB_/C/Conrad/Unknown_006/56_-1.ir
+++ b/_CSV-IRDB_/C/Conrad/Unknown_006/56_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -73,55 +73,55 @@ protocol: NECext
 address: 38 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 17 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 38 00 00 00
 command: 46 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 49 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/C/Conrad/Unknown_Promo8/0_-1.ir b/_CSV-IRDB_/C/Conrad/Unknown_Promo8/0_-1.ir
index 14d1ff75..27ba0a6a 100644
--- a/_CSV-IRDB_/C/Conrad/Unknown_Promo8/0_-1.ir
+++ b/_CSV-IRDB_/C/Conrad/Unknown_Promo8/0_-1.ir
@@ -1,229 +1,229 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -247,139 +247,139 @@ protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Contour/Unknown_Contour25/65_0.ir b/_CSV-IRDB_/C/Contour/Unknown_Contour25/65_0.ir
index 0c24abaa..e560cc1a 100644
--- a/_CSV-IRDB_/C/Contour/Unknown_Contour25/65_0.ir
+++ b/_CSV-IRDB_/C/Contour/Unknown_Contour25/65_0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 00 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 41 00 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 41 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 41 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 41 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 41 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 41 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 41 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 41 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 41 00 00 00
diff --git a/_CSV-IRDB_/C/Cool_Sat/Satellite/64_64.ir b/_CSV-IRDB_/C/Cool_Sat/Satellite/64_64.ir
index e6b3e02b..1a83b8b4 100644
--- a/_CSV-IRDB_/C/Cool_Sat/Satellite/64_64.ir
+++ b/_CSV-IRDB_/C/Cool_Sat/Satellite/64_64.ir
@@ -121,7 +121,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 14 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 1B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/C/Coolsat/Unknown_Pro/1_-1.ir b/_CSV-IRDB_/C/Coolsat/Unknown_Pro/1_-1.ir
index 6f3badcc..e78eac26 100644
--- a/_CSV-IRDB_/C/Coolsat/Unknown_Pro/1_-1.ir
+++ b/_CSV-IRDB_/C/Coolsat/Unknown_Pro/1_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -91,73 +91,73 @@ protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/C/Cox/Digital_Cable/1_-1.ir b/_CSV-IRDB_/C/Cox/Digital_Cable/1_-1.ir
index c022259b..3bd0ee73 100644
--- a/_CSV-IRDB_/C/Cox/Digital_Cable/1_-1.ir
+++ b/_CSV-IRDB_/C/Cox/Digital_Cable/1_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/C/Cph03x/Unknown_AS-218/134_107.ir b/_CSV-IRDB_/C/Cph03x/Unknown_AS-218/134_107.ir
index d99d1eb5..50e602da 100644
--- a/_CSV-IRDB_/C/Cph03x/Unknown_AS-218/134_107.ir
+++ b/_CSV-IRDB_/C/Cph03x/Unknown_AS-218/134_107.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: X_KEY_100
+name: X_100
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/C/Creative/Unknown_DDTS-100/193_68.ir b/_CSV-IRDB_/C/Creative/Unknown_DDTS-100/193_68.ir
index 1ee11cf8..489ac4e0 100644
--- a/_CSV-IRDB_/C/Creative/Unknown_DDTS-100/193_68.ir
+++ b/_CSV-IRDB_/C/Creative/Unknown_DDTS-100/193_68.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: C1 44 00 00
 command: 2F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -43,19 +43,19 @@ protocol: NECext
 address: C1 44 00 00
 command: 57 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 67 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 77 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: C1 44 00 00
 command: B7 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C1 44 00 00
diff --git a/_CSV-IRDB_/C/Creative/Unknown_INFRA/33_172.ir b/_CSV-IRDB_/C/Creative/Unknown_INFRA/33_172.ir
index 5db6f2fa..f6604b6e 100644
--- a/_CSV-IRDB_/C/Creative/Unknown_INFRA/33_172.ir
+++ b/_CSV-IRDB_/C/Creative/Unknown_INFRA/33_172.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
@@ -13,85 +13,85 @@ protocol: NECext
 address: 21 AC 00 00
 command: 10 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 28 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 40 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 48 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 50 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 60 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 68 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 70 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 80 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 88 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 90 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
@@ -103,43 +103,43 @@ protocol: NECext
 address: 21 AC 00 00
 command: A8 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: B0 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: C0 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: C8 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: D0 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: E0 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: E8 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
diff --git a/_CSV-IRDB_/C/Creative/Unknown_JUKEBOX3/33_172.ir b/_CSV-IRDB_/C/Creative/Unknown_JUKEBOX3/33_172.ir
index 2bc72488..0485f4b4 100644
--- a/_CSV-IRDB_/C/Creative/Unknown_JUKEBOX3/33_172.ir
+++ b/_CSV-IRDB_/C/Creative/Unknown_JUKEBOX3/33_172.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 20 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 21 AC 00 00
 command: B0 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
 command: E0 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 21 AC 00 00
diff --git a/_CSV-IRDB_/C/Creative/Unknown_RM-1500/193_68.ir b/_CSV-IRDB_/C/Creative/Unknown_RM-1500/193_68.ir
index 412b3798..2ae73812 100644
--- a/_CSV-IRDB_/C/Creative/Unknown_RM-1500/193_68.ir
+++ b/_CSV-IRDB_/C/Creative/Unknown_RM-1500/193_68.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 11 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 1E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -37,31 +37,31 @@ protocol: NECext
 address: C1 44 00 00
 command: 31 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 3E 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 46 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 51 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 6E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 71 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 7E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 81 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -109,91 +109,91 @@ protocol: NECext
 address: C1 44 00 00
 command: 8E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 91 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 9E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: A1 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: AE 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: B1 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: BE 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: C1 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: C6 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: CE 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: D1 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: DE 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: E1 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: EE 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: F1 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: C1 44 00 00
diff --git a/_CSV-IRDB_/C/Creative/Unknown_RM-1800/193_68.ir b/_CSV-IRDB_/C/Creative/Unknown_RM-1800/193_68.ir
index 1f32460b..fd453998 100644
--- a/_CSV-IRDB_/C/Creative/Unknown_RM-1800/193_68.ir
+++ b/_CSV-IRDB_/C/Creative/Unknown_RM-1800/193_68.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 11 00 00 00
 #
-name: X_KEY_3dMidi
+name: X_3dMidi
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 19 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 1E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -49,49 +49,49 @@ protocol: NECext
 address: C1 44 00 00
 command: 31 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 3E 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 46 00 00 00
 #
-name: X_KEY_4bit_Up
+name: X_4bit_Up
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 49 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 4E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 51 00 00 00
 #
-name: X_KEY_3dMidi_Down
+name: X_3dMidi_Down
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 59 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -109,31 +109,31 @@ protocol: NECext
 address: C1 44 00 00
 command: 6E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 71 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 76 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 81 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 86 00 00 00
 #
-name: X_KEY_4bit
+name: X_4bit
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: C1 44 00 00
 command: 8E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 91 00 00 00
 #
-name: X_KEY_3dMidi_Up
+name: X_3dMidi_Up
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 99 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 9E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -175,67 +175,67 @@ protocol: NECext
 address: C1 44 00 00
 command: A9 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: AE 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: B1 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: BE 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: C1 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: C6 00 00 00
 #
-name: X_KEY_4bit_Down
+name: X_4bit_Down
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: C9 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: CE 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: D1 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: D6 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: DE 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -247,19 +247,19 @@ protocol: NECext
 address: C1 44 00 00
 command: E9 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: EE 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: F1 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: C1 44 00 00
diff --git a/_CSV-IRDB_/C/Creative/Unknown_RM-850/193_68.ir b/_CSV-IRDB_/C/Creative/Unknown_RM-850/193_68.ir
index f63ed457..34d2890b 100644
--- a/_CSV-IRDB_/C/Creative/Unknown_RM-850/193_68.ir
+++ b/_CSV-IRDB_/C/Creative/Unknown_RM-850/193_68.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -13,19 +13,19 @@ protocol: NECext
 address: C1 44 00 00
 command: 29 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 3E 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: C1 44 00 00
 command: 49 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 4E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 5E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 76 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 81 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: C1 44 00 00
 command: 8E 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: C1 44 00 00
 command: A9 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: B1 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: C1 44 00 00
 command: C9 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: CE 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: D6 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: DE 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: C1 44 00 00
diff --git a/_CSV-IRDB_/C/Creative/Unknown_RM900/193_68.ir b/_CSV-IRDB_/C/Creative/Unknown_RM900/193_68.ir
index 0c46e6cf..0d08a5ff 100644
--- a/_CSV-IRDB_/C/Creative/Unknown_RM900/193_68.ir
+++ b/_CSV-IRDB_/C/Creative/Unknown_RM900/193_68.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: C1 44 00 00
 command: 00 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: C1 44 00 00
 command: 08 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 10 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 11 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: C1 44 00 00
 command: 20 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: C1 44 00 00
 command: 31 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 40 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 50 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 51 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 70 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 71 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: C1 44 00 00
 command: 80 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -199,37 +199,37 @@ protocol: NECext
 address: C1 44 00 00
 command: 90 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 91 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 9E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 9F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: A0 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: A1 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: C1 44 00 00
 command: B0 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: B1 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -271,13 +271,13 @@ protocol: NECext
 address: C1 44 00 00
 command: C0 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: C1 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -295,13 +295,13 @@ protocol: NECext
 address: C1 44 00 00
 command: D0 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: D1 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -319,13 +319,13 @@ protocol: NECext
 address: C1 44 00 00
 command: E0 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: E1 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -343,13 +343,13 @@ protocol: NECext
 address: C1 44 00 00
 command: F0 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: F1 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: C1 44 00 00
diff --git a/_CSV-IRDB_/C/Creative/Unknown_rm1000w/193_68.ir b/_CSV-IRDB_/C/Creative/Unknown_rm1000w/193_68.ir
index 4c06f6d2..ac99bcb7 100644
--- a/_CSV-IRDB_/C/Creative/Unknown_rm1000w/193_68.ir
+++ b/_CSV-IRDB_/C/Creative/Unknown_rm1000w/193_68.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 11 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 1E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -37,31 +37,31 @@ protocol: NECext
 address: C1 44 00 00
 command: 31 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 3E 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 46 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 51 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 6E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 71 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: C1 44 00 00
 command: 7E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 81 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: C1 44 00 00
@@ -109,97 +109,97 @@ protocol: NECext
 address: C1 44 00 00
 command: 8E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 91 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 9E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: 9E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: A1 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: AE 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: B1 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: BE 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: C1 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: C6 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: CE 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: D1 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: DE 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: E1 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: EE 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: C1 44 00 00
 command: F1 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: C1 44 00 00
diff --git a/_CSV-IRDB_/C/Crestron/Lighting_Controller/30_-1.ir b/_CSV-IRDB_/C/Crestron/Lighting_Controller/30_-1.ir
index 82d82963..c915721b 100644
--- a/_CSV-IRDB_/C/Crestron/Lighting_Controller/30_-1.ir
+++ b/_CSV-IRDB_/C/Crestron/Lighting_Controller/30_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 1E 00 00 00
 command: 00 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
diff --git a/_CSV-IRDB_/C/Crestron/Music_Server/14_-1.ir b/_CSV-IRDB_/C/Crestron/Music_Server/14_-1.ir
index 7194b978..5153f42e 100644
--- a/_CSV-IRDB_/C/Crestron/Music_Server/14_-1.ir
+++ b/_CSV-IRDB_/C/Crestron/Music_Server/14_-1.ir
@@ -91,13 +91,13 @@ protocol: NECext
 address: 0E 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
diff --git a/_CSV-IRDB_/C/Crown/Unknown_cd-80/202_20.ir b/_CSV-IRDB_/C/Crown/Unknown_cd-80/202_20.ir
index a7ddc1d5..a07bf2a9 100644
--- a/_CSV-IRDB_/C/Crown/Unknown_cd-80/202_20.ir
+++ b/_CSV-IRDB_/C/Crown/Unknown_cd-80/202_20.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 0D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 15 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 17 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: CA 14 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: CA 14 00 00
diff --git a/_CSV-IRDB_/C/Crown/Unknown_testinglirc.config/0_-1.ir b/_CSV-IRDB_/C/Crown/Unknown_testinglirc.config/0_-1.ir
index b52af64f..310aebe1 100644
--- a/_CSV-IRDB_/C/Crown/Unknown_testinglirc.config/0_-1.ir
+++ b/_CSV-IRDB_/C/Crown/Unknown_testinglirc.config/0_-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Curtis_Electronics/Unknown_TV/0_-1.ir b/_CSV-IRDB_/C/Curtis_Electronics/Unknown_TV/0_-1.ir
index b4ef9c92..8411f94c 100644
--- a/_CSV-IRDB_/C/Curtis_Electronics/Unknown_TV/0_-1.ir
+++ b/_CSV-IRDB_/C/Curtis_Electronics/Unknown_TV/0_-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_P
+name: P
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_N
+name: N
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_S
+name: S
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/C/Cyberhome/Unknown_300-RMC-300Z/114_205.ir b/_CSV-IRDB_/C/Cyberhome/Unknown_300-RMC-300Z/114_205.ir
index ab9bc476..f0ee7cfc 100644
--- a/_CSV-IRDB_/C/Cyberhome/Unknown_300-RMC-300Z/114_205.ir
+++ b/_CSV-IRDB_/C/Cyberhome/Unknown_300-RMC-300Z/114_205.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 72 CD 00 00
 command: 03 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -25,73 +25,73 @@ protocol: NECext
 address: 72 CD 00 00
 command: 05 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 72 CD 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -121,97 +121,97 @@ protocol: NECext
 address: 72 CD 00 00
 command: 16 00 00 00
 #
-name: X_KEY_1/ALL
+name: X_1/ALL
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 17 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 18 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 40 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 44 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 49 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -223,43 +223,43 @@ protocol: NECext
 address: 72 CD 00 00
 command: 50 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 51 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 54 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 55 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 58 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 59 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 5C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
diff --git a/_CSV-IRDB_/C/Cyberhome/Unknown_504/114_205.ir b/_CSV-IRDB_/C/Cyberhome/Unknown_504/114_205.ir
index 70a4c28b..c4237b46 100644
--- a/_CSV-IRDB_/C/Cyberhome/Unknown_504/114_205.ir
+++ b/_CSV-IRDB_/C/Cyberhome/Unknown_504/114_205.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 02 00 00 00
 #
-name: X_KEY_1/all
+name: X_1/all
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -25,73 +25,73 @@ protocol: NECext
 address: 72 CD 00 00
 command: 05 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 06 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 72 CD 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -115,79 +115,79 @@ protocol: NECext
 address: 72 CD 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 16 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 17 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 18 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 40 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 72 CD 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 49 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 72 CD 00 00
 command: 50 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -241,25 +241,25 @@ protocol: NECext
 address: 72 CD 00 00
 command: 55 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 58 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 59 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 5C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
diff --git a/_CSV-IRDB_/C/Cyberhome/Unknown_ADL-528/114_205.ir b/_CSV-IRDB_/C/Cyberhome/Unknown_ADL-528/114_205.ir
index bc725b40..cc81fca8 100644
--- a/_CSV-IRDB_/C/Cyberhome/Unknown_ADL-528/114_205.ir
+++ b/_CSV-IRDB_/C/Cyberhome/Unknown_ADL-528/114_205.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 72 CD 00 00
 command: 03 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 72 CD 00 00
 command: 05 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -37,73 +37,73 @@ protocol: NECext
 address: 72 CD 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 72 CD 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -127,67 +127,67 @@ protocol: NECext
 address: 72 CD 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 40 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 72 CD 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 72 CD 00 00
 command: 4D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 50 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -247,19 +247,19 @@ protocol: NECext
 address: 72 CD 00 00
 command: 58 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 59 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 5C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
diff --git a/_CSV-IRDB_/C/Cyberhome/Unknown_CH-DVD-302/114_205.ir b/_CSV-IRDB_/C/Cyberhome/Unknown_CH-DVD-302/114_205.ir
index 6a3b17be..dac8b586 100644
--- a/_CSV-IRDB_/C/Cyberhome/Unknown_CH-DVD-302/114_205.ir
+++ b/_CSV-IRDB_/C/Cyberhome/Unknown_CH-DVD-302/114_205.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 02 00 00 00
 #
-name: X_KEY_1/ALL
+name: X_1/ALL
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -25,73 +25,73 @@ protocol: NECext
 address: 72 CD 00 00
 command: 05 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 06 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 72 CD 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -115,55 +115,55 @@ protocol: NECext
 address: 72 CD 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 16 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 17 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 18 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 72 CD 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 40 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 72 CD 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 49 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 72 CD 00 00
 command: 50 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
@@ -241,19 +241,19 @@ protocol: NECext
 address: 72 CD 00 00
 command: 55 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 58 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 59 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
diff --git a/_CSV-IRDB_/C/Cyberhome/Unknown_CH-DVD/114_205.ir b/_CSV-IRDB_/C/Cyberhome/Unknown_CH-DVD/114_205.ir
index ab9b820f..6c59c1dd 100644
--- a/_CSV-IRDB_/C/Cyberhome/Unknown_CH-DVD/114_205.ir
+++ b/_CSV-IRDB_/C/Cyberhome/Unknown_CH-DVD/114_205.ir
@@ -1,253 +1,253 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 02 00 00 00
 #
-name: KEY_MEDIA_REPEAT
+name: MEDIA_REPEAT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 05 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 06 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 11 00 00 00
 #
-name: KEY_GOTO
+name: GOTO
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 13 00 00 00
 #
-name: KEY_PROGRAM
+name: PROGRAM
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 16 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 17 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 18 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 19 00 00 00
 #
-name: KEY_EJECTCLOSECD
+name: EJECTCLOSECD
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 40 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 44 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 49 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 4D 00 00 00
 #
-name: KEY_DISPLAYTOGGLE
+name: DISPLAYTOGGLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 50 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 54 00 00 00
 #
-name: KEY_BOOKMARKS
+name: BOOKMARKS
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 55 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 58 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 59 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 5C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
diff --git a/_CSV-IRDB_/C/Cyberhome/Unknown_cyberhome/114_205.ir b/_CSV-IRDB_/C/Cyberhome/Unknown_cyberhome/114_205.ir
index a9105d9b..a4dcfa93 100644
--- a/_CSV-IRDB_/C/Cyberhome/Unknown_cyberhome/114_205.ir
+++ b/_CSV-IRDB_/C/Cyberhome/Unknown_cyberhome/114_205.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 03 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 04 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 05 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 09 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 17 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 1F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 44 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 49 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
 command: 5C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 72 CD 00 00
diff --git a/_CSV-IRDB_/C/Cypress/Unknown_CR-72/64_175.ir b/_CSV-IRDB_/C/Cypress/Unknown_CR-72/64_175.ir
index bd03ec4e..c560b079 100644
--- a/_CSV-IRDB_/C/Cypress/Unknown_CR-72/64_175.ir
+++ b/_CSV-IRDB_/C/Cypress/Unknown_CR-72/64_175.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
diff --git a/_CSV-IRDB_/C/cenOmax/Unknown_F702/2_255.ir b/_CSV-IRDB_/C/cenOmax/Unknown_F702/2_255.ir
index 3b8276ec..8976ff36 100644
--- a/_CSV-IRDB_/C/cenOmax/Unknown_F702/2_255.ir
+++ b/_CSV-IRDB_/C/cenOmax/Unknown_F702/2_255.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 1B 00 00 00
 #
-name: KEY_MEDIA_REPEAT
+name: MEDIA_REPEAT
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 1F 00 00 00
 #
-name: X_KEY_CLOCK
+name: X_CLOCK
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 4E 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
 command: 58 00 00 00
 #
-name: X_KEY_SOURCE
+name: X_SOURCE
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
diff --git a/_CSV-IRDB_/D/D-LINK/MP3_Player/8_230.ir b/_CSV-IRDB_/D/D-LINK/MP3_Player/8_230.ir
index dad866aa..afdeaf81 100644
--- a/_CSV-IRDB_/D/D-LINK/MP3_Player/8_230.ir
+++ b/_CSV-IRDB_/D/D-LINK/MP3_Player/8_230.ir
@@ -145,7 +145,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 4A 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
diff --git a/_CSV-IRDB_/D/D-LINK/Unknown_DSM320/8_230.ir b/_CSV-IRDB_/D/D-LINK/Unknown_DSM320/8_230.ir
index 40261836..a3d1cf21 100644
--- a/_CSV-IRDB_/D/D-LINK/Unknown_DSM320/8_230.ir
+++ b/_CSV-IRDB_/D/D-LINK/Unknown_DSM320/8_230.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 08 E6 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 14 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -43,37 +43,37 @@ protocol: NECext
 address: 08 E6 00 00
 command: 16 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 17 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 18 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1A 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -85,97 +85,97 @@ protocol: NECext
 address: 08 E6 00 00
 command: 1D 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 40 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 42 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 43 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 45 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 46 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 47 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4B 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 4E 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 51 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 08 E6 00 00
 command: 54 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 55 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -229,31 +229,31 @@ protocol: NECext
 address: 08 E6 00 00
 command: 58 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 59 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
diff --git a/_CSV-IRDB_/D/D-LINK/Unknown_i2eye/130_19.ir b/_CSV-IRDB_/D/D-LINK/Unknown_i2eye/130_19.ir
index a8833742..cbdc91b3 100644
--- a/_CSV-IRDB_/D/D-LINK/Unknown_i2eye/130_19.ir
+++ b/_CSV-IRDB_/D/D-LINK/Unknown_i2eye/130_19.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 82 13 00 00
 command: 81 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 83 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 82 13 00 00
@@ -31,25 +31,25 @@ protocol: NECext
 address: 82 13 00 00
 command: 86 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 87 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 88 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 8A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 82 13 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 82 13 00 00
 command: 8C 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 8D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 90 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 91 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 92 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 93 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 94 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 95 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 99 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 9A 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 9B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 9C 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 9D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 82 13 00 00
diff --git a/_CSV-IRDB_/D/DBPower/Projector_T20/2_-1.ir b/_CSV-IRDB_/D/DBPower/Projector_T20/2_-1.ir
index 193a742a..358ed308 100644
--- a/_CSV-IRDB_/D/DBPower/Projector_T20/2_-1.ir
+++ b/_CSV-IRDB_/D/DBPower/Projector_T20/2_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -43,19 +43,19 @@ protocol: NECext
 address: 02 00 00 00
 command: 0D 00 00 00
 #
-name: vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 11 00 00 00
 #
-name: vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 15 00 00 00
 #
-name: power_on_off_toggle
+name: POWER_on_off_toggle
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/D/DIFRNCE/Unknown_DVD5010S/0_-1.ir b/_CSV-IRDB_/D/DIFRNCE/Unknown_DVD5010S/0_-1.ir
index 449e156d..2158f862 100644
--- a/_CSV-IRDB_/D/DIFRNCE/Unknown_DVD5010S/0_-1.ir
+++ b/_CSV-IRDB_/D/DIFRNCE/Unknown_DVD5010S/0_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,73 +133,73 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,55 +229,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/DK_Digital/Unknown_Digital/0_-1.ir b/_CSV-IRDB_/D/DK_Digital/Unknown_Digital/0_-1.ir
index 3901430a..82ff699e 100644
--- a/_CSV-IRDB_/D/DK_Digital/Unknown_Digital/0_-1.ir
+++ b/_CSV-IRDB_/D/DK_Digital/Unknown_Digital/0_-1.ir
@@ -7,37 +7,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,25 +49,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,91 +79,91 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,43 +199,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -253,25 +253,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/DLO/HomeDock/238_135.ir b/_CSV-IRDB_/D/DLO/HomeDock/238_135.ir
index 02f7844a..165a5c85 100644
--- a/_CSV-IRDB_/D/DLO/HomeDock/238_135.ir
+++ b/_CSV-IRDB_/D/DLO/HomeDock/238_135.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: EE 87 00 00
 command: 04 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: EE 87 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: EE 87 00 00
 command: 05 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: EE 87 00 00
diff --git a/_CSV-IRDB_/D/DSE/Unknown_G1605/5_-1.ir b/_CSV-IRDB_/D/DSE/Unknown_G1605/5_-1.ir
index b5d1f673..55a9dabe 100644
--- a/_CSV-IRDB_/D/DSE/Unknown_G1605/5_-1.ir
+++ b/_CSV-IRDB_/D/DSE/Unknown_G1605/5_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -43,19 +43,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,37 +79,37 @@ protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/D/DSE/Unknown_G1928/0_-1.ir b/_CSV-IRDB_/D/DSE/Unknown_G1928/0_-1.ir
index 74e22765..10480ee0 100644
--- a/_CSV-IRDB_/D/DSE/Unknown_G1928/0_-1.ir
+++ b/_CSV-IRDB_/D/DSE/Unknown_G1928/0_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,37 +175,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_3D(\*)
+name: 3D(\*)
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -253,19 +253,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/DSE/Unknown_G7659/0_-1.ir b/_CSV-IRDB_/D/DSE/Unknown_G7659/0_-1.ir
index cac6a756..a9c23c43 100644
--- a/_CSV-IRDB_/D/DSE/Unknown_G7659/0_-1.ir
+++ b/_CSV-IRDB_/D/DSE/Unknown_G7659/0_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,115 +79,115 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2/ABC
+name: 2/ABC
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3/DEF
+name: 3/DEF
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4/GHI
+name: 4/GHI
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5/JKL
+name: 5/JKL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6/MNO
+name: 6/MNO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7/PQRS
+name: 7/PQRS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8/TUV
+name: 8/TUV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9/WXYZ
+name: 9/WXYZ
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/DVICO/Unknown_FusionRemote/1_-1.ir b/_CSV-IRDB_/D/DVICO/Unknown_FusionRemote/1_-1.ir
index d9c2ae65..b06a1dae 100644
--- a/_CSV-IRDB_/D/DVICO/Unknown_FusionRemote/1_-1.ir
+++ b/_CSV-IRDB_/D/DVICO/Unknown_FusionRemote/1_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -13,67 +13,67 @@ protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MP3
+name: MP3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -85,37 +85,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,73 +133,73 @@ protocol: NECext
 address: 01 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 43 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 47 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 50 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 52 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 53 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 55 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 57 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -247,25 +247,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 59 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/D/Daeumling/Unknown_SR200/128_38.ir b/_CSV-IRDB_/D/Daeumling/Unknown_SR200/128_38.ir
index e6970d8a..18960760 100644
--- a/_CSV-IRDB_/D/Daeumling/Unknown_SR200/128_38.ir
+++ b/_CSV-IRDB_/D/Daeumling/Unknown_SR200/128_38.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -13,43 +13,43 @@ protocol: NECext
 address: 80 26 00 00
 command: 04 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 06 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 0E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 80 26 00 00
 command: 13 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 15 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 80 26 00 00
 command: 1A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 26 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_14Q3/0_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_14Q3/0_-1.ir
index 94fc23e8..b0ab1c05 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_14Q3/0_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_14Q3/0_-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_97P04701/21_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_97P04701/21_-1.ir
index af8a82ce..5a34499c 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_97P04701/21_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_97P04701/21_-1.ir
@@ -109,7 +109,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 13 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_97P1R2ZDA0/21_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_97P1R2ZDA0/21_-1.ir
index b0e74c7c..0d0e84e6 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_97P1R2ZDA0/21_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_97P1R2ZDA0/21_-1.ir
@@ -67,67 +67,67 @@ protocol: NECext
 address: 15 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: A0 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: A1 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: A2 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: A3 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: A4 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -139,49 +139,49 @@ protocol: NECext
 address: 15 00 00 00
 command: A6 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: A7 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: A8 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: A9 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: AA 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: AB 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: AC 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: AD 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 15 00 00 00
 command: AF 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: B0 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 15 00 00 00
 command: B3 00 00 00
 #
-name: KEY_3D
+name: 3D
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: B4 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: B5 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 15 00 00 00
 command: BC 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: BE 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_97P1RA3AB0/21_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_97P1RA3AB0/21_-1.ir
index e4efb2b1..6f59c5e7 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_97P1RA3AB0/21_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_97P1RA3AB0/21_-1.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 11 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 1A 00 00 00
 #
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_DAEWOO/0_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_DAEWOO/0_-1.ir
index 244085dc..dff7888f 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_DAEWOO/0_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_DAEWOO/0_-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_DAEWOO/21_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_DAEWOO/21_-1.ir
index 1c2c4314..b8e35334 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_DAEWOO/21_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_DAEWOO/21_-1.ir
@@ -61,49 +61,49 @@ protocol: NECext
 address: 15 00 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 11 00 00 00
 #
-name: KEY_O
+name: O
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 12 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 15 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 15 00 00 00
 command: 27 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 29 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 33 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_DS608P/17_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_DS608P/17_-1.ir
index 00c207e2..7a72baf0 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_DS608P/17_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_DS608P/17_-1.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 18 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 19 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 21 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_DV-F24D/21_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_DV-F24D/21_-1.ir
index 1f2af131..f807613c 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_DV-F24D/21_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_DV-F24D/21_-1.ir
@@ -127,7 +127,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 14 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_DVDS150/32_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_DVDS150/32_-1.ir
index dbada806..46e61272 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_DVDS150/32_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_DVDS150/32_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -13,73 +13,73 @@ protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: KEY_1/ALL
+name: 1/ALL
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -121,49 +121,49 @@ protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -205,31 +205,31 @@ protocol: NECext
 address: 20 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -241,19 +241,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 58 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_R-40A06/20_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_R-40A06/20_-1.ir
index 37d8bac2..aa140497 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_R-40A06/20_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_R-40A06/20_-1.ir
@@ -73,7 +73,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 11 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_R-40A10/20_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_R-40A10/20_-1.ir
index 10f63a4a..8cdb9438 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_R-40A10/20_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_R-40A10/20_-1.ir
@@ -91,7 +91,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 14 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_R-40A15/20_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_R-40A15/20_-1.ir
index b8f985fa..65116810 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_R-40A15/20_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_R-40A15/20_-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 13 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 16 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_VCR/21_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_VCR/21_-1.ir
index 2e2c6121..2aa52841 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_VCR/21_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_VCR/21_-1.ir
@@ -109,7 +109,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 13 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_VCR/49_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_VCR/49_-1.ir
index 8a53db30..cc0fc126 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_VCR/49_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_VCR/49_-1.ir
@@ -13,55 +13,55 @@ protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 19 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 44 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_Visa/20_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_Visa/20_-1.ir
index 0609e51f..b47bc6df 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_Visa/20_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_Visa/20_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -133,49 +133,49 @@ protocol: NECext
 address: 14 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 16 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 14 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_3-
+name: 3-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 28 00 00 00
 #
-name: KEY_4-
+name: 4-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/D/Daewoo/Unknown_r-22/0_-1.ir b/_CSV-IRDB_/D/Daewoo/Unknown_r-22/0_-1.ir
index defe2bfa..c18a564d 100644
--- a/_CSV-IRDB_/D/Daewoo/Unknown_r-22/0_-1.ir
+++ b/_CSV-IRDB_/D/Daewoo/Unknown_r-22/0_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/Dantax/Unknown_RC/0_-1.ir b/_CSV-IRDB_/D/Dantax/Unknown_RC/0_-1.ir
index 4c4e5b36..dd9930fa 100644
--- a/_CSV-IRDB_/D/Dantax/Unknown_RC/0_-1.ir
+++ b/_CSV-IRDB_/D/Dantax/Unknown_RC/0_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,67 +13,67 @@ protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,139 +85,139 @@ protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,25 +229,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_3d
+name: 3d
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/Dell/TV/0_28.ir b/_CSV-IRDB_/D/Dell/TV/0_28.ir
index 6ad95eca..d8d24bda 100644
--- a/_CSV-IRDB_/D/Dell/TV/0_28.ir
+++ b/_CSV-IRDB_/D/Dell/TV/0_28.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 00 1C 00 00
 command: 01 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 00 1C 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 00 1C 00 00
 command: 04 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 1C 00 00
diff --git a/_CSV-IRDB_/D/Dell/Unknown_XPS/43_28.ir b/_CSV-IRDB_/D/Dell/Unknown_XPS/43_28.ir
index 08b84116..a656d68a 100644
--- a/_CSV-IRDB_/D/Dell/Unknown_XPS/43_28.ir
+++ b/_CSV-IRDB_/D/Dell/Unknown_XPS/43_28.ir
@@ -7,49 +7,49 @@ protocol: NECext
 address: 2B 1C 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: 11 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: 21 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: 2C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: 2E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: 2F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 2B 1C 00 00
 command: 5C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: A4 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
 command: CE 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 2B 1C 00 00
diff --git a/_CSV-IRDB_/D/Denon/AV_Processor/2_-1.ir b/_CSV-IRDB_/D/Denon/AV_Processor/2_-1.ir
index 144d4ee0..da6452cf 100644
--- a/_CSV-IRDB_/D/Denon/AV_Processor/2_-1.ir
+++ b/_CSV-IRDB_/D/Denon/AV_Processor/2_-1.ir
@@ -151,13 +151,13 @@ protocol: NECext
 address: 02 00 00 00
 command: F0 00 00 00
 #
-name: VOLUME_+_MAIN
+name: VOL+_MAIN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: F1 00 00 00
 #
-name: VOLUME_-_MAIN
+name: VOL-_MAIN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Amplifier/2_-1.ir b/_CSV-IRDB_/D/Denon/Amplifier/2_-1.ir
index 8c4197f7..ed282886 100644
--- a/_CSV-IRDB_/D/Denon/Amplifier/2_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Amplifier/2_-1.ir
@@ -37,13 +37,13 @@ protocol: NECext
 address: 02 00 00 00
 command: 4B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/CD_Player/8_-1.ir b/_CSV-IRDB_/D/Denon/CD_Player/8_-1.ir
index 296cde8c..64ff135d 100644
--- a/_CSV-IRDB_/D/Denon/CD_Player/8_-1.ir
+++ b/_CSV-IRDB_/D/Denon/CD_Player/8_-1.ir
@@ -229,7 +229,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Cassette_Tape/2_-1.ir b/_CSV-IRDB_/D/Denon/Cassette_Tape/2_-1.ir
index ec8000ac..1598462b 100644
--- a/_CSV-IRDB_/D/Denon/Cassette_Tape/2_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Cassette_Tape/2_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/DVD_Player/176_0.ir b/_CSV-IRDB_/D/Denon/DVD_Player/176_0.ir
index 40182576..3dc9ea24 100644
--- a/_CSV-IRDB_/D/Denon/DVD_Player/176_0.ir
+++ b/_CSV-IRDB_/D/Denon/DVD_Player/176_0.ir
@@ -439,7 +439,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 92 00 00 00
 #
-name: OFF/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/DVD_Player/8_-1.ir b/_CSV-IRDB_/D/Denon/DVD_Player/8_-1.ir
index 6a0e56e1..2e9351eb 100644
--- a/_CSV-IRDB_/D/Denon/DVD_Player/8_-1.ir
+++ b/_CSV-IRDB_/D/Denon/DVD_Player/8_-1.ir
@@ -895,7 +895,7 @@ protocol: NECext
 address: 08 00 00 00
 command: B1 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Processor/2_-1.ir b/_CSV-IRDB_/D/Denon/Processor/2_-1.ir
index 92e3b064..088198cf 100644
--- a/_CSV-IRDB_/D/Denon/Processor/2_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Processor/2_-1.ir
@@ -367,25 +367,25 @@ protocol: NECext
 address: 02 00 00 00
 command: F0 00 00 00
 #
-name: VOLUME_+_MAIN
+name: VOL+_MAIN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: F1 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: F1 00 00 00
 #
-name: VOLUME_-_MAIN
+name: VOL-_MAIN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: F2 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Receiver/7_6.ir b/_CSV-IRDB_/D/Denon/Receiver/7_6.ir
index a6318ae9..4b34e663 100644
--- a/_CSV-IRDB_/D/Denon/Receiver/7_6.ir
+++ b/_CSV-IRDB_/D/Denon/Receiver/7_6.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 07 06 00 00
 command: 02 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 07 06 00 00
@@ -337,13 +337,13 @@ protocol: NECext
 address: 07 06 00 00
 command: 103 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 06 00 00
 command: 110 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 06 00 00
diff --git a/_CSV-IRDB_/D/Denon/Receiver/7_7.ir b/_CSV-IRDB_/D/Denon/Receiver/7_7.ir
index 63154e42..74a85dbf 100644
--- a/_CSV-IRDB_/D/Denon/Receiver/7_7.ir
+++ b/_CSV-IRDB_/D/Denon/Receiver/7_7.ir
@@ -235,13 +235,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 86 00 00 00
 #
-name: Z2_VOLUME_+
+name: Z2_VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 110 00 00 00
 #
-name: Z2_VOLUME_-
+name: Z2_VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/D/Denon/Receiver/7_8.ir b/_CSV-IRDB_/D/Denon/Receiver/7_8.ir
index 93b52095..f36bd51c 100644
--- a/_CSV-IRDB_/D/Denon/Receiver/7_8.ir
+++ b/_CSV-IRDB_/D/Denon/Receiver/7_8.ir
@@ -229,13 +229,13 @@ protocol: NECext
 address: 07 08 00 00
 command: 86 00 00 00
 #
-name: Z3_VOLUME_+
+name: Z3_VOL+
 type: parsed
 protocol: NECext
 address: 07 08 00 00
 command: 110 00 00 00
 #
-name: Z3_VOLUME_-
+name: Z3_VOL-
 type: parsed
 protocol: NECext
 address: 07 08 00 00
diff --git a/_CSV-IRDB_/D/Denon/Tuner/12_-1.ir b/_CSV-IRDB_/D/Denon/Tuner/12_-1.ir
index 83b11bfd..a9348a01 100644
--- a/_CSV-IRDB_/D/Denon/Tuner/12_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Tuner/12_-1.ir
@@ -175,7 +175,7 @@ protocol: NECext
 address: 0C 00 00 00
 command: D6 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown/176_0.ir b/_CSV-IRDB_/D/Denon/Unknown/176_0.ir
index 72625fba..20cc7a69 100644
--- a/_CSV-IRDB_/D/Denon/Unknown/176_0.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown/176_0.ir
@@ -211,7 +211,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 92 00 00 00
 #
-name: OFF/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_Denon/91_-1.ir b/_CSV-IRDB_/D/Denon/Unknown_Denon/91_-1.ir
index dca16034..059f0893 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_Denon/91_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_Denon/91_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
@@ -85,31 +85,31 @@ protocol: NECext
 address: 5B 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 17 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
@@ -121,79 +121,79 @@ protocol: NECext
 address: 5B 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 50 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 51 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 52 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 53 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 55 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 56 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 5B 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_RC-220/8_-1.ir b/_CSV-IRDB_/D/Denon/Unknown_RC-220/8_-1.ir
index be309a12..8ea24a5e 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_RC-220/8_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_RC-220/8_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 59 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_RC-224/8_-1.ir b/_CSV-IRDB_/D/Denon/Unknown_RC-224/8_-1.ir
index f8732283..e8e83f4c 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_RC-224/8_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_RC-224/8_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -97,49 +97,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 54 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 59 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_RC-241/8_-1.ir b/_CSV-IRDB_/D/Denon/Unknown_RC-241/8_-1.ir
index d40fd327..132ea3b0 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_RC-241/8_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_RC-241/8_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -13,79 +13,79 @@ protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_RC-541/176_0.ir b/_CSV-IRDB_/D/Denon/Unknown_RC-541/176_0.ir
index 6de36fba..68c1bb34 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_RC-541/176_0.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_RC-541/176_0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -19,91 +19,91 @@ protocol: NECext
 address: B0 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 33 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -115,61 +115,61 @@ protocol: NECext
 address: B0 00 00 00
 command: 48 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 49 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 81 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 83 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 85 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 87 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: B0 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: B0 00 00 00
 command: 92 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 94 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_RC-861/2_2.ir b/_CSV-IRDB_/D/Denon/Unknown_RC-861/2_2.ir
index 0114ead0..81fcdf42 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_RC-861/2_2.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_RC-861/2_2.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: 02 02 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 02 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 03 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -37,25 +37,25 @@ protocol: NECext
 address: 02 02 00 00
 command: 05 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 06 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 07 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 07 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 02 02 00 00
 command: 09 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 02 02 00 00
 command: 0F 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 02 02 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 12 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 13 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 02 02 00 00
 command: 17 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 02 02 00 00
 command: 19 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 02 02 00 00
 command: 1C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 02 02 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 02 02 00 00
 command: 41 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 42 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 43 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 02 02 00 00
 command: 45 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 46 00 00 00
 #
-name: KEY_5modesrs
+name: 5modesrs
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 02 02 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 49 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 02 02 00 00
 command: 4B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 02 02 00 00
 command: 4E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -301,31 +301,31 @@ protocol: NECext
 address: 02 02 00 00
 command: 50 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 51 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 52 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 53 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 56 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 02 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_RC267/6_-1.ir b/_CSV-IRDB_/D/Denon/Unknown_RC267/6_-1.ir
index 76f6e45c..b1c1ae35 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_RC267/6_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_RC267/6_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C1 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C2 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C3 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C4 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C5 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C6 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C7 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C8 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: C9 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -67,61 +67,61 @@ protocol: NECext
 address: 06 00 00 00
 command: DD 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: DE 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: DF 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: E0 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: E1 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: E2 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: E3 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: E5 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: E6 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: E8 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 06 00 00 00
 command: EA 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: EB 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: EC 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 06 00 00 00
 command: F0 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 06 00 00 00
 command: F3 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: F4 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_denon-rc-251/8_-1.ir b/_CSV-IRDB_/D/Denon/Unknown_denon-rc-251/8_-1.ir
index a3b6a962..5aeff606 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_denon-rc-251/8_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_denon-rc-251/8_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 08 00 00 00
 command: 59 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/D/Denon/Unknown_denon-rc-266/8_-1.ir b/_CSV-IRDB_/D/Denon/Unknown_denon-rc-266/8_-1.ir
index 262cbc3e..63d3dd89 100644
--- a/_CSV-IRDB_/D/Denon/Unknown_denon-rc-266/8_-1.ir
+++ b/_CSV-IRDB_/D/Denon/Unknown_denon-rc-266/8_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 08 00 00 00
 command: 59 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/D/Denver/Unknown_DVD-228/4_-1.ir b/_CSV-IRDB_/D/Denver/Unknown_DVD-228/4_-1.ir
index 344f3521..be1434f3 100644
--- a/_CSV-IRDB_/D/Denver/Unknown_DVD-228/4_-1.ir
+++ b/_CSV-IRDB_/D/Denver/Unknown_DVD-228/4_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -37,49 +37,49 @@ protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -91,97 +91,97 @@ protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 50 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -247,25 +247,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 56 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/D/Digital_Music_Expres/DMX/38_-1.ir b/_CSV-IRDB_/D/Digital_Music_Expres/DMX/38_-1.ir
index f13d76ea..66f6d690 100644
--- a/_CSV-IRDB_/D/Digital_Music_Expres/DMX/38_-1.ir
+++ b/_CSV-IRDB_/D/Digital_Music_Expres/DMX/38_-1.ir
@@ -103,19 +103,19 @@ protocol: NECext
 address: 26 00 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 26 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 26 00 00 00
 command: 21 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 26 00 00 00
diff --git a/_CSV-IRDB_/D/Digital_Projection/Projector/32_-1.ir b/_CSV-IRDB_/D/Digital_Projection/Projector/32_-1.ir
index e05d0c00..4e134f94 100644
--- a/_CSV-IRDB_/D/Digital_Projection/Projector/32_-1.ir
+++ b/_CSV-IRDB_/D/Digital_Projection/Projector/32_-1.ir
@@ -37,7 +37,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 05 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/D/Digital_Projection/Video_Projector/32_-1.ir b/_CSV-IRDB_/D/Digital_Projection/Video_Projector/32_-1.ir
index b8fc847d..5248cc0a 100644
--- a/_CSV-IRDB_/D/Digital_Projection/Video_Projector/32_-1.ir
+++ b/_CSV-IRDB_/D/Digital_Projection/Video_Projector/32_-1.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/D/Digital_Stream/Unknown_Stream/18_52.ir b/_CSV-IRDB_/D/Digital_Stream/Unknown_Stream/18_52.ir
index 0d34384b..1ffc25d9 100644
--- a/_CSV-IRDB_/D/Digital_Stream/Unknown_Stream/18_52.ir
+++ b/_CSV-IRDB_/D/Digital_Stream/Unknown_Stream/18_52.ir
@@ -1,175 +1,175 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 00 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 01 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 02 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 03 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 04 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 08 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 19 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 1B 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 1D 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 1E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 1F 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 20 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 22 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 12 34 00 00
 command: 23 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 12 34 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 12 34 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 12 34 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/HDTV_Tuner/12_-1.ir b/_CSV-IRDB_/D/DirecTV/HDTV_Tuner/12_-1.ir
index 65b83392..35a0e46c 100644
--- a/_CSV-IRDB_/D/DirecTV/HDTV_Tuner/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/HDTV_Tuner/12_-1.ir
@@ -199,13 +199,13 @@ protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Receiver_HD/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Receiver_HD/12_-1.ir
index d054ec1f..f5428a93 100644
--- a/_CSV-IRDB_/D/DirecTV/Receiver_HD/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Receiver_HD/12_-1.ir
@@ -343,13 +343,13 @@ protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Receiver_HDDVR/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Receiver_HDDVR/12_-1.ir
index 61ddd8c9..d6cbf25e 100644
--- a/_CSV-IRDB_/D/DirecTV/Receiver_HDDVR/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Receiver_HDDVR/12_-1.ir
@@ -439,13 +439,13 @@ protocol: NECext
 address: 0C 00 00 00
 command: 59 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 59 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
@@ -463,13 +463,13 @@ protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
@@ -481,7 +481,7 @@ protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Satellite/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Satellite/12_-1.ir
index 6e60efa8..6a0262d4 100644
--- a/_CSV-IRDB_/D/DirecTV/Satellite/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Satellite/12_-1.ir
@@ -493,13 +493,13 @@ protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Unknown_G051204/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Unknown_G051204/12_-1.ir
index 2ff45b63..ee30838b 100644
--- a/_CSV-IRDB_/D/DirecTV/Unknown_G051204/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Unknown_G051204/12_-1.ir
@@ -73,7 +73,7 @@ protocol: NECext
 address: 0C 00 00 00
 command: 0F 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 0C 00 00 00
 command: 44 00 00 00
 #
-name: On
+POWER
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Unknown_H23/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Unknown_H23/12_-1.ir
index 7442067e..903dcd5b 100644
--- a/_CSV-IRDB_/D/DirecTV/Unknown_H23/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Unknown_H23/12_-1.ir
@@ -187,7 +187,7 @@ protocol: NECext
 address: 0C 00 00 00
 command: 44 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 0C 00 00 00
 command: 59 00 00 00
 #
-name: on
+POWER
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Unknown_HD20-100/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Unknown_HD20-100/12_-1.ir
index 422aa8c4..9111c2c8 100644
--- a/_CSV-IRDB_/D/DirecTV/Unknown_HD20-100/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Unknown_HD20-100/12_-1.ir
@@ -151,7 +151,7 @@ protocol: NECext
 address: 0C 00 00 00
 command: 2E 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Unknown_RC16/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Unknown_RC16/12_-1.ir
index adc4168c..41b518b0 100644
--- a/_CSV-IRDB_/D/DirecTV/Unknown_RC16/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Unknown_RC16/12_-1.ir
@@ -55,13 +55,13 @@ protocol: NECext
 address: 0C 00 00 00
 command: 09 00 00 00
 #
-name: chan_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 0D 00 00 00
 #
-name: chan_down
+name: CH-
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 0C 00 00 00
 command: 0F 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Unknown_RC32/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Unknown_RC32/12_-1.ir
index 7f689b94..53471f7d 100644
--- a/_CSV-IRDB_/D/DirecTV/Unknown_RC32/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Unknown_RC32/12_-1.ir
@@ -199,19 +199,19 @@ protocol: NECext
 address: 0C 00 00 00
 command: 44 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 59 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 59 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/DirecTV/Unknown_RC64/12_-1.ir b/_CSV-IRDB_/D/DirecTV/Unknown_RC64/12_-1.ir
index c13241a7..44dde143 100644
--- a/_CSV-IRDB_/D/DirecTV/Unknown_RC64/12_-1.ir
+++ b/_CSV-IRDB_/D/DirecTV/Unknown_RC64/12_-1.ir
@@ -1,259 +1,259 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 11 00 00 00
 #
-name: KEY_DASH
+name: DASH
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 20 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 21 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 22 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 23 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 24 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 25 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 26 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 27 00 00 00
 #
-name: KEY_GUIDE
+name: GUIDE
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 28 00 00 00
 #
-name: KEY_ACTIVE
+name: ACTIVE
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 29 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 35 00 00 00
 #
-name: KEY_RESTART
+name: RESTART
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 36 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 37 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 41 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 42 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 43 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 44 00 00 00
 #
-name: KEY_FORMAT
+name: FORMAT
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 73 00 00 00
 #
-name: KEY_POWERON
+name: POWERON
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
 command: 80 00 00 00
 #
-name: KEY_POWEROFF
+name: POWEROFF
 type: parsed
 protocol: NECext
 address: 0C 00 00 00
diff --git a/_CSV-IRDB_/D/Dish_Network/Satelite_DVR/15_-1.ir b/_CSV-IRDB_/D/Dish_Network/Satelite_DVR/15_-1.ir
index fcaa3b85..5711a0cb 100644
--- a/_CSV-IRDB_/D/Dish_Network/Satelite_DVR/15_-1.ir
+++ b/_CSV-IRDB_/D/Dish_Network/Satelite_DVR/15_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/D/Dish_Network/Satellite/0_0.ir b/_CSV-IRDB_/D/Dish_Network/Satellite/0_0.ir
index d3f71ca8..2b5e14b4 100644
--- a/_CSV-IRDB_/D/Dish_Network/Satellite/0_0.ir
+++ b/_CSV-IRDB_/D/Dish_Network/Satellite/0_0.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -373,7 +373,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/Dish_Network/Satellite/15_-1.ir b/_CSV-IRDB_/D/Dish_Network/Satellite/15_-1.ir
index fcaa3b85..5711a0cb 100644
--- a/_CSV-IRDB_/D/Dish_Network/Satellite/15_-1.ir
+++ b/_CSV-IRDB_/D/Dish_Network/Satellite/15_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/D/Dish_Network/Satellite/16_0.ir b/_CSV-IRDB_/D/Dish_Network/Satellite/16_0.ir
index 6b3262c7..450baac1 100644
--- a/_CSV-IRDB_/D/Dish_Network/Satellite/16_0.ir
+++ b/_CSV-IRDB_/D/Dish_Network/Satellite/16_0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 19 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/D/Dish_Network/Satellite/28_-1.ir b/_CSV-IRDB_/D/Dish_Network/Satellite/28_-1.ir
index 7661fe40..300dd255 100644
--- a/_CSV-IRDB_/D/Dish_Network/Satellite/28_-1.ir
+++ b/_CSV-IRDB_/D/Dish_Network/Satellite/28_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 1D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
diff --git a/_CSV-IRDB_/D/Dish_Network/Satellite/48_-1.ir b/_CSV-IRDB_/D/Dish_Network/Satellite/48_-1.ir
index 352177de..3c4910be 100644
--- a/_CSV-IRDB_/D/Dish_Network/Satellite/48_-1.ir
+++ b/_CSV-IRDB_/D/Dish_Network/Satellite/48_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/D/Domland/Unknown_domland-MH10CA/131_101.ir b/_CSV-IRDB_/D/Domland/Unknown_domland-MH10CA/131_101.ir
index eed937f2..c89629bf 100644
--- a/_CSV-IRDB_/D/Domland/Unknown_domland-MH10CA/131_101.ir
+++ b/_CSV-IRDB_/D/Domland/Unknown_domland-MH10CA/131_101.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 83 65 00 00
 command: 00 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 83 65 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 08 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 83 65 00 00
 command: 0C 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 83 65 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 65 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 83 65 00 00
 command: 1D 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 83 65 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 65 00 00
diff --git a/_CSV-IRDB_/D/Dream/Satellite/0_-1.ir b/_CSV-IRDB_/D/Dream/Satellite/0_-1.ir
index 7ea24137..3d9408bf 100644
--- a/_CSV-IRDB_/D/Dream/Satellite/0_-1.ir
+++ b/_CSV-IRDB_/D/Dream/Satellite/0_-1.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: (TV)_VOLUME_+
+name: (TV)_VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: (TV)_VOLUME_-
+name: (TV)_VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/Dream/Satellite/11_0.ir b/_CSV-IRDB_/D/Dream/Satellite/11_0.ir
index fe4d2303..59073aa4 100644
--- a/_CSV-IRDB_/D/Dream/Satellite/11_0.ir
+++ b/_CSV-IRDB_/D/Dream/Satellite/11_0.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
diff --git a/_CSV-IRDB_/D/Dream/Satellite/26_0.ir b/_CSV-IRDB_/D/Dream/Satellite/26_0.ir
index 47bd2a52..457e2bd0 100644
--- a/_CSV-IRDB_/D/Dream/Satellite/26_0.ir
+++ b/_CSV-IRDB_/D/Dream/Satellite/26_0.ir
@@ -223,7 +223,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: 0B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
diff --git a/_CSV-IRDB_/D/Dream_Multimedia/Unknown_URC7562/0_-1.ir b/_CSV-IRDB_/D/Dream_Multimedia/Unknown_URC7562/0_-1.ir
index 7f0fc283..5ac07e62 100644
--- a/_CSV-IRDB_/D/Dream_Multimedia/Unknown_URC7562/0_-1.ir
+++ b/_CSV-IRDB_/D/Dream_Multimedia/Unknown_URC7562/0_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,49 +103,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/D/Durabrand/Unknown_PTV141/128_99.ir b/_CSV-IRDB_/D/Durabrand/Unknown_PTV141/128_99.ir
index 44f41ebb..80761023 100644
--- a/_CSV-IRDB_/D/Durabrand/Unknown_PTV141/128_99.ir
+++ b/_CSV-IRDB_/D/Durabrand/Unknown_PTV141/128_99.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 80 63 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 80 63 00 00
 command: 11 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 80 63 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 80 63 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 1A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 63 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 80 63 00 00
 command: 45 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 4A 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 4B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 4C 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 4D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 63 00 00
diff --git a/_CSV-IRDB_/D/Dwin/Projector/15_-1.ir b/_CSV-IRDB_/D/Dwin/Projector/15_-1.ir
index 21517335..e14b83bf 100644
--- a/_CSV-IRDB_/D/Dwin/Projector/15_-1.ir
+++ b/_CSV-IRDB_/D/Dwin/Projector/15_-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 76 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/D/Dwin/Video_Processor/1_-1.ir b/_CSV-IRDB_/D/Dwin/Video_Processor/1_-1.ir
index de583023..25522c62 100644
--- a/_CSV-IRDB_/D/Dwin/Video_Processor/1_-1.ir
+++ b/_CSV-IRDB_/D/Dwin/Video_Processor/1_-1.ir
@@ -145,7 +145,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: OFF/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/D/Dwin/Video_Projector/15_-1.ir b/_CSV-IRDB_/D/Dwin/Video_Projector/15_-1.ir
index c1d5fa25..f4763889 100644
--- a/_CSV-IRDB_/D/Dwin/Video_Projector/15_-1.ir
+++ b/_CSV-IRDB_/D/Dwin/Video_Projector/15_-1.ir
@@ -73,7 +73,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2A 00 00 00
 #
-name: OFF/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -373,7 +373,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 76 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/D/Dynaudio/Unknown_Sub/1_-1.ir b/_CSV-IRDB_/D/Dynaudio/Unknown_Sub/1_-1.ir
index 822a5b60..ffe5f59f 100644
--- a/_CSV-IRDB_/D/Dynaudio/Unknown_Sub/1_-1.ir
+++ b/_CSV-IRDB_/D/Dynaudio/Unknown_Sub/1_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0Hz
+name: 0Hz
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_0Hz
+name: 0Hz
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_0Hz
+name: 0Hz
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_0_degrees
+name: 0_degrees
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_0_degrees
+name: 0_degrees
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0_degrees
+name: 0_degrees
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_0_degrees
+name: 0_degrees
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 23 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/D/Dynex/Unknown_DX-CVS4/2_-1.ir b/_CSV-IRDB_/D/Dynex/Unknown_DX-CVS4/2_-1.ir
index afc6343f..5cc7a4b0 100644
--- a/_CSV-IRDB_/D/Dynex/Unknown_DX-CVS4/2_-1.ir
+++ b/_CSV-IRDB_/D/Dynex/Unknown_DX-CVS4/2_-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/D/daytron/Unknown_daytron/4_-1.ir b/_CSV-IRDB_/D/daytron/Unknown_daytron/4_-1.ir
index 9391cb17..b65c610b 100644
--- a/_CSV-IRDB_/D/daytron/Unknown_daytron/4_-1.ir
+++ b/_CSV-IRDB_/D/daytron/Unknown_daytron/4_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/D/dual/Unknown_dual/68_-1.ir b/_CSV-IRDB_/D/dual/Unknown_dual/68_-1.ir
index a9b9e28f..388ca729 100644
--- a/_CSV-IRDB_/D/dual/Unknown_dual/68_-1.ir
+++ b/_CSV-IRDB_/D/dual/Unknown_dual/68_-1.ir
@@ -7,37 +7,37 @@ protocol: NECext
 address: 44 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -103,31 +103,31 @@ protocol: NECext
 address: 44 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 15 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/E/E-tech/Unknown_FLY98/96_1.ir b/_CSV-IRDB_/E/E-tech/Unknown_FLY98/96_1.ir
index 461d69ce..c1221993 100644
--- a/_CSV-IRDB_/E/E-tech/Unknown_FLY98/96_1.ir
+++ b/_CSV-IRDB_/E/E-tech/Unknown_FLY98/96_1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -13,49 +13,49 @@ protocol: NECext
 address: 60 01 00 00
 command: 01 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -67,67 +67,67 @@ protocol: NECext
 address: 60 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 10 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 60 01 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 18 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 19 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 1D 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 60 01 00 00
diff --git a/_CSV-IRDB_/E/ELTASAT/Unknown_SAT170/66_253.ir b/_CSV-IRDB_/E/ELTASAT/Unknown_SAT170/66_253.ir
index 42736051..ce9905ce 100644
--- a/_CSV-IRDB_/E/ELTASAT/Unknown_SAT170/66_253.ir
+++ b/_CSV-IRDB_/E/ELTASAT/Unknown_SAT170/66_253.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 03 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 07 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 42 FD 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 42 FD 00 00
 command: 14 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 16 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 42 FD 00 00
 command: 1D 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
diff --git a/_CSV-IRDB_/E/ENTONE/Unknown_URC-4021ABA1-006-R/230_4.ir b/_CSV-IRDB_/E/ENTONE/Unknown_URC-4021ABA1-006-R/230_4.ir
index fb6953b2..7cf68174 100644
--- a/_CSV-IRDB_/E/ENTONE/Unknown_URC-4021ABA1-006-R/230_4.ir
+++ b/_CSV-IRDB_/E/ENTONE/Unknown_URC-4021ABA1-006-R/230_4.ir
@@ -1,211 +1,211 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 0B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 0C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 11 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 17 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 18 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 1A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 1B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 1C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 1F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 23 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 25 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 27 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 28 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 2B 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 2E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 2F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 35 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 36 00 00 00
 #
-name: KEY_DOT
+name: DOT
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 48 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 4D 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 4E 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 4F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 52 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: E6 04 00 00
 command: 53 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: E6 04 00 00
diff --git a/_CSV-IRDB_/E/E_Max/DVD_Player/0_223.ir b/_CSV-IRDB_/E/E_Max/DVD_Player/0_223.ir
index 99432a74..c4f8d2b8 100644
--- a/_CSV-IRDB_/E/E_Max/DVD_Player/0_223.ir
+++ b/_CSV-IRDB_/E/E_Max/DVD_Player/0_223.ir
@@ -151,13 +151,13 @@ protocol: NECext
 address: 00 DF 00 00
 command: 42 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 DF 00 00
 command: 43 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 DF 00 00
diff --git a/_CSV-IRDB_/E/Eagle_Aspen/Unknown_Aspen/120_-1.ir b/_CSV-IRDB_/E/Eagle_Aspen/Unknown_Aspen/120_-1.ir
index 05dacb5e..fd6e331f 100644
--- a/_CSV-IRDB_/E/Eagle_Aspen/Unknown_Aspen/120_-1.ir
+++ b/_CSV-IRDB_/E/Eagle_Aspen/Unknown_Aspen/120_-1.ir
@@ -7,109 +7,109 @@ protocol: NECext
 address: 78 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 81 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 82 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 84 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 85 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 86 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 89 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 92 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 95 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 96 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 97 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/E/Echostar/Satellite/4_-1.ir b/_CSV-IRDB_/E/Echostar/Satellite/4_-1.ir
index 07d74c9e..dfdb7d8d 100644
--- a/_CSV-IRDB_/E/Echostar/Satellite/4_-1.ir
+++ b/_CSV-IRDB_/E/Echostar/Satellite/4_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/E/Echostar/Unknown_AD3000IP/4_0.ir b/_CSV-IRDB_/E/Echostar/Unknown_AD3000IP/4_0.ir
index 0d34616d..afa53fc5 100644
--- a/_CSV-IRDB_/E/Echostar/Unknown_AD3000IP/4_0.ir
+++ b/_CSV-IRDB_/E/Echostar/Unknown_AD3000IP/4_0.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -103,73 +103,73 @@ protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 31 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 32 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/E/Echostar/Unknown_DSB-616/5_-1.ir b/_CSV-IRDB_/E/Echostar/Unknown_DSB-616/5_-1.ir
index e030550a..4ebb5269 100644
--- a/_CSV-IRDB_/E/Echostar/Unknown_DSB-616/5_-1.ir
+++ b/_CSV-IRDB_/E/Echostar/Unknown_DSB-616/5_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 14 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -73,139 +73,139 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: vol?
+name: VOL?
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/E/Echostar/Unknown_DSB-636/4_0.ir b/_CSV-IRDB_/E/Echostar/Unknown_DSB-636/4_0.ir
index 4d204a98..f6217069 100644
--- a/_CSV-IRDB_/E/Echostar/Unknown_DSB-636/4_0.ir
+++ b/_CSV-IRDB_/E/Echostar/Unknown_DSB-636/4_0.ir
@@ -7,91 +7,91 @@ protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -103,85 +103,85 @@ protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 31 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/DMX/14_-1.ir b/_CSV-IRDB_/E/Elan/DMX/14_-1.ir
index 61d36cee..1a0ebee8 100644
--- a/_CSV-IRDB_/E/Elan/DMX/14_-1.ir
+++ b/_CSV-IRDB_/E/Elan/DMX/14_-1.ir
@@ -91,13 +91,13 @@ protocol: NECext
 address: 0E 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/DMX/96_-1.ir b/_CSV-IRDB_/E/Elan/DMX/96_-1.ir
index 6cd4fa71..9befeeb2 100644
--- a/_CSV-IRDB_/E/Elan/DMX/96_-1.ir
+++ b/_CSV-IRDB_/E/Elan/DMX/96_-1.ir
@@ -151,13 +151,13 @@ protocol: NECext
 address: 60 00 00 00
 command: EB 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 60 00 00 00
 command: ED 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 60 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/DMX/99_-1.ir b/_CSV-IRDB_/E/Elan/DMX/99_-1.ir
index 1d2a7a45..ac283101 100644
--- a/_CSV-IRDB_/E/Elan/DMX/99_-1.ir
+++ b/_CSV-IRDB_/E/Elan/DMX/99_-1.ir
@@ -151,13 +151,13 @@ protocol: NECext
 address: 63 00 00 00
 command: EC 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 63 00 00 00
 command: ED 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 63 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/DVD_Manager/15_-1.ir b/_CSV-IRDB_/E/Elan/DVD_Manager/15_-1.ir
index de478c6d..b0574802 100644
--- a/_CSV-IRDB_/E/Elan/DVD_Manager/15_-1.ir
+++ b/_CSV-IRDB_/E/Elan/DVD_Manager/15_-1.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 0F 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/HD/0_-1.ir b/_CSV-IRDB_/E/Elan/HD/0_-1.ir
index 2527baac..c5f2480a 100644
--- a/_CSV-IRDB_/E/Elan/HD/0_-1.ir
+++ b/_CSV-IRDB_/E/Elan/HD/0_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/Master_Controller/0_-1.ir b/_CSV-IRDB_/E/Elan/Master_Controller/0_-1.ir
index 479a9b2a..621d992e 100644
--- a/_CSV-IRDB_/E/Elan/Master_Controller/0_-1.ir
+++ b/_CSV-IRDB_/E/Elan/Master_Controller/0_-1.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/Pre-Amplifier/0_-1.ir b/_CSV-IRDB_/E/Elan/Pre-Amplifier/0_-1.ir
index a0ae302f..a317c653 100644
--- a/_CSV-IRDB_/E/Elan/Pre-Amplifier/0_-1.ir
+++ b/_CSV-IRDB_/E/Elan/Pre-Amplifier/0_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/Video_Switcher/0_-1.ir b/_CSV-IRDB_/E/Elan/Video_Switcher/0_-1.ir
index 0ae3bbfe..ed5b0072 100644
--- a/_CSV-IRDB_/E/Elan/Video_Switcher/0_-1.ir
+++ b/_CSV-IRDB_/E/Elan/Video_Switcher/0_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/Volume_Control/0_-1.ir b/_CSV-IRDB_/E/Elan/Volume_Control/0_-1.ir
index 0e97ef55..6197b9d9 100644
--- a/_CSV-IRDB_/E/Elan/Volume_Control/0_-1.ir
+++ b/_CSV-IRDB_/E/Elan/Volume_Control/0_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/E/Elan/Volume_Control/1_241.ir b/_CSV-IRDB_/E/Elan/Volume_Control/1_241.ir
index 76e9aa2f..9663ea2f 100644
--- a/_CSV-IRDB_/E/Elan/Volume_Control/1_241.ir
+++ b/_CSV-IRDB_/E/Elan/Volume_Control/1_241.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 F1 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 01 F1 00 00
 command: 5A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 F1 00 00
diff --git a/_CSV-IRDB_/E/Electrocompaniet/Integrated_Amplifier/16_-1.ir b/_CSV-IRDB_/E/Electrocompaniet/Integrated_Amplifier/16_-1.ir
index f22d69c5..ecf207e2 100644
--- a/_CSV-IRDB_/E/Electrocompaniet/Integrated_Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/E/Electrocompaniet/Integrated_Amplifier/16_-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/E/Elenberg/Unknown_RC-404E/0_251.ir b/_CSV-IRDB_/E/Elenberg/Unknown_RC-404E/0_251.ir
index 6a1d7e56..83e0ec7d 100644
--- a/_CSV-IRDB_/E/Elenberg/Unknown_RC-404E/0_251.ir
+++ b/_CSV-IRDB_/E/Elenberg/Unknown_RC-404E/0_251.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 00 FB 00 00
 command: 09 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 13 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 16 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 17 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 19 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 1C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -193,37 +193,37 @@ protocol: NECext
 address: 00 FB 00 00
 command: 40 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 41 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 42 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 44 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 45 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -235,19 +235,19 @@ protocol: NECext
 address: 00 FB 00 00
 command: 49 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 4D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 52 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
diff --git a/_CSV-IRDB_/E/Elitron/Unknown_utk/7_-1.ir b/_CSV-IRDB_/E/Elitron/Unknown_utk/7_-1.ir
index d5d99ea8..0d1881b9 100644
--- a/_CSV-IRDB_/E/Elitron/Unknown_utk/7_-1.ir
+++ b/_CSV-IRDB_/E/Elitron/Unknown_utk/7_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 24 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/E/Elmo/CAMERA_PRC-100S/32_-1.ir b/_CSV-IRDB_/E/Elmo/CAMERA_PRC-100S/32_-1.ir
index b95632f1..9a593327 100644
--- a/_CSV-IRDB_/E/Elmo/CAMERA_PRC-100S/32_-1.ir
+++ b/_CSV-IRDB_/E/Elmo/CAMERA_PRC-100S/32_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/E/Elmo/Camera/128_-1.ir b/_CSV-IRDB_/E/Elmo/Camera/128_-1.ir
index 7cbfbb85..f3bc3b60 100644
--- a/_CSV-IRDB_/E/Elmo/Camera/128_-1.ir
+++ b/_CSV-IRDB_/E/Elmo/Camera/128_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 80 00 00 00
 command: 02 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/E/Emerson/TV/0_-1.ir b/_CSV-IRDB_/E/Emerson/TV/0_-1.ir
index 8fae2262..3772d7b4 100644
--- a/_CSV-IRDB_/E/Emerson/TV/0_-1.ir
+++ b/_CSV-IRDB_/E/Emerson/TV/0_-1.ir
@@ -85,7 +85,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/E/Emerson/Unknown_Emerson-NB050-DVD/135_34.ir b/_CSV-IRDB_/E/Emerson/Unknown_Emerson-NB050-DVD/135_34.ir
index 04ff6c5c..7820803c 100644
--- a/_CSV-IRDB_/E/Emerson/Unknown_Emerson-NB050-DVD/135_34.ir
+++ b/_CSV-IRDB_/E/Emerson/Unknown_Emerson-NB050-DVD/135_34.ir
@@ -1,235 +1,235 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 41 00 00 00
 #
-name: KEY_AB
+name: AB
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 43 00 00 00
 #
-name: X_KEY_OPENCLOSE
+name: X_OPENCLOSE
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 44 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 45 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 46 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 47 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 48 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 49 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 4A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 4B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 4C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 4D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 4E 00 00 00
 #
-name: X_KEY_REPEAT
+name: X_REPEAT
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 50 00 00 00
 #
-name: X_KEY_PLUSTEN
+name: X_PLUSTEN
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 51 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 52 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 53 00 00 00
 #
-name: KEY_DISPLAY
+name: DISPLAY
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 55 00 00 00
 #
-name: X_KEY_SEARCHMODE
+name: X_SEARCHMODE
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 57 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 58 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 5B 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 5C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 5D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 5E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 5F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 60 00 00 00
 #
-name: X_KEY_TOPMENU
+name: X_TOPMENU
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 70 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 71 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 72 00 00 00
 #
-name: X_KEY_RETURN
+name: X_RETURN
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 73 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 74 00 00 00
 #
-name: X_KEY_LEFTARROW
+name: X_LEFTARROW
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 75 00 00 00
 #
-name: X_KEY_RIGHTARROW
+name: X_RIGHTARROW
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 76 00 00 00
 #
-name: X_KEY_UPARROW
+name: X_UPARROW
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 77 00 00 00
 #
-name: X_KEY_DOWNARROW
+name: X_DOWNARROW
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 78 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 79 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 7A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 87 22 00 00
 command: 7B 00 00 00
 #
-name: X_KEY_VSURR
+name: X_VSURR
 type: parsed
 protocol: NECext
 address: 87 22 00 00
diff --git a/_CSV-IRDB_/E/Emerson/Unknown_emerson-cd/3_1.ir b/_CSV-IRDB_/E/Emerson/Unknown_emerson-cd/3_1.ir
index f0ae3f40..4a937442 100644
--- a/_CSV-IRDB_/E/Emerson/Unknown_emerson-cd/3_1.ir
+++ b/_CSV-IRDB_/E/Emerson/Unknown_emerson-cd/3_1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 01 00 00
 command: 20 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 01 00 00
diff --git a/_CSV-IRDB_/E/Emerson/Unknown_emerson/134_5.ir b/_CSV-IRDB_/E/Emerson/Unknown_emerson/134_5.ir
index f0049ffe..b87e23a0 100644
--- a/_CSV-IRDB_/E/Emerson/Unknown_emerson/134_5.ir
+++ b/_CSV-IRDB_/E/Emerson/Unknown_emerson/134_5.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -103,19 +103,19 @@ protocol: NECext
 address: 86 05 00 00
 command: 10 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 05 00 00
 command: 14 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 86 05 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 05 00 00
diff --git a/_CSV-IRDB_/E/Emerson/Unknown_emersontv/22_22.ir b/_CSV-IRDB_/E/Emerson/Unknown_emersontv/22_22.ir
index 07b1f1bd..5c49d90d 100644
--- a/_CSV-IRDB_/E/Emerson/Unknown_emersontv/22_22.ir
+++ b/_CSV-IRDB_/E/Emerson/Unknown_emersontv/22_22.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 16 16 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 16 16 00 00
 command: 10 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 16 16 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 16 16 00 00
 command: 14 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 15 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 16 16 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 16 16 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 16 16 00 00
 command: 1A 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 16 16 00 00
diff --git a/_CSV-IRDB_/E/Emerson/VCR/4_-1.ir b/_CSV-IRDB_/E/Emerson/VCR/4_-1.ir
index 7f3751b3..a52b0abb 100644
--- a/_CSV-IRDB_/E/Emerson/VCR/4_-1.ir
+++ b/_CSV-IRDB_/E/Emerson/VCR/4_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/E/Epson/Projector/131_85.ir b/_CSV-IRDB_/E/Epson/Projector/131_85.ir
index a4a8274b..6153e34c 100644
--- a/_CSV-IRDB_/E/Epson/Projector/131_85.ir
+++ b/_CSV-IRDB_/E/Epson/Projector/131_85.ir
@@ -181,7 +181,7 @@ protocol: NECext
 address: 83 55 00 00
 command: 90 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 83 55 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 83 55 00 00
 command: 96 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 98 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 55 00 00
diff --git a/_CSV-IRDB_/E/Epson/Unknown_12807990/131_85.ir b/_CSV-IRDB_/E/Epson/Unknown_12807990/131_85.ir
index cfe0b900..fbeeb771 100644
--- a/_CSV-IRDB_/E/Epson/Unknown_12807990/131_85.ir
+++ b/_CSV-IRDB_/E/Epson/Unknown_12807990/131_85.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 84 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 85 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 86 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 87 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 88 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 89 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 8A 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 8C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 8F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 90 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 92 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 93 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 94 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 95 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 96 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 97 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 98 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 99 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 9A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 9B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 55 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 83 55 00 00
 command: 9F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: B0 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: B1 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: B2 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 83 55 00 00
diff --git a/_CSV-IRDB_/E/Epson/Unknown_ELPST12/131_85.ir b/_CSV-IRDB_/E/Epson/Unknown_ELPST12/131_85.ir
index be1e483b..e83d3902 100644
--- a/_CSV-IRDB_/E/Epson/Unknown_ELPST12/131_85.ir
+++ b/_CSV-IRDB_/E/Epson/Unknown_ELPST12/131_85.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 84 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 83 55 00 00
@@ -31,31 +31,31 @@ protocol: NECext
 address: 83 55 00 00
 command: 8F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 90 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 92 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 93 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 9A 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 55 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 83 55 00 00
 command: 9E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: B0 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: B1 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: B2 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 83 55 00 00
diff --git a/_CSV-IRDB_/E/Escient/MP3_Player/15_-1.ir b/_CSV-IRDB_/E/Escient/MP3_Player/15_-1.ir
index fcaa3b85..5711a0cb 100644
--- a/_CSV-IRDB_/E/Escient/MP3_Player/15_-1.ir
+++ b/_CSV-IRDB_/E/Escient/MP3_Player/15_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/E/Euroconsumers/Unknown_LG-5988/136_-1.ir b/_CSV-IRDB_/E/Euroconsumers/Unknown_LG-5988/136_-1.ir
index 67d26c0d..0cbd0903 100644
--- a/_CSV-IRDB_/E/Euroconsumers/Unknown_LG-5988/136_-1.ir
+++ b/_CSV-IRDB_/E/Euroconsumers/Unknown_LG-5988/136_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 88 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 88 00 00 00
 command: 04 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 05 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 88 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 88 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 88 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -103,133 +103,133 @@ protocol: NECext
 address: 88 00 00 00
 command: 10 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 11 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 13 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 15 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 19 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 40 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 43 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 48 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 49 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -241,31 +241,31 @@ protocol: NECext
 address: 88 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 57 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 58 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 88 00 00 00
diff --git a/_CSV-IRDB_/E/Expressvu/Unknown_3100/0_0.ir b/_CSV-IRDB_/E/Expressvu/Unknown_3100/0_0.ir
index 1642914b..4b902242 100644
--- a/_CSV-IRDB_/E/Expressvu/Unknown_3100/0_0.ir
+++ b/_CSV-IRDB_/E/Expressvu/Unknown_3100/0_0.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/E/eltax/Unknown_corniche/0_246.ir b/_CSV-IRDB_/E/eltax/Unknown_corniche/0_246.ir
index 6cba9f49..2047b035 100644
--- a/_CSV-IRDB_/E/eltax/Unknown_corniche/0_246.ir
+++ b/_CSV-IRDB_/E/eltax/Unknown_corniche/0_246.ir
@@ -13,37 +13,37 @@ protocol: NECext
 address: 00 F6 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 03 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 07 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -55,55 +55,55 @@ protocol: NECext
 address: 00 F6 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 10 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 00 F6 00 00
 command: 18 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 19 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 00 F6 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 00 F6 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 40 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 00 F6 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 44 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 47 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 00 F6 00 00
 command: 4A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 4B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 00 F6 00 00
 command: 52 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 00 F6 00 00
 command: 57 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 59 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
diff --git a/_CSV-IRDB_/F/FTE_Maximal/Unknown_FTE/73_-1.ir b/_CSV-IRDB_/F/FTE_Maximal/Unknown_FTE/73_-1.ir
index 19b8a9a2..564e42d7 100644
--- a/_CSV-IRDB_/F/FTE_Maximal/Unknown_FTE/73_-1.ir
+++ b/_CSV-IRDB_/F/FTE_Maximal/Unknown_FTE/73_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 49 00 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -49,43 +49,43 @@ protocol: NECext
 address: 49 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 10 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 11 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 49 00 00 00
 command: 13 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 49 00 00 00
 command: 17 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
diff --git a/_CSV-IRDB_/F/FUBA/Unknown_ALPS/134_75.ir b/_CSV-IRDB_/F/FUBA/Unknown_ALPS/134_75.ir
index d042b635..1379dde8 100644
--- a/_CSV-IRDB_/F/FUBA/Unknown_ALPS/134_75.ir
+++ b/_CSV-IRDB_/F/FUBA/Unknown_ALPS/134_75.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -31,49 +31,49 @@ protocol: NECext
 address: 86 4B 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 0B 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 86 4B 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 86 4B 00 00
 command: 0F 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 86 4B 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 86 4B 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
diff --git a/_CSV-IRDB_/F/FUBA/Unknown_FUBA/134_75.ir b/_CSV-IRDB_/F/FUBA/Unknown_FUBA/134_75.ir
index 14fa48ff..633c5a46 100644
--- a/_CSV-IRDB_/F/FUBA/Unknown_FUBA/134_75.ir
+++ b/_CSV-IRDB_/F/FUBA/Unknown_FUBA/134_75.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -31,49 +31,49 @@ protocol: NECext
 address: 86 4B 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 0B 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 86 4B 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 86 4B 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 86 4B 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 4B 00 00
diff --git a/_CSV-IRDB_/F/FUNAI/Unknown_NF021RD/132_224.ir b/_CSV-IRDB_/F/FUNAI/Unknown_NF021RD/132_224.ir
index 4efd6a6d..321a1658 100644
--- a/_CSV-IRDB_/F/FUNAI/Unknown_NF021RD/132_224.ir
+++ b/_CSV-IRDB_/F/FUNAI/Unknown_NF021RD/132_224.ir
@@ -1,253 +1,253 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 09 00 00 00
 #
-name: KEY_STANDBYON
+name: STANDBYON
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 20 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 22 00 00 00
 #
-name: KEY_COLORSYSTEM
+name: COLORSYSTEM
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 2E 00 00 00
 #
-name: KEY_INPUTSELECT
+name: INPUTSELECT
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 40 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 50 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 60 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 61 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 64 00 00 00
 #
-name: KEY_SOUNDSELECT
+name: SOUNDSELECT
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 65 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 70 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 73 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 74 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 75 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 76 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 77 00 00 00
 #
-name: KEY_PROGRETURN
+name: PROGRETURN
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 78 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 79 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 7A 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 7B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 7C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 7D 00 00 00
 #
-name: KEY_SCREENMODE
+name: SCREENMODE
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 90 00 00 00
 #
-name: KEY_PIP
+name: PIP
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 91 00 00 00
 #
-name: KEY_DISP
+name: DISP
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 9B 00 00 00
 #
-name: KEY_EXPAND
+name: EXPAND
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: 9D 00 00 00
 #
-name: KEY_TXT
+name: TXT
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: A8 00 00 00
 #
-name: KEY_REVEAL
+name: REVEAL
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: A9 00 00 00
 #
-name: KEY_TXTSTOPSEQUENCE
+name: TXTSTOPSEQUENCE
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: AA 00 00 00
 #
-name: KEY_SUBCODE
+name: SUBCODE
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: AD 00 00 00
 #
-name: KEY_TXTCONTENTSPAGE
+name: TXTCONTENTSPAGE
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
 command: AE 00 00 00
 #
-name: KEY_SERVICE
+name: SERVICE
 type: parsed
 protocol: NECext
 address: 84 E0 00 00
diff --git a/_CSV-IRDB_/F/Fagor/Unknown_TEDI100/192_-1.ir b/_CSV-IRDB_/F/Fagor/Unknown_TEDI100/192_-1.ir
index 76ad9f90..1c0cb3a8 100644
--- a/_CSV-IRDB_/F/Fagor/Unknown_TEDI100/192_-1.ir
+++ b/_CSV-IRDB_/F/Fagor/Unknown_TEDI100/192_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 84 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 88 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 89 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 91 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 94 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 95 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 97 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 98 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 99 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: C0 00 00 00
diff --git a/_CSV-IRDB_/F/Falcon/Unknown_VT-1000/16_47.ir b/_CSV-IRDB_/F/Falcon/Unknown_VT-1000/16_47.ir
index ff72fea8..70304d4b 100644
--- a/_CSV-IRDB_/F/Falcon/Unknown_VT-1000/16_47.ir
+++ b/_CSV-IRDB_/F/Falcon/Unknown_VT-1000/16_47.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 10 2F 00 00
 command: 82 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 2F 00 00
 command: 83 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 10 2F 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 10 2F 00 00
 command: 86 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 10 2F 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 10 2F 00 00
 command: 8B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 2F 00 00
 command: 9A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 10 2F 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 10 2F 00 00
 command: 9C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 2F 00 00
 command: 9D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 2F 00 00
 command: 9E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 10 2F 00 00
diff --git a/_CSV-IRDB_/F/Faroudja/Video_Projector/24_-1.ir b/_CSV-IRDB_/F/Faroudja/Video_Projector/24_-1.ir
index d54bbfb3..6d2ab7fa 100644
--- a/_CSV-IRDB_/F/Faroudja/Video_Projector/24_-1.ir
+++ b/_CSV-IRDB_/F/Faroudja/Video_Projector/24_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/F/Fedders/Air_Conditioner/32_-1.ir b/_CSV-IRDB_/F/Fedders/Air_Conditioner/32_-1.ir
index e855aaaa..a88aac6e 100644
--- a/_CSV-IRDB_/F/Fedders/Air_Conditioner/32_-1.ir
+++ b/_CSV-IRDB_/F/Fedders/Air_Conditioner/32_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/F/Fisher/Surround_Processor/54_200.ir b/_CSV-IRDB_/F/Fisher/Surround_Processor/54_200.ir
index 9f51174c..5f803dc3 100644
--- a/_CSV-IRDB_/F/Fisher/Surround_Processor/54_200.ir
+++ b/_CSV-IRDB_/F/Fisher/Surround_Processor/54_200.ir
@@ -115,13 +115,13 @@ protocol: NECext
 address: 36 C8 00 00
 command: 59 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 36 C8 00 00
 command: 5A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 36 C8 00 00
diff --git a/_CSV-IRDB_/F/Fisher/TV/56_-1.ir b/_CSV-IRDB_/F/Fisher/TV/56_-1.ir
index d4492635..4af2d030 100644
--- a/_CSV-IRDB_/F/Fisher/TV/56_-1.ir
+++ b/_CSV-IRDB_/F/Fisher/TV/56_-1.ir
@@ -103,7 +103,7 @@ protocol: NECext
 address: 38 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 38 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/F/Fisher/Unknown_RC720F/104_-1.ir b/_CSV-IRDB_/F/Fisher/Unknown_RC720F/104_-1.ir
index 07c63e8b..c691d677 100644
--- a/_CSV-IRDB_/F/Fisher/Unknown_RC720F/104_-1.ir
+++ b/_CSV-IRDB_/F/Fisher/Unknown_RC720F/104_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 68 00 00 00
 command: 00 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 68 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 68 00 00 00
@@ -25,19 +25,19 @@ protocol: NECext
 address: 68 00 00 00
 command: 05 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 68 00 00 00
 command: 08 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 68 00 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 68 00 00 00
diff --git a/_CSV-IRDB_/F/Fisher/Unknown_RCA-9060/54_-1.ir b/_CSV-IRDB_/F/Fisher/Unknown_RCA-9060/54_-1.ir
index 1fe9ccf8..4232307b 100644
--- a/_CSV-IRDB_/F/Fisher/Unknown_RCA-9060/54_-1.ir
+++ b/_CSV-IRDB_/F/Fisher/Unknown_RCA-9060/54_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 00 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 36 00 00 00
@@ -19,61 +19,61 @@ protocol: NECext
 address: 36 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 36 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 36 00 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 36 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 36 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 36 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 36 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 36 00 00 00
 command: 40 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 36 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 36 00 00 00
 command: 58 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 36 00 00 00
diff --git a/_CSV-IRDB_/F/Fisher/Unknown_REM-1500/162_162.ir b/_CSV-IRDB_/F/Fisher/Unknown_REM-1500/162_162.ir
index 83a9f9c5..a1b97bc6 100644
--- a/_CSV-IRDB_/F/Fisher/Unknown_REM-1500/162_162.ir
+++ b/_CSV-IRDB_/F/Fisher/Unknown_REM-1500/162_162.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 01 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 02 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 03 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -31,31 +31,31 @@ protocol: NECext
 address: A2 A2 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 06 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 07 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: A2 A2 00 00
 command: 0E 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 11 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: A2 A2 00 00
 command: 16 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 17 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 19 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 1A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 1B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: A2 A2 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 60 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: A0 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
diff --git a/_CSV-IRDB_/F/Fisher/Unknown_ra/60_-1.ir b/_CSV-IRDB_/F/Fisher/Unknown_ra/60_-1.ir
index a6ba3de3..0430b140 100644
--- a/_CSV-IRDB_/F/Fisher/Unknown_ra/60_-1.ir
+++ b/_CSV-IRDB_/F/Fisher/Unknown_ra/60_-1.ir
@@ -55,61 +55,61 @@ protocol: NECext
 address: 3C 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 3C 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 3C 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 3C 00 00 00
 command: 42 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 3C 00 00 00
 command: 46 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 3C 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 3C 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -259,19 +259,19 @@ protocol: NECext
 address: 3C 00 00 00
 command: 57 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 59 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
diff --git a/_CSV-IRDB_/F/Fortec/Unknown_Lifetime/32_-1.ir b/_CSV-IRDB_/F/Fortec/Unknown_Lifetime/32_-1.ir
index 837de6fe..cdc279e8 100644
--- a/_CSV-IRDB_/F/Fortec/Unknown_Lifetime/32_-1.ir
+++ b/_CSV-IRDB_/F/Fortec/Unknown_Lifetime/32_-1.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 57 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 58 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/F/Fortec/Unknown_Mercury2/1_253.ir b/_CSV-IRDB_/F/Fortec/Unknown_Mercury2/1_253.ir
index d8e6faef..60cc2500 100644
--- a/_CSV-IRDB_/F/Fortec/Unknown_Mercury2/1_253.ir
+++ b/_CSV-IRDB_/F/Fortec/Unknown_Mercury2/1_253.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 01 FD 00 00
 command: 04 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 01 FD 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 08 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 09 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 01 FD 00 00
 command: 0D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -85,73 +85,73 @@ protocol: NECext
 address: 01 FD 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 19 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -169,55 +169,55 @@ protocol: NECext
 address: 01 FD 00 00
 command: 1C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 1F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 22 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 23 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 24 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 25 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 28 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 01 FD 00 00
 command: 41 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 01 FD 00 00
 command: 43 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 45 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 01 FD 00 00
 command: 47 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
@@ -271,13 +271,13 @@ protocol: NECext
 address: 01 FD 00 00
 command: 49 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
 command: 50 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 01 FD 00 00
diff --git a/_CSV-IRDB_/F/Fosgate/Pre-Amplifier/64_64.ir b/_CSV-IRDB_/F/Fosgate/Pre-Amplifier/64_64.ir
index ebd72726..72d083d6 100644
--- a/_CSV-IRDB_/F/Fosgate/Pre-Amplifier/64_64.ir
+++ b/_CSV-IRDB_/F/Fosgate/Pre-Amplifier/64_64.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 62 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 40 40 00 00
 command: A2 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/F/Fosgate/Surround_Processor/132_66.ir b/_CSV-IRDB_/F/Fosgate/Surround_Processor/132_66.ir
index 9e9e471b..b2024e0d 100644
--- a/_CSV-IRDB_/F/Fosgate/Surround_Processor/132_66.ir
+++ b/_CSV-IRDB_/F/Fosgate/Surround_Processor/132_66.ir
@@ -193,7 +193,7 @@ protocol: NECext
 address: 84 42 00 00
 command: 19 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 42 00 00
@@ -427,7 +427,7 @@ protocol: NECext
 address: 84 42 00 00
 command: 58 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 42 00 00
diff --git a/_CSV-IRDB_/F/Foxtel/Set_Top_Box/33_160.ir b/_CSV-IRDB_/F/Foxtel/Set_Top_Box/33_160.ir
index 22c4572c..1b7bf1d8 100644
--- a/_CSV-IRDB_/F/Foxtel/Set_Top_Box/33_160.ir
+++ b/_CSV-IRDB_/F/Foxtel/Set_Top_Box/33_160.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 21 A0 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 21 A0 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 21 A0 00 00
diff --git a/_CSV-IRDB_/F/Foxtel/Unknown_Digital/0_0.ir b/_CSV-IRDB_/F/Foxtel/Unknown_Digital/0_0.ir
index 8529007d..d4a3b7de 100644
--- a/_CSV-IRDB_/F/Foxtel/Unknown_Digital/0_0.ir
+++ b/_CSV-IRDB_/F/Foxtel/Unknown_Digital/0_0.ir
@@ -61,7 +61,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/F/Foxtel/Unknown_foxtel/33_160.ir b/_CSV-IRDB_/F/Foxtel/Unknown_foxtel/33_160.ir
index 3ba3ac99..1aea2a4a 100644
--- a/_CSV-IRDB_/F/Foxtel/Unknown_foxtel/33_160.ir
+++ b/_CSV-IRDB_/F/Foxtel/Unknown_foxtel/33_160.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 21 A0 00 00
 command: 09 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 21 A0 00 00
 command: 0C 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 21 A0 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 21 A0 00 00
 command: 0F 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 21 A0 00 00
 command: 10 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 21 A0 00 00
diff --git a/_CSV-IRDB_/F/Free/Unknown_REMOTE/11_-1.ir b/_CSV-IRDB_/F/Free/Unknown_REMOTE/11_-1.ir
index bf640315..c04c0969 100644
--- a/_CSV-IRDB_/F/Free/Unknown_REMOTE/11_-1.ir
+++ b/_CSV-IRDB_/F/Free/Unknown_REMOTE/11_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 00 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
@@ -55,25 +55,25 @@ protocol: NECext
 address: 0B 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 12 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
@@ -85,73 +85,73 @@ protocol: NECext
 address: 0B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 20 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 21 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 22 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 23 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 24 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 25 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 27 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
@@ -163,31 +163,31 @@ protocol: NECext
 address: 0B 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 31 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 0B 00 00 00
 command: 37 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
diff --git a/_CSV-IRDB_/F/Free/Unknown_V5/36_12.ir b/_CSV-IRDB_/F/Free/Unknown_V5/36_12.ir
index 819f8892..7c85493b 100644
--- a/_CSV-IRDB_/F/Free/Unknown_V5/36_12.ir
+++ b/_CSV-IRDB_/F/Free/Unknown_V5/36_12.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 00 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 24 0C 00 00
 command: 00 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 24 0C 00 00
 command: 00 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 24 0C 00 00
@@ -49,109 +49,109 @@ protocol: NECext
 address: 24 0C 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 24 0C 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 24 0C 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 24 00 00 00
@@ -163,31 +163,31 @@ protocol: NECext
 address: 24 0C 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 24 00 00 00
@@ -199,49 +199,49 @@ protocol: NECext
 address: 24 0C 00 00
 command: 40 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 24 0C 00 00
@@ -253,19 +253,19 @@ protocol: NECext
 address: 24 00 00 00
 command: 81 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 24 00 00 00
 command: B8 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 24 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 24 00 00 00
 command: D7 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 24 00 00 00
diff --git a/_CSV-IRDB_/F/Freecom/Unknown_MP35/128_-1.ir b/_CSV-IRDB_/F/Freecom/Unknown_MP35/128_-1.ir
index 239dd76d..0fc8df2c 100644
--- a/_CSV-IRDB_/F/Freecom/Unknown_MP35/128_-1.ir
+++ b/_CSV-IRDB_/F/Freecom/Unknown_MP35/128_-1.ir
@@ -1,253 +1,253 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 00 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SCREEN
+name: SCREEN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 03 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 06 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 08 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 09 00 00 00
 #
-name: KEY_REPLY
+name: REPLY
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_BRIGHTNESSDOWN
+name: BRIGHTNESSDOWN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 10 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 14 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 16 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 17 00 00 00
 #
-name: KEY_HOMEPAGE
+name: HOMEPAGE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 42 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 46 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 47 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 56 00 00 00
 #
-name: KEY_REDO
+name: REDO
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 57 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 58 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 59 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_MEDIA
+name: MEDIA
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/F/Freecom/Unknown_usb/128_-1.ir b/_CSV-IRDB_/F/Freecom/Unknown_usb/128_-1.ir
index b36c88ac..c955e437 100644
--- a/_CSV-IRDB_/F/Freecom/Unknown_usb/128_-1.ir
+++ b/_CSV-IRDB_/F/Freecom/Unknown_usb/128_-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_UNKNOWN
+name: UNKNOWN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/F/Fresat/Unknown_SER-3000PL/8_64.ir b/_CSV-IRDB_/F/Fresat/Unknown_SER-3000PL/8_64.ir
index fb1e6689..a8c061c3 100644
--- a/_CSV-IRDB_/F/Fresat/Unknown_SER-3000PL/8_64.ir
+++ b/_CSV-IRDB_/F/Fresat/Unknown_SER-3000PL/8_64.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: X_KEY_2_LNB
+name: X_2_LNB
 type: parsed
 protocol: NECext
 address: 08 40 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 08 40 00 00
 command: 02 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 40 00 00
 command: 03 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 40 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 08 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 40 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 08 40 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 40 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 08 40 00 00
 command: 12 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 40 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 08 40 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 40 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 08 40 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 40 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 40 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 08 40 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 40 00 00
diff --git a/_CSV-IRDB_/F/Fujitsu/Plasma/132_-1.ir b/_CSV-IRDB_/F/Fujitsu/Plasma/132_-1.ir
index 143ceb3f..a583c6ec 100644
--- a/_CSV-IRDB_/F/Fujitsu/Plasma/132_-1.ir
+++ b/_CSV-IRDB_/F/Fujitsu/Plasma/132_-1.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 84 00 00 00
 command: 01 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 84 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 84 00 00 00
 command: 20 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 84 00 00 00
 command: 21 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 21 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/F/Fujitsu/Plasma/132_140.ir b/_CSV-IRDB_/F/Fujitsu/Plasma/132_140.ir
index c9da1cb3..dd0835bd 100644
--- a/_CSV-IRDB_/F/Fujitsu/Plasma/132_140.ir
+++ b/_CSV-IRDB_/F/Fujitsu/Plasma/132_140.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 8C 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 84 8C 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 8C 00 00
diff --git a/_CSV-IRDB_/F/Fujitsu/TV/132_-1.ir b/_CSV-IRDB_/F/Fujitsu/TV/132_-1.ir
index 8037aa89..6ac95174 100644
--- a/_CSV-IRDB_/F/Fujitsu/TV/132_-1.ir
+++ b/_CSV-IRDB_/F/Fujitsu/TV/132_-1.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: 84 00 00 00
 command: 08 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/F/Fujitsu/Unknown_CP300375-01/4_15.ir b/_CSV-IRDB_/F/Fujitsu/Unknown_CP300375-01/4_15.ir
index ecb1dec4..a231db95 100644
--- a/_CSV-IRDB_/F/Fujitsu/Unknown_CP300375-01/4_15.ir
+++ b/_CSV-IRDB_/F/Fujitsu/Unknown_CP300375-01/4_15.ir
@@ -1,241 +1,241 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_DIGITS
+name: DIGITS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_KPASTERISK
+name: KPASTERISK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_TV2
+name: TV2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/F/Fujitsu_Siemens/Unknown_RC1-1241-21/32_176.ir b/_CSV-IRDB_/F/Fujitsu_Siemens/Unknown_RC1-1241-21/32_176.ir
index 2fc93b4d..60c579e7 100644
--- a/_CSV-IRDB_/F/Fujitsu_Siemens/Unknown_RC1-1241-21/32_176.ir
+++ b/_CSV-IRDB_/F/Fujitsu_Siemens/Unknown_RC1-1241-21/32_176.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 09 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 20 B0 00 00
 command: 2C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 2E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 2F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
@@ -145,97 +145,97 @@ protocol: NECext
 address: 20 B0 00 00
 command: 40 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 42 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 5C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 81 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 82 00 00 00
 #
-name: KEY_KEYBOARD
+name: KEYBOARD
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 86 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 87 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: 88 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: DA 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: EF 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
 command: F0 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 B0 00 00
diff --git a/_CSV-IRDB_/F/Fujitsu_Siemens/Unknown_RC811/4_15.ir b/_CSV-IRDB_/F/Fujitsu_Siemens/Unknown_RC811/4_15.ir
index 4d583b5d..049c04e0 100644
--- a/_CSV-IRDB_/F/Fujitsu_Siemens/Unknown_RC811/4_15.ir
+++ b/_CSV-IRDB_/F/Fujitsu_Siemens/Unknown_RC811/4_15.ir
@@ -1,163 +1,163 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_PROG1
+name: PROG1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/F/Fujtech/Unknown_DVB-T/3_-1.ir b/_CSV-IRDB_/F/Fujtech/Unknown_DVB-T/3_-1.ir
index 18496be3..80d86829 100644
--- a/_CSV-IRDB_/F/Fujtech/Unknown_DVB-T/3_-1.ir
+++ b/_CSV-IRDB_/F/Fujtech/Unknown_DVB-T/3_-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 02 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 15 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 16 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/F/fenner/Unknown_fenner/95_0.ir b/_CSV-IRDB_/F/fenner/Unknown_fenner/95_0.ir
index 23ecd457..e60e5e18 100644
--- a/_CSV-IRDB_/F/fenner/Unknown_fenner/95_0.ir
+++ b/_CSV-IRDB_/F/fenner/Unknown_fenner/95_0.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 5F 00 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 5F 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 5F 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 5F 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 5F 00 00 00
diff --git a/_CSV-IRDB_/G/GAMEFACTORY/Unknown_PS2DVD/0_246.ir b/_CSV-IRDB_/G/GAMEFACTORY/Unknown_PS2DVD/0_246.ir
index 54e84a69..add170a7 100644
--- a/_CSV-IRDB_/G/GAMEFACTORY/Unknown_PS2DVD/0_246.ir
+++ b/_CSV-IRDB_/G/GAMEFACTORY/Unknown_PS2DVD/0_246.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 00 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 01 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 04 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 05 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 00 F6 00 00
 command: 08 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 00 F6 00 00
 command: 0B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
diff --git a/_CSV-IRDB_/G/GE/TV/15_-1.ir b/_CSV-IRDB_/G/GE/TV/15_-1.ir
index 785b3b41..6d327768 100644
--- a/_CSV-IRDB_/G/GE/TV/15_-1.ir
+++ b/_CSV-IRDB_/G/GE/TV/15_-1.ir
@@ -85,7 +85,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/G/GE/VCR/14_-1.ir b/_CSV-IRDB_/G/GE/VCR/14_-1.ir
index ca1c81df..1d647bc8 100644
--- a/_CSV-IRDB_/G/GE/VCR/14_-1.ir
+++ b/_CSV-IRDB_/G/GE/VCR/14_-1.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -43,61 +43,61 @@ protocol: NECext
 address: 0E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -109,79 +109,79 @@ protocol: NECext
 address: 0E 00 00 00
 command: 24 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 47 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
diff --git a/_CSV-IRDB_/G/GE/VCR_VKFS0938/14_-1.ir b/_CSV-IRDB_/G/GE/VCR_VKFS0938/14_-1.ir
index b4618354..91d4b272 100644
--- a/_CSV-IRDB_/G/GE/VCR_VKFS0938/14_-1.ir
+++ b/_CSV-IRDB_/G/GE/VCR_VKFS0938/14_-1.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -49,37 +49,37 @@ protocol: NECext
 address: 0E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 0E 00 00 00
 command: 24 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 0E 00 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 47 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
diff --git a/_CSV-IRDB_/G/GVC/Unknown_RM-RK50/143_-1.ir b/_CSV-IRDB_/G/GVC/Unknown_RM-RK50/143_-1.ir
index 78f2d46c..37d4299c 100644
--- a/_CSV-IRDB_/G/GVC/Unknown_RM-RK50/143_-1.ir
+++ b/_CSV-IRDB_/G/GVC/Unknown_RM-RK50/143_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 84 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 85 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
@@ -25,31 +25,31 @@ protocol: NECext
 address: 8F 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 92 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 93 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 94 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
diff --git a/_CSV-IRDB_/G/Galaxis/Satellite/13_80.ir b/_CSV-IRDB_/G/Galaxis/Satellite/13_80.ir
index c85d9c3b..190aad99 100644
--- a/_CSV-IRDB_/G/Galaxis/Satellite/13_80.ir
+++ b/_CSV-IRDB_/G/Galaxis/Satellite/13_80.ir
@@ -55,13 +55,13 @@ protocol: NECext
 address: 0D 50 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
diff --git a/_CSV-IRDB_/G/Galaxis/Unknown_GALAXIS-RC5/0_-1.ir b/_CSV-IRDB_/G/Galaxis/Unknown_GALAXIS-RC5/0_-1.ir
index bc22d175..2a4dc502 100644
--- a/_CSV-IRDB_/G/Galaxis/Unknown_GALAXIS-RC5/0_-1.ir
+++ b/_CSV-IRDB_/G/Galaxis/Unknown_GALAXIS-RC5/0_-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/Galaxis/Unknown_Galaxis-RCMM/13_80.ir b/_CSV-IRDB_/G/Galaxis/Unknown_Galaxis-RCMM/13_80.ir
index 919d3f10..74ab02ac 100644
--- a/_CSV-IRDB_/G/Galaxis/Unknown_Galaxis-RCMM/13_80.ir
+++ b/_CSV-IRDB_/G/Galaxis/Unknown_Galaxis-RCMM/13_80.ir
@@ -1,181 +1,181 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 09 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 21 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 3F 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 45 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 4B 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 4E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 50 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 55 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 0D 50 00 00
 command: 61 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 70 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: 78 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 0D 50 00 00
 command: C7 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
 command: CC 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 0D 50 00 00
diff --git a/_CSV-IRDB_/G/Galaxis/Unknown_Galaxis.sat/81_175.ir b/_CSV-IRDB_/G/Galaxis/Unknown_Galaxis.sat/81_175.ir
index b0fe64ce..505b1f4c 100644
--- a/_CSV-IRDB_/G/Galaxis/Unknown_Galaxis.sat/81_175.ir
+++ b/_CSV-IRDB_/G/Galaxis/Unknown_Galaxis.sat/81_175.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_QUIT
+name: QUIT
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
 command: 1D 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 51 AF 00 00
diff --git a/_CSV-IRDB_/G/Galaxis/Unknown_rc1/7_-1.ir b/_CSV-IRDB_/G/Galaxis/Unknown_rc1/7_-1.ir
index c2ff71f3..810ceb7d 100644
--- a/_CSV-IRDB_/G/Galaxis/Unknown_rc1/7_-1.ir
+++ b/_CSV-IRDB_/G/Galaxis/Unknown_rc1/7_-1.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -73,109 +73,109 @@ protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 23 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 28 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 39 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/G/General/Unknown_VCR/22_-1.ir b/_CSV-IRDB_/G/General/Unknown_VCR/22_-1.ir
index 8abf2c46..dc411729 100644
--- a/_CSV-IRDB_/G/General/Unknown_VCR/22_-1.ir
+++ b/_CSV-IRDB_/G/General/Unknown_VCR/22_-1.ir
@@ -7,49 +7,49 @@ protocol: NECext
 address: 16 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 16 00 00 00
 #
-name: ch_dwn
+name: CH-
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 16 00 00 00
diff --git a/_CSV-IRDB_/G/General_Electric/TV/15_-1.ir b/_CSV-IRDB_/G/General_Electric/TV/15_-1.ir
index 8bbc8741..2391617e 100644
--- a/_CSV-IRDB_/G/General_Electric/TV/15_-1.ir
+++ b/_CSV-IRDB_/G/General_Electric/TV/15_-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/G/General_Instrument/Cable_Box/0_-1.ir b/_CSV-IRDB_/G/General_Instrument/Cable_Box/0_-1.ir
index 31cd983b..6a703b07 100644
--- a/_CSV-IRDB_/G/General_Instrument/Cable_Box/0_-1.ir
+++ b/_CSV-IRDB_/G/General_Instrument/Cable_Box/0_-1.ir
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/General_Instrument/Cable_Box/122_-1.ir b/_CSV-IRDB_/G/General_Instrument/Cable_Box/122_-1.ir
index 43332bca..e4fbd41d 100644
--- a/_CSV-IRDB_/G/General_Instrument/Cable_Box/122_-1.ir
+++ b/_CSV-IRDB_/G/General_Instrument/Cable_Box/122_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/G/General_Instrument/Cable_Box/1_-1.ir b/_CSV-IRDB_/G/General_Instrument/Cable_Box/1_-1.ir
index c022259b..3bd0ee73 100644
--- a/_CSV-IRDB_/G/General_Instrument/Cable_Box/1_-1.ir
+++ b/_CSV-IRDB_/G/General_Instrument/Cable_Box/1_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/G/General_Instruments/Unknown_550/-1_-1.ir b/_CSV-IRDB_/G/General_Instruments/Unknown_550/-1_-1.ir
index 25a6dbff..0dfbf16f 100644
--- a/_CSV-IRDB_/G/General_Instruments/Unknown_550/-1_-1.ir
+++ b/_CSV-IRDB_/G/General_Instruments/Unknown_550/-1_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -49,79 +49,79 @@ protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,31 +133,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/G/General_Instruments/Unknown_XRC-200/0_-1.ir b/_CSV-IRDB_/G/General_Instruments/Unknown_XRC-200/0_-1.ir
index a7e65228..11589d12 100644
--- a/_CSV-IRDB_/G/General_Instruments/Unknown_XRC-200/0_-1.ir
+++ b/_CSV-IRDB_/G/General_Instruments/Unknown_XRC-200/0_-1.ir
@@ -217,13 +217,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/Geniatech/Unknown_Supera/0_-1.ir b/_CSV-IRDB_/G/Geniatech/Unknown_Supera/0_-1.ir
index 78124239..6ef0c095 100644
--- a/_CSV-IRDB_/G/Geniatech/Unknown_Supera/0_-1.ir
+++ b/_CSV-IRDB_/G/Geniatech/Unknown_Supera/0_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/Genius/Unknown_Genius-DVB-T32/5_-1.ir b/_CSV-IRDB_/G/Genius/Unknown_Genius-DVB-T32/5_-1.ir
index e1e3e2bf..e624e7aa 100644
--- a/_CSV-IRDB_/G/Genius/Unknown_Genius-DVB-T32/5_-1.ir
+++ b/_CSV-IRDB_/G/Genius/Unknown_Genius-DVB-T32/5_-1.ir
@@ -1,199 +1,199 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RF
+name: RF
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FAV
+name: FAV
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1F 00 00 00
 #
-name: X_KEY_SCAN
+name: X_SCAN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: X_KEY_TV_RADIO
+name: X_TV_RADIO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: X_KEY_TV_AV
+name: X_TV_AV
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 38 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 3B 00 00 00
 #
-name: X_KEY_RCL
+name: X_RCL
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/G/Genus/Unknown_DU1/128_-1.ir b/_CSV-IRDB_/G/Genus/Unknown_DU1/128_-1.ir
index b4175346..2503f45d 100644
--- a/_CSV-IRDB_/G/Genus/Unknown_DU1/128_-1.ir
+++ b/_CSV-IRDB_/G/Genus/Unknown_DU1/128_-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 80 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 03 00 00 00
 #
-name: volume
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -37,73 +37,73 @@ protocol: NECext
 address: 80 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 13 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 14 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 16 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 80 00 00 00
 command: 41 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/G/Gericom/Plasma/3_-1.ir b/_CSV-IRDB_/G/Gericom/Plasma/3_-1.ir
index 092f47cf..2199ef11 100644
--- a/_CSV-IRDB_/G/Gericom/Plasma/3_-1.ir
+++ b/_CSV-IRDB_/G/Gericom/Plasma/3_-1.ir
@@ -277,7 +277,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 52 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -301,7 +301,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 56 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/G/Get/Unknown_gethdpvr/72_36.ir b/_CSV-IRDB_/G/Get/Unknown_gethdpvr/72_36.ir
index fdaa1c90..174de694 100644
--- a/_CSV-IRDB_/G/Get/Unknown_gethdpvr/72_36.ir
+++ b/_CSV-IRDB_/G/Get/Unknown_gethdpvr/72_36.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 09 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 48 24 00 00
@@ -73,91 +73,91 @@ protocol: NECext
 address: 48 24 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 0D 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 0E 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 18 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 1A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 1B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 1C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 1D 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 48 24 00 00
@@ -169,37 +169,37 @@ protocol: NECext
 address: 48 24 00 00
 command: 20 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 21 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 22 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 23 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 24 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 25 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 48 24 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 48 24 00 00
 command: 27 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 48 24 00 00
@@ -223,43 +223,43 @@ protocol: NECext
 address: 48 24 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 2A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 2B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 2D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 2E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 48 24 00 00
 command: 2F 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 48 24 00 00
diff --git a/_CSV-IRDB_/G/Gigabyte/Unknown_TV/134_107.ir b/_CSV-IRDB_/G/Gigabyte/Unknown_TV/134_107.ir
index d626542b..6e52974d 100644
--- a/_CSV-IRDB_/G/Gigabyte/Unknown_TV/134_107.ir
+++ b/_CSV-IRDB_/G/Gigabyte/Unknown_TV/134_107.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -115,55 +115,55 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 54 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 55 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 56 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 57 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 58 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 59 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/G/GoldStar/Unknown_GOLDSTAR/4_-1.ir b/_CSV-IRDB_/G/GoldStar/Unknown_GOLDSTAR/4_-1.ir
index 9a4a3e26..5fd8615b 100644
--- a/_CSV-IRDB_/G/GoldStar/Unknown_GOLDSTAR/4_-1.ir
+++ b/_CSV-IRDB_/G/GoldStar/Unknown_GOLDSTAR/4_-1.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -49,67 +49,67 @@ protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/G/GoldStar/Unknown_Goldstar-VCR/110_-1.ir b/_CSV-IRDB_/G/GoldStar/Unknown_Goldstar-VCR/110_-1.ir
index 5ecc9ad1..07d9262e 100644
--- a/_CSV-IRDB_/G/GoldStar/Unknown_Goldstar-VCR/110_-1.ir
+++ b/_CSV-IRDB_/G/GoldStar/Unknown_Goldstar-VCR/110_-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/G/GoldStar/Unknown_RN800AW/110_-1.ir b/_CSV-IRDB_/G/GoldStar/Unknown_RN800AW/110_-1.ir
index 9abd6e46..2196ffa5 100644
--- a/_CSV-IRDB_/G/GoldStar/Unknown_RN800AW/110_-1.ir
+++ b/_CSV-IRDB_/G/GoldStar/Unknown_RN800AW/110_-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/G/GoldStar/Unknown_VCR/110_-1.ir b/_CSV-IRDB_/G/GoldStar/Unknown_VCR/110_-1.ir
index 639bce71..c9d6bd56 100644
--- a/_CSV-IRDB_/G/GoldStar/Unknown_VCR/110_-1.ir
+++ b/_CSV-IRDB_/G/GoldStar/Unknown_VCR/110_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -13,133 +13,133 @@ protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 82 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 83 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 89 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/G/GoldStar/Unknown_cd/16_16.ir b/_CSV-IRDB_/G/GoldStar/Unknown_cd/16_16.ir
index b06d9c4e..d84744e2 100644
--- a/_CSV-IRDB_/G/GoldStar/Unknown_cd/16_16.ir
+++ b/_CSV-IRDB_/G/GoldStar/Unknown_cd/16_16.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 10 10 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 10 10 00 00
 command: 02 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 10 10 00 00
@@ -31,31 +31,31 @@ protocol: NECext
 address: 10 10 00 00
 command: 04 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 05 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 06 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 07 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 08 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 10 10 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 10 10 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 1E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 10 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 10 10 00 00
 command: 4D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 10 10 00 00
diff --git a/_CSV-IRDB_/G/Golden_Interstar/Unknown_Interstar/4_16.ir b/_CSV-IRDB_/G/Golden_Interstar/Unknown_Interstar/4_16.ir
index 1ed687f5..56707819 100644
--- a/_CSV-IRDB_/G/Golden_Interstar/Unknown_Interstar/4_16.ir
+++ b/_CSV-IRDB_/G/Golden_Interstar/Unknown_Interstar/4_16.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 04 10 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 0C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 0D 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -97,43 +97,43 @@ protocol: NECext
 address: 04 10 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 15 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -145,43 +145,43 @@ protocol: NECext
 address: 04 10 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 18 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 19 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 1A 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 1B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 1C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 1E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 04 10 00 00
 command: 40 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -205,25 +205,25 @@ protocol: NECext
 address: 04 10 00 00
 command: 42 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 43 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 44 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 45 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 04 10 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 10 00 00
diff --git a/_CSV-IRDB_/G/Goodmans/Unknown_GDB/8_-1.ir b/_CSV-IRDB_/G/Goodmans/Unknown_GDB/8_-1.ir
index 1581ea01..d5a55692 100644
--- a/_CSV-IRDB_/G/Goodmans/Unknown_GDB/8_-1.ir
+++ b/_CSV-IRDB_/G/Goodmans/Unknown_GDB/8_-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -85,43 +85,43 @@ protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -133,67 +133,67 @@ protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 21 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 22 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 26 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 34 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/G/Goodmans/Unknown_GDVD124/0_-1.ir b/_CSV-IRDB_/G/Goodmans/Unknown_GDVD124/0_-1.ir
index 187a2a32..77da7439 100644
--- a/_CSV-IRDB_/G/Goodmans/Unknown_GDVD124/0_-1.ir
+++ b/_CSV-IRDB_/G/Goodmans/Unknown_GDVD124/0_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,91 +73,91 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/Goodmans/Unknown_RC-BM/128_123.ir b/_CSV-IRDB_/G/Goodmans/Unknown_RC-BM/128_123.ir
index a511525a..c310a57a 100644
--- a/_CSV-IRDB_/G/Goodmans/Unknown_RC-BM/128_123.ir
+++ b/_CSV-IRDB_/G/Goodmans/Unknown_RC-BM/128_123.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 0E 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 80 7B 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 1E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 45 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 4C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
diff --git a/_CSV-IRDB_/G/Goodmans/Unknown_md305/135_108.ir b/_CSV-IRDB_/G/Goodmans/Unknown_md305/135_108.ir
index feda1705..9572337b 100644
--- a/_CSV-IRDB_/G/Goodmans/Unknown_md305/135_108.ir
+++ b/_CSV-IRDB_/G/Goodmans/Unknown_md305/135_108.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 87 6C 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 15 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 16 00 00 00
 #
-name: KEY_SPACE
+name: SPACE
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 87 6C 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 87 6C 00 00
 command: 43 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 48 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 4A 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
 command: 4D 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 87 6C 00 00
diff --git a/_CSV-IRDB_/G/Govideo/Unknown_GoVideoD2730/8_230.ir b/_CSV-IRDB_/G/Govideo/Unknown_GoVideoD2730/8_230.ir
index 1e4d3856..7f92cb2f 100644
--- a/_CSV-IRDB_/G/Govideo/Unknown_GoVideoD2730/8_230.ir
+++ b/_CSV-IRDB_/G/Govideo/Unknown_GoVideoD2730/8_230.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 08 E6 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 03 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -43,37 +43,37 @@ protocol: NECext
 address: 08 E6 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 07 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 0A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 0B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -85,67 +85,67 @@ protocol: NECext
 address: 08 E6 00 00
 command: 0D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 0E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 18 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 19 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -157,25 +157,25 @@ protocol: NECext
 address: 08 E6 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 50 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -187,25 +187,25 @@ protocol: NECext
 address: 08 E6 00 00
 command: 52 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 53 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 54 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 55 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 57 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 59 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 08 E6 00 00
 command: 5B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 5E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
diff --git a/_CSV-IRDB_/G/Gradiente/Unknown_D-10/5_-1.ir b/_CSV-IRDB_/G/Gradiente/Unknown_D-10/5_-1.ir
index 734e1d7e..a839726d 100644
--- a/_CSV-IRDB_/G/Gradiente/Unknown_D-10/5_-1.ir
+++ b/_CSV-IRDB_/G/Gradiente/Unknown_D-10/5_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -55,37 +55,37 @@ protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -109,25 +109,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -157,25 +157,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/G/Gradiente/Unknown_GSD-100/132_60.ir b/_CSV-IRDB_/G/Gradiente/Unknown_GSD-100/132_60.ir
index cf173809..9620accc 100644
--- a/_CSV-IRDB_/G/Gradiente/Unknown_GSD-100/132_60.ir
+++ b/_CSV-IRDB_/G/Gradiente/Unknown_GSD-100/132_60.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 20 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 21 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -25,49 +25,49 @@ protocol: NECext
 address: 84 3C 00 00
 command: 23 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 24 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 26 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 27 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 28 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 29 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -79,37 +79,37 @@ protocol: NECext
 address: 84 3C 00 00
 command: 2C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 30 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 31 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 32 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 33 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 34 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -121,37 +121,37 @@ protocol: NECext
 address: 84 3C 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 37 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 38 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 39 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
diff --git a/_CSV-IRDB_/G/Gran_Prix/Unknown_prix/0_-1.ir b/_CSV-IRDB_/G/Gran_Prix/Unknown_prix/0_-1.ir
index 0bed5f20..25e0ee59 100644
--- a/_CSV-IRDB_/G/Gran_Prix/Unknown_prix/0_-1.ir
+++ b/_CSV-IRDB_/G/Gran_Prix/Unknown_prix/0_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,31 +79,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/Grand_Tech/Cable_Box/2_-1.ir b/_CSV-IRDB_/G/Grand_Tech/Cable_Box/2_-1.ir
index f34f529d..5187256d 100644
--- a/_CSV-IRDB_/G/Grand_Tech/Cable_Box/2_-1.ir
+++ b/_CSV-IRDB_/G/Grand_Tech/Cable_Box/2_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/G/Griffin/iPod/212_190.ir b/_CSV-IRDB_/G/Griffin/iPod/212_190.ir
index f66dbeb8..7b2c0b49 100644
--- a/_CSV-IRDB_/G/Griffin/iPod/212_190.ir
+++ b/_CSV-IRDB_/G/Griffin/iPod/212_190.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: D4 BE 00 00
 command: 00 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D4 BE 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: D4 BE 00 00
 command: 09 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D4 BE 00 00
diff --git a/_CSV-IRDB_/G/Grundig/TV/0_-1.ir b/_CSV-IRDB_/G/Grundig/TV/0_-1.ir
index a77b5785..f23c81f9 100644
--- a/_CSV-IRDB_/G/Grundig/TV/0_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/TV/0_-1.ir
@@ -43,7 +43,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_2500S/10_-1.ir b/_CSV-IRDB_/G/Grundig/Unknown_2500S/10_-1.ir
index f555eccf..be530047 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_2500S/10_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_2500S/10_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -79,31 +79,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_84D/128_-1.ir b/_CSV-IRDB_/G/Grundig/Unknown_84D/128_-1.ir
index 0f674808..9800756c 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_84D/128_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_84D/128_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 80 00 00 00
 command: 01 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 80 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 80 00 00 00
 command: 06 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 07 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 08 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 09 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 80 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 10 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 11 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -127,37 +127,37 @@ protocol: NECext
 address: 80 00 00 00
 command: 14 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 15 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 17 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 18 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 19 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -175,31 +175,31 @@ protocol: NECext
 address: 80 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3D_SOUND
+name: 3D_SOUND
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 80 00 00 00
 command: 44 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 45 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 80 00 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_CDM700.cfg/162_162.ir b/_CSV-IRDB_/G/Grundig/Unknown_CDM700.cfg/162_162.ir
index a85d7ee8..b7a45e7c 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_CDM700.cfg/162_162.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_CDM700.cfg/162_162.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 01 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 02 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -31,31 +31,31 @@ protocol: NECext
 address: A2 A2 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 06 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 07 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: A2 A2 00 00
 command: 0E 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 11 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: A2 A2 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 19 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 1A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: A2 A2 00 00
 command: 1C 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 60 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: A0 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_RC-TP3/8_-1.ir b/_CSV-IRDB_/G/Grundig/Unknown_RC-TP3/8_-1.ir
index 72159d47..6d485800 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_RC-TP3/8_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_RC-TP3/8_-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -121,37 +121,37 @@ protocol: NECext
 address: 08 00 00 00
 command: 23 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 36 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -163,55 +163,55 @@ protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_RC8400CD/20_-1.ir b/_CSV-IRDB_/G/Grundig/Unknown_RC8400CD/20_-1.ir
index 5e613be8..7b424226 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_RC8400CD/20_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_RC8400CD/20_-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -115,31 +115,31 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 32 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_RP/5_-1.ir b/_CSV-IRDB_/G/Grundig/Unknown_RP/5_-1.ir
index 02e859dc..94951a83 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_RP/5_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_RP/5_-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 70 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 7A 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_TP-750C/0_-1.ir b/_CSV-IRDB_/G/Grundig/Unknown_TP-750C/0_-1.ir
index 601f5a38..5eaf6789 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_TP-750C/0_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_TP-750C/0_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,61 +61,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_UMS9V/162_162.ir b/_CSV-IRDB_/G/Grundig/Unknown_UMS9V/162_162.ir
index 21c6222b..595727a0 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_UMS9V/162_162.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_UMS9V/162_162.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: A2 A2 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 06 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: A2 A2 00 00
 command: 0E 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 0F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: A2 A2 00 00
 command: 15 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: A2 A2 00 00
 command: 1D 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: A2 A2 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_rp700/5_-1.ir b/_CSV-IRDB_/G/Grundig/Unknown_rp700/5_-1.ir
index b85ba92f..3e88c9d6 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_rp700/5_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_rp700/5_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,55 +79,55 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/G/Grundig/Unknown_tp621/1_-1.ir b/_CSV-IRDB_/G/Grundig/Unknown_tp621/1_-1.ir
index 6532be27..89e67f22 100644
--- a/_CSV-IRDB_/G/Grundig/Unknown_tp621/1_-1.ir
+++ b/_CSV-IRDB_/G/Grundig/Unknown_tp621/1_-1.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/G/Gryphon/Integrated_Amplifier/16_-1.ir b/_CSV-IRDB_/G/Gryphon/Integrated_Amplifier/16_-1.ir
index 7a2620f7..8dff5cc0 100644
--- a/_CSV-IRDB_/G/Gryphon/Integrated_Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/G/Gryphon/Integrated_Amplifier/16_-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/G/Guillemot/Unknown_RemoteWizard-GN-263/134_107.ir b/_CSV-IRDB_/G/Guillemot/Unknown_RemoteWizard-GN-263/134_107.ir
index b029fdb9..a93bc670 100644
--- a/_CSV-IRDB_/G/Guillemot/Unknown_RemoteWizard-GN-263/134_107.ir
+++ b/_CSV-IRDB_/G/Guillemot/Unknown_RemoteWizard-GN-263/134_107.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: X_KEY_2X
+name: X_2X
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -91,49 +91,49 @@ protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/H/HB/Unknown_DIGITAL/0_-1.ir b/_CSV-IRDB_/H/HB/Unknown_DIGITAL/0_-1.ir
index d5494003..57ea7018 100644
--- a/_CSV-IRDB_/H/HB/Unknown_DIGITAL/0_-1.ir
+++ b/_CSV-IRDB_/H/HB/Unknown_DIGITAL/0_-1.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,67 +79,67 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/H/HP/Unknown_465539-002/4_15.ir b/_CSV-IRDB_/H/HP/Unknown_465539-002/4_15.ir
index eb283370..f0440001 100644
--- a/_CSV-IRDB_/H/HP/Unknown_465539-002/4_15.ir
+++ b/_CSV-IRDB_/H/HP/Unknown_465539-002/4_15.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: X_KEY_WINDOWS
+name: X_WINDOWS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 6E 00 00 00
 #
-name: KEY_MEDIA_REPEAT
+name: MEDIA_REPEAT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/H/HP/Unknown_DV4-1125NR/4_15.ir b/_CSV-IRDB_/H/HP/Unknown_DV4-1125NR/4_15.ir
index d730c39c..22f73293 100644
--- a/_CSV-IRDB_/H/HP/Unknown_DV4-1125NR/4_15.ir
+++ b/_CSV-IRDB_/H/HP/Unknown_DV4-1125NR/4_15.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -79,61 +79,61 @@ protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_FIRST
+name: FIRST
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_MEDIA
+name: MEDIA
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 6E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 80 00 00 00
 #
-name: KEY_SCREEN
+name: SCREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/H/HP/Unknown_DV6331/4_17.ir b/_CSV-IRDB_/H/HP/Unknown_DV6331/4_17.ir
index d0e02b63..b643f147 100644
--- a/_CSV-IRDB_/H/HP/Unknown_DV6331/4_17.ir
+++ b/_CSV-IRDB_/H/HP/Unknown_DV6331/4_17.ir
@@ -1,139 +1,139 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 0C 00 00 00
 #
-name: X_KEY_WINDOWS
+name: X_WINDOWS
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 11 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 12 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXTSONG
+name: NEXTSONG
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUSSONG
+name: PREVIOUSSONG
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 22 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 24 00 00 00
 #
-name: X_KEY_REPEAT
+name: X_REPEAT
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 4A 00 00 00
 #
-name: KEY_SWITCHVIDEOMODE
+name: SWITCHVIDEOMODE
 type: parsed
 protocol: NECext
 address: 04 11 00 00
diff --git a/_CSV-IRDB_/H/HP/Unknown_Pavilion/4_15.ir b/_CSV-IRDB_/H/HP/Unknown_Pavilion/4_15.ir
index 06388d96..c646052e 100644
--- a/_CSV-IRDB_/H/HP/Unknown_Pavilion/4_15.ir
+++ b/_CSV-IRDB_/H/HP/Unknown_Pavilion/4_15.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -163,55 +163,55 @@ protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -241,31 +241,31 @@ protocol: NECext
 address: 04 0F 00 00
 command: 4E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/H/HP/Unknown_RC172308-01B/4_15.ir b/_CSV-IRDB_/H/HP/Unknown_RC172308-01B/4_15.ir
index 430248d5..c6e87167 100644
--- a/_CSV-IRDB_/H/HP/Unknown_RC172308-01B/4_15.ir
+++ b/_CSV-IRDB_/H/HP/Unknown_RC172308-01B/4_15.ir
@@ -1,139 +1,139 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 6E 00 00 00
 #
-name: KEY_UNKNOWN
+name: UNKNOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 80 00 00 00
 #
-name: KEY_SWITCHVIDEOMODE
+name: SWITCHVIDEOMODE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/H/HP/Unknown_RC1762302-00/4_17.ir b/_CSV-IRDB_/H/HP/Unknown_RC1762302-00/4_17.ir
index 3222ec5c..06924c65 100644
--- a/_CSV-IRDB_/H/HP/Unknown_RC1762302-00/4_17.ir
+++ b/_CSV-IRDB_/H/HP/Unknown_RC1762302-00/4_17.ir
@@ -1,133 +1,133 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 0C 00 00 00
 #
-name: KEY_MEDIA
+name: MEDIA
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 11 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 12 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 22 00 00 00
 #
-name: KEY_BACKSPACE
+name: BACKSPACE
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 11 00 00
 command: 24 00 00 00
 #
-name: KEY_SWITCHVIDEOMODE
+name: SWITCHVIDEOMODE
 type: parsed
 protocol: NECext
 address: 04 11 00 00
diff --git a/_CSV-IRDB_/H/HP/Unknown_RC1762307-01/4_15.ir b/_CSV-IRDB_/H/HP/Unknown_RC1762307-01/4_15.ir
index d92a3140..8f277f9d 100644
--- a/_CSV-IRDB_/H/HP/Unknown_RC1762307-01/4_15.ir
+++ b/_CSV-IRDB_/H/HP/Unknown_RC1762307-01/4_15.ir
@@ -1,139 +1,139 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXTSONG
+name: NEXTSONG
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUSSONG
+name: PREVIOUSSONG
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 6E 00 00 00
 #
-name: KEY_SWITCHVIDEOMODE
+name: SWITCHVIDEOMODE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/H/HP/Unknown_RC2234302-01B/4_15.ir b/_CSV-IRDB_/H/HP/Unknown_RC2234302-01B/4_15.ir
index c1c5e874..977ee770 100644
--- a/_CSV-IRDB_/H/HP/Unknown_RC2234302-01B/4_15.ir
+++ b/_CSV-IRDB_/H/HP/Unknown_RC2234302-01B/4_15.ir
@@ -1,259 +1,259 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_KPASTERISK
+name: KPASTERISK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 39 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5E 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 6E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/H/HQ/Unknown_RC/0_-1.ir b/_CSV-IRDB_/H/HQ/Unknown_RC/0_-1.ir
index 69b13748..5fb9ce42 100644
--- a/_CSV-IRDB_/H/HQ/Unknown_RC/0_-1.ir
+++ b/_CSV-IRDB_/H/HQ/Unknown_RC/0_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,91 +19,91 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/H/Hama/Unknown_Internet/0_-1.ir b/_CSV-IRDB_/H/Hama/Unknown_Internet/0_-1.ir
index 11c64c2a..22d22580 100644
--- a/_CSV-IRDB_/H/Hama/Unknown_Internet/0_-1.ir
+++ b/_CSV-IRDB_/H/Hama/Unknown_Internet/0_-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,61 +49,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,49 +115,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/H/Hama/Unknown_PhotoPlayer/134_107.ir b/_CSV-IRDB_/H/Hama/Unknown_PhotoPlayer/134_107.ir
index 961d13a2..67311dca 100644
--- a/_CSV-IRDB_/H/Hama/Unknown_PhotoPlayer/134_107.ir
+++ b/_CSV-IRDB_/H/Hama/Unknown_PhotoPlayer/134_107.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_REPLY
+name: REPLY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_F5
+name: F5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/H/Hampton_Bay/Unknown_Bay/129_102.ir b/_CSV-IRDB_/H/Hampton_Bay/Unknown_Bay/129_102.ir
index 83341286..88893ba3 100644
--- a/_CSV-IRDB_/H/Hampton_Bay/Unknown_Bay/129_102.ir
+++ b/_CSV-IRDB_/H/Hampton_Bay/Unknown_Bay/129_102.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 81 66 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 81 66 00 00
 command: 99 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 81 66 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Amplifier/128_112.ir b/_CSV-IRDB_/H/Harman_Kardon/Amplifier/128_112.ir
index 2ebdc188..05dcd4ea 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Amplifier/128_112.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Amplifier/128_112.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: 80 70 00 00
 command: C4 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: C7 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 70 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/CD_Changer/128_112.ir b/_CSV-IRDB_/H/Harman_Kardon/CD_Changer/128_112.ir
index 8779c6d2..38941465 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/CD_Changer/128_112.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/CD_Changer/128_112.ir
@@ -163,7 +163,7 @@ protocol: NECext
 address: 80 70 00 00
 command: 55 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 80 70 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/CD_Player/128_112.ir b/_CSV-IRDB_/H/Harman_Kardon/CD_Player/128_112.ir
index c830ee9a..c0d45d45 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/CD_Player/128_112.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/CD_Player/128_112.ir
@@ -535,7 +535,7 @@ protocol: NECext
 address: 80 70 00 00
 command: 55 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 80 70 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/DVD_Player/130_114.ir b/_CSV-IRDB_/H/Harman_Kardon/DVD_Player/130_114.ir
index 9189d1c8..eac4ce76 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/DVD_Player/130_114.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/DVD_Player/130_114.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: 82 72 00 00
 command: 21 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 21 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 82 72 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Receiver/128_112.ir b/_CSV-IRDB_/H/Harman_Kardon/Receiver/128_112.ir
index 198fd52f..9ae2b244 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Receiver/128_112.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Receiver/128_112.ir
@@ -1081,7 +1081,7 @@ protocol: NECext
 address: 80 70 00 00
 command: 9C 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -1273,7 +1273,7 @@ protocol: NECext
 address: 80 70 00 00
 command: C0 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -1369,7 +1369,7 @@ protocol: NECext
 address: 80 70 00 00
 command: C6 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -1411,7 +1411,7 @@ protocol: NECext
 address: 80 70 00 00
 command: C7 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -1855,7 +1855,7 @@ protocol: NECext
 address: 80 70 00 00
 command: DB 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 80 70 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Receiver/130_114.ir b/_CSV-IRDB_/H/Harman_Kardon/Receiver/130_114.ir
index 9afa6210..9a3065de 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Receiver/130_114.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Receiver/130_114.ir
@@ -601,7 +601,7 @@ protocol: NECext
 address: 82 72 00 00
 command: 57 00 00 00
 #
-name: CHAN_DOWN
+name: CH-
 type: parsed
 protocol: NECext
 address: 82 72 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Receiver/132_66.ir b/_CSV-IRDB_/H/Harman_Kardon/Receiver/132_66.ir
index 46fc359b..92d694cf 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Receiver/132_66.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Receiver/132_66.ir
@@ -103,7 +103,7 @@ protocol: NECext
 address: 84 42 00 00
 command: 18 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 42 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 84 42 00 00
 command: 57 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 42 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Receiver/134_118.ir b/_CSV-IRDB_/H/Harman_Kardon/Receiver/134_118.ir
index ac19a889..c339a2a8 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Receiver/134_118.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Receiver/134_118.ir
@@ -127,13 +127,13 @@ protocol: NECext
 address: 86 76 00 00
 command: 2A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 76 00 00
 command: 2B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 76 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Receiver/4_-1.ir b/_CSV-IRDB_/H/Harman_Kardon/Receiver/4_-1.ir
index 9e1da22f..31eedeed 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Receiver/4_-1.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Receiver/4_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Surround_Processor/128_112.ir b/_CSV-IRDB_/H/Harman_Kardon/Surround_Processor/128_112.ir
index 00f757a8..0a2c18e7 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Surround_Processor/128_112.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Surround_Processor/128_112.ir
@@ -247,7 +247,7 @@ protocol: NECext
 address: 80 70 00 00
 command: C4 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 80 70 00 00
 command: C7 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 70 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Surround_Processor/16_-1.ir b/_CSV-IRDB_/H/Harman_Kardon/Surround_Processor/16_-1.ir
index d771a822..2e26de7a 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Surround_Processor/16_-1.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Surround_Processor/16_-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Surround_Receiver/128_112.ir b/_CSV-IRDB_/H/Harman_Kardon/Surround_Receiver/128_112.ir
index 39697ebe..5c5cf7b6 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Surround_Receiver/128_112.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Surround_Receiver/128_112.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 80 70 00 00
 command: 8E 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 80 70 00 00
 command: C4 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: C7 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 70 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Unknown_DVD/130_114.ir b/_CSV-IRDB_/H/Harman_Kardon/Unknown_DVD/130_114.ir
index 6d3137c1..8580e7a4 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Unknown_DVD/130_114.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Unknown_DVD/130_114.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 20 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -19,67 +19,67 @@ protocol: NECext
 address: 82 72 00 00
 command: 22 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 24 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 25 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 26 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 27 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 28 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 29 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 2C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -103,31 +103,31 @@ protocol: NECext
 address: 82 72 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 31 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 33 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 34 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 35 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -163,61 +163,61 @@ protocol: NECext
 address: 82 72 00 00
 command: 3D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 60 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 61 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 62 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 63 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 64 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 65 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 66 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 67 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 68 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 82 72 00 00
 command: 6B 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 82 72 00 00
 command: 6D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 82 72 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Unknown_HD730/131_74.ir b/_CSV-IRDB_/H/Harman_Kardon/Unknown_HD730/131_74.ir
index c934edd9..b70bf0dc 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Unknown_HD730/131_74.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Unknown_HD730/131_74.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 83 4A 00 00
 command: 00 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 83 4A 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 07 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 83 4A 00 00
 command: 0D 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 83 4A 00 00
 command: 12 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
@@ -115,49 +115,49 @@ protocol: NECext
 address: 83 4A 00 00
 command: 17 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 18 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 19 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 4A 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Unknown_Kardon-DVD/130_114.ir b/_CSV-IRDB_/H/Harman_Kardon/Unknown_Kardon-DVD/130_114.ir
index 793a5b71..0ac7a858 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Unknown_Kardon-DVD/130_114.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Unknown_Kardon-DVD/130_114.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 20 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -19,67 +19,67 @@ protocol: NECext
 address: 82 72 00 00
 command: 22 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 24 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 26 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 27 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 28 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 29 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 2C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 2D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 82 72 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 31 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 33 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 35 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 82 72 00 00
 command: 39 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 82 72 00 00
 command: 4C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -151,67 +151,67 @@ protocol: NECext
 address: 82 72 00 00
 command: 4E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 60 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 61 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 62 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 63 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 64 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 65 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 66 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 67 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 68 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 82 72 00 00
 command: 69 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 82 72 00 00
 command: 6D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 82 72 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 82 72 00 00
 command: 6F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 82 72 00 00
diff --git a/_CSV-IRDB_/H/Harman_Kardon/Unknown_harmankardon/128_112.ir b/_CSV-IRDB_/H/Harman_Kardon/Unknown_harmankardon/128_112.ir
index cbb73a39..1d1b70e7 100644
--- a/_CSV-IRDB_/H/Harman_Kardon/Unknown_harmankardon/128_112.ir
+++ b/_CSV-IRDB_/H/Harman_Kardon/Unknown_harmankardon/128_112.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 02 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 80 70 00 00
 command: 07 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -67,61 +67,61 @@ protocol: NECext
 address: 80 70 00 00
 command: 0E 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 80 70 00 00
 command: 1B 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 80 70 00 00
 command: 1D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 70 00 00
 command: 40 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 80 70 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 80 70 00 00
 command: 4D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 70 00 00
diff --git a/_CSV-IRDB_/H/Hauppauge/Unknown_DSR-0095/29_-1.ir b/_CSV-IRDB_/H/Hauppauge/Unknown_DSR-0095/29_-1.ir
index 5e339fd7..c5e853f5 100644
--- a/_CSV-IRDB_/H/Hauppauge/Unknown_DSR-0095/29_-1.ir
+++ b/_CSV-IRDB_/H/Hauppauge/Unknown_DSR-0095/29_-1.ir
@@ -73,13 +73,13 @@ protocol: NECext
 address: 1D 00 00 00
 command: 0E 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 10 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
diff --git a/_CSV-IRDB_/H/Hauppauge/Unknown_MVP/3_-1.ir b/_CSV-IRDB_/H/Hauppauge/Unknown_MVP/3_-1.ir
index d3ec5dda..eacdf51b 100644
--- a/_CSV-IRDB_/H/Hauppauge/Unknown_MVP/3_-1.ir
+++ b/_CSV-IRDB_/H/Hauppauge/Unknown_MVP/3_-1.ir
@@ -1,205 +1,205 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_FN_1
+name: FN_1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 37 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 38 00 00 00
 #
-name: KEY_GOTO
+name: GOTO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_FN_2
+name: FN_2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/H/Hauppauge/Unknown_R808/30_-1.ir b/_CSV-IRDB_/H/Hauppauge/Unknown_R808/30_-1.ir
index 8e071d86..ac561c3e 100644
--- a/_CSV-IRDB_/H/Hauppauge/Unknown_R808/30_-1.ir
+++ b/_CSV-IRDB_/H/Hauppauge/Unknown_R808/30_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
@@ -67,115 +67,115 @@ protocol: NECext
 address: 1E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 17 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 25 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 29 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
@@ -187,43 +187,43 @@ protocol: NECext
 address: 1E 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 37 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 37 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 38 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
diff --git a/_CSV-IRDB_/H/Hauppauge/Unknown_WinTV-HVR-950Q/29_-1.ir b/_CSV-IRDB_/H/Hauppauge/Unknown_WinTV-HVR-950Q/29_-1.ir
index 91e5c112..f830679b 100644
--- a/_CSV-IRDB_/H/Hauppauge/Unknown_WinTV-HVR-950Q/29_-1.ir
+++ b/_CSV-IRDB_/H/Hauppauge/Unknown_WinTV-HVR-950Q/29_-1.ir
@@ -1,169 +1,169 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 12 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 17 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 24 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 25 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -175,37 +175,37 @@ protocol: NECext
 address: 1D 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 37 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
diff --git a/_CSV-IRDB_/H/Hauppauge/Unknown_WinTV-HVR/4_15.ir b/_CSV-IRDB_/H/Hauppauge/Unknown_WinTV-HVR/4_15.ir
index 263b4239..8f63a819 100644
--- a/_CSV-IRDB_/H/Hauppauge/Unknown_WinTV-HVR/4_15.ir
+++ b/_CSV-IRDB_/H/Hauppauge/Unknown_WinTV-HVR/4_15.ir
@@ -103,7 +103,7 @@ protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: VolumeDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/H/Hauppauge/Unknown_hauppauge-stb/5_-1.ir b/_CSV-IRDB_/H/Hauppauge/Unknown_hauppauge-stb/5_-1.ir
index e26933b6..cc394eef 100644
--- a/_CSV-IRDB_/H/Hauppauge/Unknown_hauppauge-stb/5_-1.ir
+++ b/_CSV-IRDB_/H/Hauppauge/Unknown_hauppauge-stb/5_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 05 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/H/Hello_Kitty/Unknown_Kitty/0_-1.ir b/_CSV-IRDB_/H/Hello_Kitty/Unknown_Kitty/0_-1.ir
index 7ff987a2..478aab46 100644
--- a/_CSV-IRDB_/H/Hello_Kitty/Unknown_Kitty/0_-1.ir
+++ b/_CSV-IRDB_/H/Hello_Kitty/Unknown_Kitty/0_-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 81 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 82 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 84 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 88 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 91 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,109 +91,109 @@ protocol: NECext
 address: 00 00 00 00
 command: 94 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 96 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C0 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C1 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C2 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C4 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C5 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C6 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C7 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C8 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C9 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: CC 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: CD 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: CE 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: D0 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: D1 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: D2 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: D3 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/H/Hermstedt/Unknown_Hifidelio/16_-1.ir b/_CSV-IRDB_/H/Hermstedt/Unknown_Hifidelio/16_-1.ir
index 795e459c..759cc2c7 100644
--- a/_CSV-IRDB_/H/Hermstedt/Unknown_Hifidelio/16_-1.ir
+++ b/_CSV-IRDB_/H/Hermstedt/Unknown_Hifidelio/16_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 10 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 20 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 22 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -181,37 +181,37 @@ protocol: NECext
 address: 10 00 00 00
 command: 25 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 26 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/H/Hewlett_Packard/Plasma/18_17.ir b/_CSV-IRDB_/H/Hewlett_Packard/Plasma/18_17.ir
index 8a14deb6..ca1f0d6a 100644
--- a/_CSV-IRDB_/H/Hewlett_Packard/Plasma/18_17.ir
+++ b/_CSV-IRDB_/H/Hewlett_Packard/Plasma/18_17.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 12 11 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 12 11 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 12 11 00 00
diff --git a/_CSV-IRDB_/H/Hewlett_Packard/TV/18_17.ir b/_CSV-IRDB_/H/Hewlett_Packard/TV/18_17.ir
index 8a14deb6..ca1f0d6a 100644
--- a/_CSV-IRDB_/H/Hewlett_Packard/TV/18_17.ir
+++ b/_CSV-IRDB_/H/Hewlett_Packard/TV/18_17.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 12 11 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 12 11 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 12 11 00 00
diff --git a/_CSV-IRDB_/H/Hinen_Electronics/Unknown_Electronics/0_-1.ir b/_CSV-IRDB_/H/Hinen_Electronics/Unknown_Electronics/0_-1.ir
index 781eeadd..25578358 100644
--- a/_CSV-IRDB_/H/Hinen_Electronics/Unknown_Electronics/0_-1.ir
+++ b/_CSV-IRDB_/H/Hinen_Electronics/Unknown_Electronics/0_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/H/Hip_Interactive/Unknown_GE1002/0_246.ir b/_CSV-IRDB_/H/Hip_Interactive/Unknown_GE1002/0_246.ir
index c7312228..eb7e5d3e 100644
--- a/_CSV-IRDB_/H/Hip_Interactive/Unknown_GE1002/0_246.ir
+++ b/_CSV-IRDB_/H/Hip_Interactive/Unknown_GE1002/0_246.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 00 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 01 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 04 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 05 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 07 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 08 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 09 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Display/80_-1.ir b/_CSV-IRDB_/H/Hitachi/Display/80_-1.ir
index db5e7ff6..04412505 100644
--- a/_CSV-IRDB_/H/Hitachi/Display/80_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Display/80_-1.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: 50 00 00 00
 command: 0B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Monitor/80_-1.ir b/_CSV-IRDB_/H/Hitachi/Monitor/80_-1.ir
index 3c0e6dd6..54b56f35 100644
--- a/_CSV-IRDB_/H/Hitachi/Monitor/80_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Monitor/80_-1.ir
@@ -205,7 +205,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 15 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/TV/80_-1.ir b/_CSV-IRDB_/H/Hitachi/TV/80_-1.ir
index aad76a63..363eedeb 100644
--- a/_CSV-IRDB_/H/Hitachi/TV/80_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/TV/80_-1.ir
@@ -355,13 +355,13 @@ protocol: NECext
 address: 50 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 12 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -409,13 +409,13 @@ protocol: NECext
 address: 50 00 00 00
 command: 15 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 15 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -487,7 +487,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 18 00 00 00
 #
-name: CHAN_DOWN
+name: CH-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -535,7 +535,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 19 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -1189,13 +1189,13 @@ protocol: NECext
 address: 50 00 00 00
 command: B0 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: C0 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_CLE-941/80_-1.ir b/_CSV-IRDB_/H/Hitachi/Unknown_CLE-941/80_-1.ir
index 84452b57..599d3765 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_CLE-941/80_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_CLE-941/80_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 04 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -19,37 +19,37 @@ protocol: NECext
 address: 50 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -61,67 +61,67 @@ protocol: NECext
 address: 50 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 19 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 40 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 50 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_CLE-947/80_-1.ir b/_CSV-IRDB_/H/Hitachi/Unknown_CLE-947/80_-1.ir
index 6c7a03be..7a79afdb 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_CLE-947/80_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_CLE-947/80_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 04 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -25,31 +25,31 @@ protocol: NECext
 address: 50 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -61,43 +61,43 @@ protocol: NECext
 address: 50 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 17 00 00 00
 #
-name: X_KEY_3D-SOUND
+name: X_3D-SOUND
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 67 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 50 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 70 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_CP-X345/135_69.ir b/_CSV-IRDB_/H/Hitachi/Unknown_CP-X345/135_69.ir
index be4ced3e..d4678312 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_CP-X345/135_69.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_CP-X345/135_69.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 45 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: 87 45 00 00
 command: 18 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: 19 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: 20 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 87 45 00 00
@@ -49,25 +49,25 @@ protocol: NECext
 address: 87 45 00 00
 command: 24 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: 28 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: 2A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: 2C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 87 45 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 87 45 00 00
 command: 41 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: 52 00 00 00
 #
-name: Volume
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 45 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 87 45 00 00
 command: B6 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: D0 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: D1 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 87 45 00 00
 command: D4 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 87 45 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_DV-RM335E/128_35.ir b/_CSV-IRDB_/H/Hitachi/Unknown_DV-RM335E/128_35.ir
index 429f7b26..f2e9886c 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_DV-RM335E/128_35.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_DV-RM335E/128_35.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 00 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 02 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 03 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 04 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 23 00 00
@@ -37,25 +37,25 @@ protocol: NECext
 address: 80 23 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 07 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 08 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 23 00 00
@@ -67,91 +67,91 @@ protocol: NECext
 address: 80 23 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 0F 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 10 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 14 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 1A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 1B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 1D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 23 00 00
@@ -163,61 +163,61 @@ protocol: NECext
 address: 80 23 00 00
 command: 20 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 22 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 23 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 24 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 25 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 26 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 27 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 2A 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 2B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 23 00 00
 command: 2C 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 80 23 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 80 23 00 00
 command: 32 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 80 23 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_FX7/91_-1.ir b/_CSV-IRDB_/H/Hitachi/Unknown_FX7/91_-1.ir
index d4538a50..aa2cf4bf 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_FX7/91_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_FX7/91_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
@@ -97,73 +97,73 @@ protocol: NECext
 address: 5B 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 50 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 51 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 52 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 53 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 55 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 56 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 57 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_HFTV/71_-1.ir b/_CSV-IRDB_/H/Hitachi/Unknown_HFTV/71_-1.ir
index 39bdf4a1..0d43b43c 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_HFTV/71_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_HFTV/71_-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 00 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 10 00 00 00
 #
-name: X_KEY_1#
+name: X_1#
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 47 00 00 00
 command: 17 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 18 00 00 00
 #
-name: X_KEY_2#
+name: X_2#
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 47 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 22 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 28 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 47 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 30 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 47 00 00 00
 command: 34 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 47 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_Hitachi/1_-1.ir b/_CSV-IRDB_/H/Hitachi/Unknown_Hitachi/1_-1.ir
index 24ca8e4c..8c412062 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_Hitachi/1_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_Hitachi/1_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_Hitachi/80_-1.ir b/_CSV-IRDB_/H/Hitachi/Unknown_Hitachi/80_-1.ir
index 63310c4e..cbdd31d5 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_Hitachi/80_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_Hitachi/80_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -61,31 +61,31 @@ protocol: NECext
 address: 50 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 50 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 44 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Unknown_hitachi.conf/91_-1.ir b/_CSV-IRDB_/H/Hitachi/Unknown_hitachi.conf/91_-1.ir
index e8c05b53..711179f1 100644
--- a/_CSV-IRDB_/H/Hitachi/Unknown_hitachi.conf/91_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Unknown_hitachi.conf/91_-1.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: 5B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 5B 00 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
@@ -109,79 +109,79 @@ protocol: NECext
 address: 5B 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 50 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 51 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 52 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 53 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 55 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 56 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
 command: 57 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 5B 00 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Video_Projector/135_69.ir b/_CSV-IRDB_/H/Hitachi/Video_Projector/135_69.ir
index 62741cda..0c2fc5d7 100644
--- a/_CSV-IRDB_/H/Hitachi/Video_Projector/135_69.ir
+++ b/_CSV-IRDB_/H/Hitachi/Video_Projector/135_69.ir
@@ -73,7 +73,7 @@ protocol: NECext
 address: 87 45 00 00
 command: 16 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 45 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 87 45 00 00
 command: 41 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 45 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 87 45 00 00
 command: 50 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 45 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 87 45 00 00
 command: 53 00 00 00
 #
-name: VOLUME
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 45 00 00
diff --git a/_CSV-IRDB_/H/Hitachi/Video_Projector/80_-1.ir b/_CSV-IRDB_/H/Hitachi/Video_Projector/80_-1.ir
index a41d2e22..9c43f077 100644
--- a/_CSV-IRDB_/H/Hitachi/Video_Projector/80_-1.ir
+++ b/_CSV-IRDB_/H/Hitachi/Video_Projector/80_-1.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 15 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/H/Hivion/Unknown_SAT/64_64.ir b/_CSV-IRDB_/H/Hivion/Unknown_SAT/64_64.ir
index 60275217..1c93c268 100644
--- a/_CSV-IRDB_/H/Hivion/Unknown_SAT/64_64.ir
+++ b/_CSV-IRDB_/H/Hivion/Unknown_SAT/64_64.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 40 40 00 00
 command: 0F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 40 40 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 13 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 40 40 00 00
 command: 15 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 16 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 17 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 18 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 19 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1A 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -175,43 +175,43 @@ protocol: NECext
 address: 40 40 00 00
 command: 1C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 40 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 41 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 42 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 44 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 46 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/H/Homecast/Satellite_Receiver/1_-1.ir b/_CSV-IRDB_/H/Homecast/Satellite_Receiver/1_-1.ir
index 14ce2156..b05ff611 100644
--- a/_CSV-IRDB_/H/Homecast/Satellite_Receiver/1_-1.ir
+++ b/_CSV-IRDB_/H/Homecast/Satellite_Receiver/1_-1.ir
@@ -163,13 +163,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 40 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/H/Homecast/Unknown_DVB-S/32_32.ir b/_CSV-IRDB_/H/Homecast/Unknown_DVB-S/32_32.ir
index 1ae9d935..c18408ad 100644
--- a/_CSV-IRDB_/H/Homecast/Unknown_DVB-S/32_32.ir
+++ b/_CSV-IRDB_/H/Homecast/Unknown_DVB-S/32_32.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 01 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 02 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 03 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 04 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 05 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 06 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 20 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 20 20 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 20 00 00
@@ -73,55 +73,55 @@ protocol: NECext
 address: 20 20 00 00
 command: 0F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 11 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 12 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 18 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 20 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 20 20 00 00
 command: 1D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 41 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 43 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 20 00 00
 command: 45 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 20 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 20 20 00 00
 command: 49 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 20 00 00
diff --git a/_CSV-IRDB_/H/Homecast/Unknown_DVB-T/64_64.ir b/_CSV-IRDB_/H/Homecast/Unknown_DVB-T/64_64.ir
index e9542ab5..d203da6a 100644
--- a/_CSV-IRDB_/H/Homecast/Unknown_DVB-T/64_64.ir
+++ b/_CSV-IRDB_/H/Homecast/Unknown_DVB-T/64_64.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 11 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 15 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 16 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 17 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 18 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 40 40 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1F 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 40 40 00 00
 command: 41 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 42 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 40 40 00 00
 command: 45 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 46 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/H/Hughes/DSS/12_251.ir b/_CSV-IRDB_/H/Hughes/DSS/12_251.ir
index b9eadf24..f5ac4a03 100644
--- a/_CSV-IRDB_/H/Hughes/DSS/12_251.ir
+++ b/_CSV-IRDB_/H/Hughes/DSS/12_251.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 0C FB 00 00
 command: 02 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
@@ -553,7 +553,7 @@ protocol: NECext
 address: 0C FB 00 00
 command: 49 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
diff --git a/_CSV-IRDB_/H/Hughes/DSS/1_-1.ir b/_CSV-IRDB_/H/Hughes/DSS/1_-1.ir
index d9f40ed8..bef04aad 100644
--- a/_CSV-IRDB_/H/Hughes/DSS/1_-1.ir
+++ b/_CSV-IRDB_/H/Hughes/DSS/1_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/H/Hughes/DSS/4_-1.ir b/_CSV-IRDB_/H/Hughes/DSS/4_-1.ir
index dc9aae2b..6ece9204 100644
--- a/_CSV-IRDB_/H/Hughes/DSS/4_-1.ir
+++ b/_CSV-IRDB_/H/Hughes/DSS/4_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/H/Hughes/HD_with_TiVo/133_48.ir b/_CSV-IRDB_/H/Hughes/HD_with_TiVo/133_48.ir
index ba0bf494..d82c64f3 100644
--- a/_CSV-IRDB_/H/Hughes/HD_with_TiVo/133_48.ir
+++ b/_CSV-IRDB_/H/Hughes/HD_with_TiVo/133_48.ir
@@ -121,7 +121,7 @@ protocol: NECext
 address: 85 30 00 00
 command: 1E 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 85 30 00 00
 command: 1F 00 00 00
 #
-name: CHAN_DOWN
+name: CH-
 type: parsed
 protocol: NECext
 address: 85 30 00 00
diff --git a/_CSV-IRDB_/H/Hughes/Satellite/12_251.ir b/_CSV-IRDB_/H/Hughes/Satellite/12_251.ir
index c93b5f22..903ce564 100644
--- a/_CSV-IRDB_/H/Hughes/Satellite/12_251.ir
+++ b/_CSV-IRDB_/H/Hughes/Satellite/12_251.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 0C FB 00 00
 command: 02 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
@@ -559,7 +559,7 @@ protocol: NECext
 address: 0C FB 00 00
 command: 49 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
@@ -589,7 +589,7 @@ protocol: NECext
 address: 0C FB 00 00
 command: 73 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
diff --git a/_CSV-IRDB_/H/Hughes/Satellite/1_-1.ir b/_CSV-IRDB_/H/Hughes/Satellite/1_-1.ir
index d9f40ed8..bef04aad 100644
--- a/_CSV-IRDB_/H/Hughes/Satellite/1_-1.ir
+++ b/_CSV-IRDB_/H/Hughes/Satellite/1_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/H/Hughes/Satellite/4_-1.ir b/_CSV-IRDB_/H/Hughes/Satellite/4_-1.ir
index 2f3e8e57..84746841 100644
--- a/_CSV-IRDB_/H/Hughes/Satellite/4_-1.ir
+++ b/_CSV-IRDB_/H/Hughes/Satellite/4_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/H/Hughes/Unknown_DSS/12_251.ir b/_CSV-IRDB_/H/Hughes/Unknown_DSS/12_251.ir
index 3d8677f4..6a279119 100644
--- a/_CSV-IRDB_/H/Hughes/Unknown_DSS/12_251.ir
+++ b/_CSV-IRDB_/H/Hughes/Unknown_DSS/12_251.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
@@ -79,67 +79,67 @@ protocol: NECext
 address: 0C FB 00 00
 command: 0E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 10 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 12 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 15 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 17 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
diff --git a/_CSV-IRDB_/H/Hughes/Unknown_HRMC-8/12_251.ir b/_CSV-IRDB_/H/Hughes/Unknown_HRMC-8/12_251.ir
index 58564886..c9854b5e 100644
--- a/_CSV-IRDB_/H/Hughes/Unknown_HRMC-8/12_251.ir
+++ b/_CSV-IRDB_/H/Hughes/Unknown_HRMC-8/12_251.ir
@@ -7,139 +7,139 @@ protocol: NECext
 address: 0C FB 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 10 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 12 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 15 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 17 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 0C FB 00 00
 command: 60 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 0C FB 00 00
 command: 62 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 64 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 65 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
diff --git a/_CSV-IRDB_/H/Hughes/Unknown_b2/12_251.ir b/_CSV-IRDB_/H/Hughes/Unknown_b2/12_251.ir
index 3d8677f4..6a279119 100644
--- a/_CSV-IRDB_/H/Hughes/Unknown_b2/12_251.ir
+++ b/_CSV-IRDB_/H/Hughes/Unknown_b2/12_251.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
@@ -79,67 +79,67 @@ protocol: NECext
 address: 0C FB 00 00
 command: 0E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 0F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 10 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 12 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 15 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 17 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0C FB 00 00
diff --git a/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_16.ir b/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_16.ir
index b36ed06a..4a9c996c 100644
--- a/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_16.ir
+++ b/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_16.ir
@@ -151,13 +151,13 @@ protocol: NECext
 address: 00 10 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 10 00 00
diff --git a/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_65.ir b/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_65.ir
index 2fc39036..0f90283d 100644
--- a/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_65.ir
+++ b/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_65.ir
@@ -175,13 +175,13 @@ protocol: NECext
 address: 00 41 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 41 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 41 00 00
diff --git a/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_73.ir b/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_73.ir
index 86b20f61..aeddcac4 100644
--- a/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_73.ir
+++ b/_CSV-IRDB_/H/Humax/HDTV_Tuner/0_73.ir
@@ -157,13 +157,13 @@ protocol: NECext
 address: 00 49 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 49 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 49 00 00
diff --git a/_CSV-IRDB_/H/Humax/Satellite/0_23.ir b/_CSV-IRDB_/H/Humax/Satellite/0_23.ir
index efbcb599..91dd29a7 100644
--- a/_CSV-IRDB_/H/Humax/Satellite/0_23.ir
+++ b/_CSV-IRDB_/H/Humax/Satellite/0_23.ir
@@ -145,13 +145,13 @@ protocol: NECext
 address: 00 17 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 17 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 17 00 00
diff --git a/_CSV-IRDB_/H/Humax/Satellite/0_73.ir b/_CSV-IRDB_/H/Humax/Satellite/0_73.ir
index 724d06c2..04fe35bd 100644
--- a/_CSV-IRDB_/H/Humax/Satellite/0_73.ir
+++ b/_CSV-IRDB_/H/Humax/Satellite/0_73.ir
@@ -157,13 +157,13 @@ protocol: NECext
 address: 00 49 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 49 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 49 00 00
diff --git a/_CSV-IRDB_/H/Humax/Unknown_F1CI/0_16.ir b/_CSV-IRDB_/H/Humax/Unknown_F1CI/0_16.ir
index 091efe21..ae1025c2 100644
--- a/_CSV-IRDB_/H/Humax/Unknown_F1CI/0_16.ir
+++ b/_CSV-IRDB_/H/Humax/Unknown_F1CI/0_16.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 00 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 02 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -43,49 +43,49 @@ protocol: NECext
 address: 00 10 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 00 10 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 11 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -133,55 +133,55 @@ protocol: NECext
 address: 00 10 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 19 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 00 10 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
diff --git a/_CSV-IRDB_/H/Humax/Unknown_HUMAX/0_16.ir b/_CSV-IRDB_/H/Humax/Unknown_HUMAX/0_16.ir
index 108a7f78..e9c45299 100644
--- a/_CSV-IRDB_/H/Humax/Unknown_HUMAX/0_16.ir
+++ b/_CSV-IRDB_/H/Humax/Unknown_HUMAX/0_16.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -13,181 +13,181 @@ protocol: NECext
 address: 00 10 00 00
 command: 00 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 12 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -205,49 +205,49 @@ protocol: NECext
 address: 00 10 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 40 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
diff --git a/_CSV-IRDB_/H/Humax/Unknown_Humax-5400IRCI/0_16.ir b/_CSV-IRDB_/H/Humax/Unknown_Humax-5400IRCI/0_16.ir
index 03137315..55a6cc41 100644
--- a/_CSV-IRDB_/H/Humax/Unknown_Humax-5400IRCI/0_16.ir
+++ b/_CSV-IRDB_/H/Humax/Unknown_Humax-5400IRCI/0_16.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -13,61 +13,61 @@ protocol: NECext
 address: 00 10 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -79,55 +79,55 @@ protocol: NECext
 address: 00 10 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 12 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -139,61 +139,61 @@ protocol: NECext
 address: 00 10 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 18 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 40 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
diff --git a/_CSV-IRDB_/H/Humax/Unknown_Humax-RC-536P/2_23.ir b/_CSV-IRDB_/H/Humax/Unknown_Humax-RC-536P/2_23.ir
index fea10771..eadbcd29 100644
--- a/_CSV-IRDB_/H/Humax/Unknown_Humax-RC-536P/2_23.ir
+++ b/_CSV-IRDB_/H/Humax/Unknown_Humax-RC-536P/2_23.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 17 00 00
@@ -79,103 +79,103 @@ protocol: NECext
 address: 02 17 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 12 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 15 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 18 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 1D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 40 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 41 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 02 17 00 00
@@ -199,25 +199,25 @@ protocol: NECext
 address: 02 17 00 00
 command: 48 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 49 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 4A 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 4D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 02 17 00 00
@@ -229,37 +229,37 @@ protocol: NECext
 address: 02 17 00 00
 command: 4F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 60 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 61 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 62 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 63 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 02 17 00 00
 command: 64 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 17 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 02 17 00 00
 command: 67 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 17 00 00
diff --git a/_CSV-IRDB_/H/Humax/Unknown_RS-521/0_16.ir b/_CSV-IRDB_/H/Humax/Unknown_RS-521/0_16.ir
index baa77349..3651ec36 100644
--- a/_CSV-IRDB_/H/Humax/Unknown_RS-521/0_16.ir
+++ b/_CSV-IRDB_/H/Humax/Unknown_RS-521/0_16.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -79,157 +79,157 @@ protocol: NECext
 address: 00 10 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 12 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 18 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 40 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 41 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 43 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 4D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 60 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 61 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 62 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 63 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 64 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 10 00 00
diff --git a/_CSV-IRDB_/H/Humax/Unknown_lircd.conf/0_16.ir b/_CSV-IRDB_/H/Humax/Unknown_lircd.conf/0_16.ir
index e4e5c507..792267a2 100644
--- a/_CSV-IRDB_/H/Humax/Unknown_lircd.conf/0_16.ir
+++ b/_CSV-IRDB_/H/Humax/Unknown_lircd.conf/0_16.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -13,61 +13,61 @@ protocol: NECext
 address: 00 10 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: 00 10 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 12 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 10 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
@@ -151,49 +151,49 @@ protocol: NECext
 address: 00 10 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 10 00 00
 command: 40 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 10 00 00
diff --git a/_CSV-IRDB_/H/Hyundai/Unknown_H-DVD5038N/0_251.ir b/_CSV-IRDB_/H/Hyundai/Unknown_H-DVD5038N/0_251.ir
index fc4f04c5..4686a307 100644
--- a/_CSV-IRDB_/H/Hyundai/Unknown_H-DVD5038N/0_251.ir
+++ b/_CSV-IRDB_/H/Hyundai/Unknown_H-DVD5038N/0_251.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 00 FB 00 00
 command: 09 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 13 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 16 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 17 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 19 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 1C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -187,49 +187,49 @@ protocol: NECext
 address: 00 FB 00 00
 command: 1F 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 40 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 41 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 42 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 44 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 45 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 48 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -241,37 +241,37 @@ protocol: NECext
 address: 00 FB 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4C 00 00 00
 #
-name: KEY_MINUS
+name: MINUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4D 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
diff --git a/_CSV-IRDB_/H/Hyundai/Unknown_l17t/170_3.ir b/_CSV-IRDB_/H/Hyundai/Unknown_l17t/170_3.ir
index aad9564f..cc75e938 100644
--- a/_CSV-IRDB_/H/Hyundai/Unknown_l17t/170_3.ir
+++ b/_CSV-IRDB_/H/Hyundai/Unknown_l17t/170_3.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 0A 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: AA 03 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: AA 03 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 1C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: AA 03 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: AA 03 00 00
 command: 1E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: AA 03 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: AA 03 00 00
diff --git a/_CSV-IRDB_/H/huth/Unknown_prof/15_1.ir b/_CSV-IRDB_/H/huth/Unknown_prof/15_1.ir
index 3b0f6fc1..89ce67b1 100644
--- a/_CSV-IRDB_/H/huth/Unknown_prof/15_1.ir
+++ b/_CSV-IRDB_/H/huth/Unknown_prof/15_1.ir
@@ -13,91 +13,91 @@ protocol: NECext
 address: 0F 01 00 00
 command: 01 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 04 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 05 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 07 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 0C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 0F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 10 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 0F 01 00 00
 command: 12 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 0F 01 00 00
 command: 14 00 00 00
 #
-name: X_KEY_0_DN
+name: X_0_DN
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 15 00 00 00
 #
-name: X_KEY_1_DN
+name: X_1_DN
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 0F 01 00 00
 command: 18 00 00 00
 #
-name: X_KEY_0_UP
+name: X_0_UP
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 19 00 00 00
 #
-name: X_KEY_1_UP
+name: X_1_UP
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 0F 01 00 00
 command: 1E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0F 01 00 00
diff --git a/_CSV-IRDB_/I/I-O_Data/DVD_Player/8_230.ir b/_CSV-IRDB_/I/I-O_Data/DVD_Player/8_230.ir
index a7c95140..1c46e3be 100644
--- a/_CSV-IRDB_/I/I-O_Data/DVD_Player/8_230.ir
+++ b/_CSV-IRDB_/I/I-O_Data/DVD_Player/8_230.ir
@@ -187,13 +187,13 @@ protocol: NECext
 address: 08 E6 00 00
 command: 4E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 50 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
diff --git a/_CSV-IRDB_/I/I24/Unknown_I24/0_-1.ir b/_CSV-IRDB_/I/I24/Unknown_I24/0_-1.ir
index 7c2c8469..fea43533 100644
--- a/_CSV-IRDB_/I/I24/Unknown_I24/0_-1.ir
+++ b/_CSV-IRDB_/I/I24/Unknown_I24/0_-1.ir
@@ -19,31 +19,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 82 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 83 00 00 00
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 84 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 85 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 86 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 90 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/I/ITT/Unknown_ITT/49_-1.ir b/_CSV-IRDB_/I/ITT/Unknown_ITT/49_-1.ir
index 555e737d..8379889d 100644
--- a/_CSV-IRDB_/I/ITT/Unknown_ITT/49_-1.ir
+++ b/_CSV-IRDB_/I/ITT/Unknown_ITT/49_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -19,97 +19,97 @@ protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 15 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 45 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 47 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 55 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 57 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/I/ITT/Unknown_ITTNOKIA/49_-1.ir b/_CSV-IRDB_/I/ITT/Unknown_ITTNOKIA/49_-1.ir
index ebb7d370..a62579ea 100644
--- a/_CSV-IRDB_/I/ITT/Unknown_ITTNOKIA/49_-1.ir
+++ b/_CSV-IRDB_/I/ITT/Unknown_ITTNOKIA/49_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 47 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 49 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 92 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -277,13 +277,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -295,7 +295,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/I/ITT/Unknown_RC40/49_-1.ir b/_CSV-IRDB_/I/ITT/Unknown_RC40/49_-1.ir
index 63508780..3fec872d 100644
--- a/_CSV-IRDB_/I/ITT/Unknown_RC40/49_-1.ir
+++ b/_CSV-IRDB_/I/ITT/Unknown_RC40/49_-1.ir
@@ -7,91 +7,91 @@ protocol: NECext
 address: 31 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/I/ITT/Unknown_RC51/49_-1.ir b/_CSV-IRDB_/I/ITT/Unknown_RC51/49_-1.ir
index 54d31cc0..202b3a86 100644
--- a/_CSV-IRDB_/I/ITT/Unknown_RC51/49_-1.ir
+++ b/_CSV-IRDB_/I/ITT/Unknown_RC51/49_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/I/Illusion/Unknown_M3/22_-1.ir b/_CSV-IRDB_/I/Illusion/Unknown_M3/22_-1.ir
index 69200673..08918853 100644
--- a/_CSV-IRDB_/I/Illusion/Unknown_M3/22_-1.ir
+++ b/_CSV-IRDB_/I/Illusion/Unknown_M3/22_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 16 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 16 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 16 00 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 16 00 00 00
 command: 14 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 16 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 17 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 18 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 16 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 16 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 16 00 00 00
@@ -151,85 +151,85 @@ protocol: NECext
 address: 16 00 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 24 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 26 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 27 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 29 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 37 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 38 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 39 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 16 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 16 00 00 00
diff --git a/_CSV-IRDB_/I/Imerge/Digital_Jukebox/14_-1.ir b/_CSV-IRDB_/I/Imerge/Digital_Jukebox/14_-1.ir
index 3261f8ac..84b03f76 100644
--- a/_CSV-IRDB_/I/Imerge/Digital_Jukebox/14_-1.ir
+++ b/_CSV-IRDB_/I/Imerge/Digital_Jukebox/14_-1.ir
@@ -91,13 +91,13 @@ protocol: NECext
 address: 0E 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
diff --git a/_CSV-IRDB_/I/InFocus/DLP_Projector/15_-1.ir b/_CSV-IRDB_/I/InFocus/DLP_Projector/15_-1.ir
index 7ddef0df..24833eb8 100644
--- a/_CSV-IRDB_/I/InFocus/DLP_Projector/15_-1.ir
+++ b/_CSV-IRDB_/I/InFocus/DLP_Projector/15_-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/I/InFocus/Plasma/7_-1.ir b/_CSV-IRDB_/I/InFocus/Plasma/7_-1.ir
index 198c0345..c57f2194 100644
--- a/_CSV-IRDB_/I/InFocus/Plasma/7_-1.ir
+++ b/_CSV-IRDB_/I/InFocus/Plasma/7_-1.ir
@@ -91,7 +91,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 91 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 94 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/I/InFocus/Unknown_InFocus-SP8600/49_-1.ir b/_CSV-IRDB_/I/InFocus/Unknown_InFocus-SP8600/49_-1.ir
index 180133ef..3cbe8f55 100644
--- a/_CSV-IRDB_/I/InFocus/Unknown_InFocus-SP8600/49_-1.ir
+++ b/_CSV-IRDB_/I/InFocus/Unknown_InFocus-SP8600/49_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 86 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 87 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 89 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -55,37 +55,37 @@ protocol: NECext
 address: 31 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: C1 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: C2 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: C3 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: C4 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/I/InFocus/Unknown_ScreenPlay/135_78.ir b/_CSV-IRDB_/I/InFocus/Unknown_ScreenPlay/135_78.ir
index a2515fe8..0de4e710 100644
--- a/_CSV-IRDB_/I/InFocus/Unknown_ScreenPlay/135_78.ir
+++ b/_CSV-IRDB_/I/InFocus/Unknown_ScreenPlay/135_78.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
@@ -19,25 +19,25 @@ protocol: NECext
 address: 87 4E 00 00
 command: 07 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
@@ -49,25 +49,25 @@ protocol: NECext
 address: 87 4E 00 00
 command: 2C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
 command: 2D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
 command: 2E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
 command: 2F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 87 4E 00 00
 command: 31 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
diff --git a/_CSV-IRDB_/I/InFocus/Unknown_remote/135_78.ir b/_CSV-IRDB_/I/InFocus/Unknown_remote/135_78.ir
index c59448f8..77f79665 100644
--- a/_CSV-IRDB_/I/InFocus/Unknown_remote/135_78.ir
+++ b/_CSV-IRDB_/I/InFocus/Unknown_remote/135_78.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 87 4E 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 87 4E 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
 command: 08 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 87 4E 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 87 4E 00 00
 command: 19 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 87 4E 00 00
diff --git a/_CSV-IRDB_/I/InFocus/Video_Projector/131_85.ir b/_CSV-IRDB_/I/InFocus/Video_Projector/131_85.ir
index 9c200592..ff59b636 100644
--- a/_CSV-IRDB_/I/InFocus/Video_Projector/131_85.ir
+++ b/_CSV-IRDB_/I/InFocus/Video_Projector/131_85.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: 83 55 00 00
 command: 87 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 55 00 00
 command: 88 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 55 00 00
diff --git a/_CSV-IRDB_/I/InFocus/Video_Projector/15_-1.ir b/_CSV-IRDB_/I/InFocus/Video_Projector/15_-1.ir
index 7ddef0df..24833eb8 100644
--- a/_CSV-IRDB_/I/InFocus/Video_Projector/15_-1.ir
+++ b/_CSV-IRDB_/I/InFocus/Video_Projector/15_-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/I/InFocus/Video_Projector/2_1.ir b/_CSV-IRDB_/I/InFocus/Video_Projector/2_1.ir
index 61d9cecb..d6e23b8c 100644
--- a/_CSV-IRDB_/I/InFocus/Video_Projector/2_1.ir
+++ b/_CSV-IRDB_/I/InFocus/Video_Projector/2_1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 0F 00 00 00
 #
-name: STANDBY_(ON/OFF)
+name: STANDBY_(POWER)
 type: parsed
 protocol: NECext
 address: 02 01 00 00
diff --git a/_CSV-IRDB_/I/InFocus/Video_Projector/80_79.ir b/_CSV-IRDB_/I/InFocus/Video_Projector/80_79.ir
index 06220f91..8c63b8cb 100644
--- a/_CSV-IRDB_/I/InFocus/Video_Projector/80_79.ir
+++ b/_CSV-IRDB_/I/InFocus/Video_Projector/80_79.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 50 4F 00 00
 command: 06 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 4F 00 00
 command: 07 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 4F 00 00
diff --git a/_CSV-IRDB_/I/Insignia/TV/134_5.ir b/_CSV-IRDB_/I/Insignia/TV/134_5.ir
index 77daa078..00032a0a 100644
--- a/_CSV-IRDB_/I/Insignia/TV/134_5.ir
+++ b/_CSV-IRDB_/I/Insignia/TV/134_5.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 86 05 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 05 00 00
diff --git a/_CSV-IRDB_/I/Insignia/Unknown_WIR147002-8301/67_71.ir b/_CSV-IRDB_/I/Insignia/Unknown_WIR147002-8301/67_71.ir
index 1cbd6fce..f1009141 100644
--- a/_CSV-IRDB_/I/Insignia/Unknown_WIR147002-8301/67_71.ir
+++ b/_CSV-IRDB_/I/Insignia/Unknown_WIR147002-8301/67_71.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 43 47 00 00
 command: 18 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 19 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 43 47 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 1C 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 43 47 00 00
 command: 25 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 26 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -223,19 +223,19 @@ protocol: NECext
 address: 43 47 00 00
 command: 29 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 2A 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 2B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 43 47 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 43 47 00 00
 command: 34 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
diff --git a/_CSV-IRDB_/I/Integra/Amplifier/210_109.ir b/_CSV-IRDB_/I/Integra/Amplifier/210_109.ir
index bc88e431..2c17b6f6 100644
--- a/_CSV-IRDB_/I/Integra/Amplifier/210_109.ir
+++ b/_CSV-IRDB_/I/Integra/Amplifier/210_109.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/I/Integra/CD_Player/210_44.ir b/_CSV-IRDB_/I/Integra/CD_Player/210_44.ir
index 97fee503..9d63d5cf 100644
--- a/_CSV-IRDB_/I/Integra/CD_Player/210_44.ir
+++ b/_CSV-IRDB_/I/Integra/CD_Player/210_44.ir
@@ -187,7 +187,7 @@ protocol: NECext
 address: D2 2C 00 00
 command: 5F 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
diff --git a/_CSV-IRDB_/I/Integra/DVD_Player/210_43.ir b/_CSV-IRDB_/I/Integra/DVD_Player/210_43.ir
index 3f78ba42..0a92f95e 100644
--- a/_CSV-IRDB_/I/Integra/DVD_Player/210_43.ir
+++ b/_CSV-IRDB_/I/Integra/DVD_Player/210_43.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: D2 2B 00 00
 command: 04 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -931,7 +931,7 @@ protocol: NECext
 address: D2 2B 00 00
 command: 99 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
diff --git a/_CSV-IRDB_/I/Integra/Digital_Audio/210_3.ir b/_CSV-IRDB_/I/Integra/Digital_Audio/210_3.ir
index 5b06dbbd..7b0a4930 100644
--- a/_CSV-IRDB_/I/Integra/Digital_Audio/210_3.ir
+++ b/_CSV-IRDB_/I/Integra/Digital_Audio/210_3.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: D2 03 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 03 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 03 00 00
diff --git a/_CSV-IRDB_/I/Integra/Integrated_Amplifier/210_109.ir b/_CSV-IRDB_/I/Integra/Integrated_Amplifier/210_109.ir
index 1975f952..ca8784e1 100644
--- a/_CSV-IRDB_/I/Integra/Integrated_Amplifier/210_109.ir
+++ b/_CSV-IRDB_/I/Integra/Integrated_Amplifier/210_109.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/I/Integra/Media_PC/4_15.ir b/_CSV-IRDB_/I/Integra/Media_PC/4_15.ir
index f4abc7d9..cc5f88aa 100644
--- a/_CSV-IRDB_/I/Integra/Media_PC/4_15.ir
+++ b/_CSV-IRDB_/I/Integra/Media_PC/4_15.ir
@@ -193,25 +193,25 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+_B
+name: VOL+_B
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-_B
+name: VOL-_B
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/I/Integra/Receiver/210_109.ir b/_CSV-IRDB_/I/Integra/Receiver/210_109.ir
index b6944030..7ffabfac 100644
--- a/_CSV-IRDB_/I/Integra/Receiver/210_109.ir
+++ b/_CSV-IRDB_/I/Integra/Receiver/210_109.ir
@@ -61,7 +61,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 00 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 00 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: D2 6D 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 03 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -307,7 +307,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 04 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -1831,7 +1831,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: CC 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -1891,7 +1891,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: CC 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -1963,7 +1963,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: CC 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -1987,7 +1987,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: CC 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -2089,13 +2089,13 @@ protocol: NECext
 address: D2 6D 00 00
 command: CC 00 00 00
 #
-name: ZONE_2_VOLUME_-
+name: ZONE_2_VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: CC 00 00 00
 #
-name: ZONE_2_VOLUME_+
+name: ZONE_2_VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/I/Integra/Receiver/210_17.ir b/_CSV-IRDB_/I/Integra/Receiver/210_17.ir
index 210db596..3240e714 100644
--- a/_CSV-IRDB_/I/Integra/Receiver/210_17.ir
+++ b/_CSV-IRDB_/I/Integra/Receiver/210_17.ir
@@ -49,49 +49,49 @@ protocol: NECext
 address: D2 11 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 11 00 00
 command: 02 00 00 00
 #
-name: Z2_VOLUME_+
+name: Z2_VOL+
 type: parsed
 protocol: NECext
 address: D2 11 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 11 00 00
 command: 02 00 00 00
 #
-name: Z2_VOLUME_+
+name: Z2_VOL+
 type: parsed
 protocol: NECext
 address: D2 11 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 11 00 00
 command: 03 00 00 00
 #
-name: Z2_VOLUME_-
+name: Z2_VOL-
 type: parsed
 protocol: NECext
 address: D2 11 00 00
 command: 03 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 11 00 00
 command: 03 00 00 00
 #
-name: Z2_VOLUME_-
+name: Z2_VOL-
 type: parsed
 protocol: NECext
 address: D2 11 00 00
diff --git a/_CSV-IRDB_/I/Integra/Receiver/210_18.ir b/_CSV-IRDB_/I/Integra/Receiver/210_18.ir
index 33071522..e70ef491 100644
--- a/_CSV-IRDB_/I/Integra/Receiver/210_18.ir
+++ b/_CSV-IRDB_/I/Integra/Receiver/210_18.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Z2_VOLUME_+_(2)
+name: Z2_VOL+_(2)
 type: parsed
 protocol: NECext
 address: D2 12 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: D2 12 00 00
 command: 42 00 00 00
 #
-name: Z2_VOLUME_-_(2)
+name: Z2_VOL-_(2)
 type: parsed
 protocol: NECext
 address: D2 12 00 00
diff --git a/_CSV-IRDB_/I/Integra/Receiver/210_21.ir b/_CSV-IRDB_/I/Integra/Receiver/210_21.ir
index 1d4794d0..b7c7495d 100644
--- a/_CSV-IRDB_/I/Integra/Receiver/210_21.ir
+++ b/_CSV-IRDB_/I/Integra/Receiver/210_21.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: D2 15 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 15 00 00
 command: 02 00 00 00
 #
-name: Z3_VOLUME_+
+name: Z3_VOL+
 type: parsed
 protocol: NECext
 address: D2 15 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: D2 15 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 15 00 00
 command: 03 00 00 00
 #
-name: Z3_VOLUME_-
+name: Z3_VOL-
 type: parsed
 protocol: NECext
 address: D2 15 00 00
diff --git a/_CSV-IRDB_/I/Integra/Receiver/210_22.ir b/_CSV-IRDB_/I/Integra/Receiver/210_22.ir
index 64c96eaf..348b5271 100644
--- a/_CSV-IRDB_/I/Integra/Receiver/210_22.ir
+++ b/_CSV-IRDB_/I/Integra/Receiver/210_22.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Z3_VOLUME_+_(2)
+name: Z3_VOL+_(2)
 type: parsed
 protocol: NECext
 address: D2 16 00 00
 command: 42 00 00 00
 #
-name: Z3_VOLUME_-_(2)
+name: Z3_VOL-_(2)
 type: parsed
 protocol: NECext
 address: D2 16 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: D2 16 00 00
 command: CB 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: D2 16 00 00
diff --git a/_CSV-IRDB_/I/IntelliNet_Controls/Distributed_Audio/0_90.ir b/_CSV-IRDB_/I/IntelliNet_Controls/Distributed_Audio/0_90.ir
index 97af66d7..c2b9271c 100644
--- a/_CSV-IRDB_/I/IntelliNet_Controls/Distributed_Audio/0_90.ir
+++ b/_CSV-IRDB_/I/IntelliNet_Controls/Distributed_Audio/0_90.ir
@@ -115,13 +115,13 @@ protocol: NECext
 address: 00 5A 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 5A 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 5A 00 00
diff --git a/_CSV-IRDB_/I/Interact/Unknown_I-22121/0_-1.ir b/_CSV-IRDB_/I/Interact/Unknown_I-22121/0_-1.ir
index f08304ca..724fea65 100644
--- a/_CSV-IRDB_/I/Interact/Unknown_I-22121/0_-1.ir
+++ b/_CSV-IRDB_/I/Interact/Unknown_I-22121/0_-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 80 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 81 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 82 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 83 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 84 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 85 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 86 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 87 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 88 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 89 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/I/Intervision/Unknown_Intervision/134_107.ir b/_CSV-IRDB_/I/Intervision/Unknown_Intervision/134_107.ir
index 9e48fcbf..12c8941e 100644
--- a/_CSV-IRDB_/I/Intervision/Unknown_Intervision/134_107.ir
+++ b/_CSV-IRDB_/I/Intervision/Unknown_Intervision/134_107.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -145,43 +145,43 @@ protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/I/Irradio/Unknown_IrradioHIFI1300V/162_162.ir b/_CSV-IRDB_/I/Irradio/Unknown_IrradioHIFI1300V/162_162.ir
index f3daf06f..5376d8e9 100644
--- a/_CSV-IRDB_/I/Irradio/Unknown_IrradioHIFI1300V/162_162.ir
+++ b/_CSV-IRDB_/I/Irradio/Unknown_IrradioHIFI1300V/162_162.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: A2 A2 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 06 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: A2 A2 00 00
 command: 0E 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 0F 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -67,19 +67,19 @@ protocol: NECext
 address: A2 A2 00 00
 command: 15 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 1B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: A2 A2 00 00
 command: 1D 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: A2 A2 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
diff --git a/_CSV-IRDB_/I/iPort/MP3_Player/1_222.ir b/_CSV-IRDB_/I/iPort/MP3_Player/1_222.ir
index 64be76d9..4c63f681 100644
--- a/_CSV-IRDB_/I/iPort/MP3_Player/1_222.ir
+++ b/_CSV-IRDB_/I/iPort/MP3_Player/1_222.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 01 DE 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 DE 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 01 DE 00 00
 command: 16 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 DE 00 00
diff --git a/_CSV-IRDB_/I/iPort/iPod/1_222.ir b/_CSV-IRDB_/I/iPort/iPod/1_222.ir
index 88c7d31b..156b5e5d 100644
--- a/_CSV-IRDB_/I/iPort/iPod/1_222.ir
+++ b/_CSV-IRDB_/I/iPort/iPod/1_222.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 01 DE 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 DE 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 01 DE 00 00
 command: 16 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 DE 00 00
diff --git a/_CSV-IRDB_/I/iPort/iPort/1_222.ir b/_CSV-IRDB_/I/iPort/iPort/1_222.ir
index 6f8ddd1d..05232e51 100644
--- a/_CSV-IRDB_/I/iPort/iPort/1_222.ir
+++ b/_CSV-IRDB_/I/iPort/iPort/1_222.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 01 DE 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 DE 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 01 DE 00 00
 command: 16 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 DE 00 00
diff --git a/_CSV-IRDB_/I/imon/Unknown_MultiMedian/6_-1.ir b/_CSV-IRDB_/I/imon/Unknown_MultiMedian/6_-1.ir
index 4ed93292..018e7017 100644
--- a/_CSV-IRDB_/I/imon/Unknown_MultiMedian/6_-1.ir
+++ b/_CSV-IRDB_/I/imon/Unknown_MultiMedian/6_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 06 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -103,127 +103,127 @@ protocol: NECext
 address: 06 00 00 00
 command: 10 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 12 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 14 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 17 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 18 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 40 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 42 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -247,25 +247,25 @@ protocol: NECext
 address: 06 00 00 00
 command: 48 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 49 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 06 00 00 00
diff --git a/_CSV-IRDB_/I/ione/Unknown_remote/0_-1.ir b/_CSV-IRDB_/I/ione/Unknown_remote/0_-1.ir
index d969239d..05d72b8e 100644
--- a/_CSV-IRDB_/I/ione/Unknown_remote/0_-1.ir
+++ b/_CSV-IRDB_/I/ione/Unknown_remote/0_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,61 +97,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,43 +181,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,19 +229,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/I/italtel/Unknown_italtel/1_-1.ir b/_CSV-IRDB_/I/italtel/Unknown_italtel/1_-1.ir
index c2121b5b..97ac7042 100644
--- a/_CSV-IRDB_/I/italtel/Unknown_italtel/1_-1.ir
+++ b/_CSV-IRDB_/I/italtel/Unknown_italtel/1_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 24 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -127,43 +127,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 28 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 33 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 35 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 38 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/J/JBL/Surround_Processor/130_11.ir b/_CSV-IRDB_/J/JBL/Surround_Processor/130_11.ir
index 63d26c73..e9a90a9a 100644
--- a/_CSV-IRDB_/J/JBL/Surround_Processor/130_11.ir
+++ b/_CSV-IRDB_/J/JBL/Surround_Processor/130_11.ir
@@ -163,13 +163,13 @@ protocol: NECext
 address: 82 0B 00 00
 command: 15 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 16 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
diff --git a/_CSV-IRDB_/J/JBL/Surround_Processor/28_-1.ir b/_CSV-IRDB_/J/JBL/Surround_Processor/28_-1.ir
index 5a9d270c..ae957b4d 100644
--- a/_CSV-IRDB_/J/JBL/Surround_Processor/28_-1.ir
+++ b/_CSV-IRDB_/J/JBL/Surround_Processor/28_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 83 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
diff --git a/_CSV-IRDB_/J/JENSEN/VCR/1_-1.ir b/_CSV-IRDB_/J/JENSEN/VCR/1_-1.ir
index 15298e1a..d9396540 100644
--- a/_CSV-IRDB_/J/JENSEN/VCR/1_-1.ir
+++ b/_CSV-IRDB_/J/JENSEN/VCR/1_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/HD-ILA_Projection/3_-1.ir b/_CSV-IRDB_/J/JVC/HD-ILA_Projection/3_-1.ir
index 70627106..aeac984f 100644
--- a/_CSV-IRDB_/J/JVC/HD-ILA_Projection/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/HD-ILA_Projection/3_-1.ir
@@ -133,13 +133,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Karaoke/3_-1.ir b/_CSV-IRDB_/J/JVC/Karaoke/3_-1.ir
index 051ad004..6f7255bc 100644
--- a/_CSV-IRDB_/J/JVC/Karaoke/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Karaoke/3_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_#
+name: #
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/LCD/3_-1.ir b/_CSV-IRDB_/J/JVC/LCD/3_-1.ir
index 5bedd5e7..505f366e 100644
--- a/_CSV-IRDB_/J/JVC/LCD/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/LCD/3_-1.ir
@@ -37,13 +37,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Mini_System/163_-1.ir b/_CSV-IRDB_/J/JVC/Mini_System/163_-1.ir
index 1488bab3..62f2edc1 100644
--- a/_CSV-IRDB_/J/JVC/Mini_System/163_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Mini_System/163_-1.ir
@@ -37,7 +37,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Mini_System/179_-1.ir b/_CSV-IRDB_/J/JVC/Mini_System/179_-1.ir
index d044ba30..b666ce65 100644
--- a/_CSV-IRDB_/J/JVC/Mini_System/179_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Mini_System/179_-1.ir
@@ -73,19 +73,19 @@ protocol: NECext
 address: B3 00 00 00
 command: 5B 00 00 00
 #
-name: CD_10_KEY_1
+name: CD_10_1
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 61 00 00 00
 #
-name: CD_10_KEY_2
+name: CD_10_2
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 62 00 00 00
 #
-name: CD_10_KEY_3
+name: CD_10_3
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -97,37 +97,37 @@ protocol: NECext
 address: B3 00 00 00
 command: 63 00 00 00
 #
-name: CD_10_KEY_4
+name: CD_10_4
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 64 00 00 00
 #
-name: CD_10_KEY_5
+name: CD_10_5
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 65 00 00 00
 #
-name: CD_10_KEY_6
+name: CD_10_6
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 66 00 00 00
 #
-name: CD_10_KEY_7
+name: CD_10_7
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 67 00 00 00
 #
-name: CD_10_KEY_8
+name: CD_10_8
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 68 00 00 00
 #
-name: CD_10_KEY_9
+name: CD_10_9
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: B3 00 00 00
 command: 6D 00 00 00
 #
-name: CD_10_KEY_10
+name: CD_10_10
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 6E 00 00 00
 #
-name: CD_10_KEY_+10
+name: CD_10_+10
 type: parsed
 protocol: NECext
 address: B3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Monitor/3_-1.ir b/_CSV-IRDB_/J/JVC/Monitor/3_-1.ir
index 20a25e28..376c051c 100644
--- a/_CSV-IRDB_/J/JVC/Monitor/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Monitor/3_-1.ir
@@ -127,7 +127,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Receiver/147_-1.ir b/_CSV-IRDB_/J/JVC/Receiver/147_-1.ir
index 39e72a19..6416b8a6 100644
--- a/_CSV-IRDB_/J/JVC/Receiver/147_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Receiver/147_-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 69 00 00 00
 #
-name: DAT_10KEY_0
+name: DAT_100
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 70 00 00 00
 #
-name: DAT_10KEY_1
+name: DAT_101
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 71 00 00 00
 #
-name: DAT_10KEY_2
+name: DAT_102
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 72 00 00 00
 #
-name: DAT_10KEY_3
+name: DAT_103
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 73 00 00 00
 #
-name: DAT_10KEY_4
+name: DAT_104
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 74 00 00 00
 #
-name: DAT_10KEY_5
+name: DAT_105
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 75 00 00 00
 #
-name: DAT_10KEY_6
+name: DAT_106
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 76 00 00 00
 #
-name: DAT_10KEY_7/P
+name: DAT_107/P
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 77 00 00 00
 #
-name: DAT_10KEY_8
+name: DAT_108
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 78 00 00 00
 #
-name: DAT_10KEY_9
+name: DAT_109
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 79 00 00 00
 #
-name: DAT_10KEY_10
+name: DAT_1010
 type: parsed
 protocol: NECext
 address: 93 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 93 00 00 00
 command: 7E 00 00 00
 #
-name: DAT_10KEY_+10
+name: DAT_10+10
 type: parsed
 protocol: NECext
 address: 93 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Receiver/159_-1.ir b/_CSV-IRDB_/J/JVC/Receiver/159_-1.ir
index 852ff283..4ae39fdd 100644
--- a/_CSV-IRDB_/J/JVC/Receiver/159_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Receiver/159_-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 9F 00 00 00
 command: 00 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Receiver/163_-1.ir b/_CSV-IRDB_/J/JVC/Receiver/163_-1.ir
index cd8e1fe2..b4365e39 100644
--- a/_CSV-IRDB_/J/JVC/Receiver/163_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Receiver/163_-1.ir
@@ -55,7 +55,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 05 00 00 00
 #
-name: DAP(PROCESS)ON/OFF
+name: DAP(PROCESS)POWER
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -391,55 +391,55 @@ protocol: NECext
 address: A3 00 00 00
 command: 1D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1E 00 00 00
 #
-name: RCVR_VOLUME_+
+name: RCVR_VOL+
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1E 00 00 00
 #
-name: MAIN_VOLUME_+
+name: MAIN_VOL+
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1E 00 00 00
 #
-name: MASTER_VOLUME_+
+name: MASTER_VOL+
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1F 00 00 00
 #
-name: RCVR_VOLUME_-
+name: RCVR_VOL-
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1F 00 00 00
 #
-name: MAIN_VOLUME_-
+name: MAIN_VOL-
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1F 00 00 00
 #
-name: MASTER_VOLUME_-
+name: MASTER_VOL-
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1F 00 00 00
 #
-name: TUNER_10KEY_0
+name: TUNER_100
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -463,7 +463,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 20 00 00 00
 #
-name: TUNER_10KEY_0_MAG.PR
+name: TUNER_100_MAG.PR
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -481,7 +481,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 21 00 00 00
 #
-name: TUNER_10KEY_1
+name: TUNER_101
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -511,7 +511,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 21 00 00 00
 #
-name: TUNER_10KEY_1_63HZ
+name: TUNER_101_63HZ
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -523,7 +523,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 22 00 00 00
 #
-name: TUNER_10KEY_2
+name: TUNER_102
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -553,7 +553,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 22 00 00 00
 #
-name: TUNER_10KEY_2_160HZ
+name: TUNER_102_160HZ
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -565,7 +565,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 23 00 00 00
 #
-name: TUNER_10KEY_3
+name: TUNER_103
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -589,7 +589,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 23 00 00 00
 #
-name: TUNER_10KEY_3_400HZ
+name: TUNER_103_400HZ
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -601,7 +601,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 24 00 00 00
 #
-name: TUNER_10KEY_4
+name: TUNER_104
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -625,7 +625,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 24 00 00 00
 #
-name: TUNER_10KEY_4_1KHZ
+name: TUNER_104_1KHZ
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -637,7 +637,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 25 00 00 00
 #
-name: TUNER_10KEY_5
+name: TUNER_105
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -661,7 +661,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 25 00 00 00
 #
-name: TUNER_10KEY_5_2.5KHZ
+name: TUNER_105_2.5KHZ
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -673,7 +673,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 26 00 00 00
 #
-name: TUNER_10KEY_6
+name: TUNER_106
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -697,7 +697,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 26 00 00 00
 #
-name: TUNER_10KEY_6_6.3KHZ
+name: TUNER_106_6.3KHZ
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -709,7 +709,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 27 00 00 00
 #
-name: TUNER_10KEY_7
+name: TUNER_107
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -739,7 +739,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 27 00 00 00
 #
-name: TUNER_10KEY_7/P_16KZ
+name: TUNER_107/P_16KZ
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -763,7 +763,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 28 00 00 00
 #
-name: TUNER_10KEY_8
+name: TUNER_108
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -781,7 +781,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 28 00 00 00
 #
-name: TUNER_10KEY_8_-SEA
+name: TUNER_108_-SEA
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -793,7 +793,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 29 00 00 00
 #
-name: TUNER_10KEY_9
+name: TUNER_109
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -811,7 +811,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 29 00 00 00
 #
-name: TUNER_10KEY_9_+SEA
+name: TUNER_109_+SEA
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -823,7 +823,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 2A 00 00 00
 #
-name: TUNER_10KEY_10
+name: TUNER_1010
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -847,7 +847,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 2F 00 00 00
 #
-name: TUNER_10KEY_+10
+name: TUNER_10+10
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -865,7 +865,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 2F 00 00 00
 #
-name: TUNER_10KEY_+10_PRGM
+name: TUNER_10+10_PRGM
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -901,7 +901,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 30 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -1489,7 +1489,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 5E 00 00 00
 #
-name: SURROUND_VOLUME_+
+name: SURROUND_VOL+
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -1501,7 +1501,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 5F 00 00 00
 #
-name: SURROUND_VOLUME_-
+name: SURROUND_VOL-
 type: parsed
 protocol: NECext
 address: A3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Receiver/179_-1.ir b/_CSV-IRDB_/J/JVC/Receiver/179_-1.ir
index fcee9ee2..d269fbfc 100644
--- a/_CSV-IRDB_/J/JVC/Receiver/179_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Receiver/179_-1.ir
@@ -253,7 +253,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 60 00 00 00
 #
-name: CD_10KEY_0
+name: CD_100
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 61 00 00 00
 #
-name: CD_10KEY_1
+name: CD_101
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -307,7 +307,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 62 00 00 00
 #
-name: CD_10KEY_2
+name: CD_102
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -337,7 +337,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 63 00 00 00
 #
-name: CD_10KEY_3
+name: CD_103
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -367,7 +367,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 64 00 00 00
 #
-name: CD_10KEY_4
+name: CD_104
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -397,7 +397,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 65 00 00 00
 #
-name: CD_10KEY_5
+name: CD_105
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -427,7 +427,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 66 00 00 00
 #
-name: CD_10KEY_6
+name: CD_106
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -457,7 +457,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 67 00 00 00
 #
-name: CD_10KEY_7/P
+name: CD_107/P
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -493,7 +493,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 68 00 00 00
 #
-name: CD_10KEY_8
+name: CD_108
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -523,7 +523,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 69 00 00 00
 #
-name: CD_10KEY_9
+name: CD_109
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -553,7 +553,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 6E 00 00 00
 #
-name: CD_10KEY_10
+name: CD_1010
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -589,7 +589,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 6F 00 00 00
 #
-name: CD_10KEY_+10
+name: CD_10+10
 type: parsed
 protocol: NECext
 address: B3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Receiver/3_-1.ir b/_CSV-IRDB_/J/JVC/Receiver/3_-1.ir
index f52b046d..e800ae1c 100644
--- a/_CSV-IRDB_/J/JVC/Receiver/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Receiver/3_-1.ir
@@ -169,7 +169,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: TV_VOLUME_+
+name: TV_VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: TV_VOLUME_-
+name: TV_VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Receiver/67_-1.ir b/_CSV-IRDB_/J/JVC/Receiver/67_-1.ir
index 3affb257..840b56cd 100644
--- a/_CSV-IRDB_/J/JVC/Receiver/67_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Receiver/67_-1.ir
@@ -265,7 +265,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 10 00 00 00
 #
-name: VCR_10KEY_PRGM
+name: VCR_10PRGM
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -313,7 +313,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 18 00 00 00
 #
-name: VCR_10KEY_CONTINUE
+name: VCR_10CONTINUE
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -367,7 +367,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 20 00 00 00
 #
-name: VCR_10KEY_1
+name: VCR_101
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -385,7 +385,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 21 00 00 00
 #
-name: VCR_10KEY_2
+name: VCR_102
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -403,7 +403,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 22 00 00 00
 #
-name: VCR_10KEY_3
+name: VCR_103
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -421,7 +421,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 23 00 00 00
 #
-name: VCR_10KEY_4
+name: VCR_104
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -439,7 +439,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 24 00 00 00
 #
-name: VCR_10KEY_5
+name: VCR_105
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -457,7 +457,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 25 00 00 00
 #
-name: VCR_10KEY_6
+name: VCR_106
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -475,13 +475,13 @@ protocol: NECext
 address: 43 00 00 00
 command: 26 00 00 00
 #
-name: VCR_10KEY_7/P
+name: VCR_107/P
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 27 00 00 00
 #
-name: VCR_10KEY_7
+name: VCR_107
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -505,7 +505,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 27 00 00 00
 #
-name: VCR_10KEY_8
+name: VCR_108
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -523,7 +523,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 28 00 00 00
 #
-name: VCR_10KEY_9
+name: VCR_109
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -541,13 +541,13 @@ protocol: NECext
 address: 43 00 00 00
 command: 29 00 00 00
 #
-name: VCR_10KEY_0
+name: VCR_100
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 33 00 00 00
 #
-name: VCR_10KEY_10
+name: VCR_1010
 type: parsed
 protocol: NECext
 address: 43 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Receiver/83_-1.ir b/_CSV-IRDB_/J/JVC/Receiver/83_-1.ir
index bfc70b02..a75343a1 100644
--- a/_CSV-IRDB_/J/JVC/Receiver/83_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Receiver/83_-1.ir
@@ -37,7 +37,7 @@ protocol: NECext
 address: 53 00 00 00
 command: 07 00 00 00
 #
-name: VCR2_POWER_(ON/OFF)
+name: VCR2_POWER_(POWER)
 type: parsed
 protocol: NECext
 address: 53 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Satellite/8_0.ir b/_CSV-IRDB_/J/JVC/Satellite/8_0.ir
index 35f0cf9d..cbeec885 100644
--- a/_CSV-IRDB_/J/JVC/Satellite/8_0.ir
+++ b/_CSV-IRDB_/J/JVC/Satellite/8_0.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Switcher/243_-1.ir b/_CSV-IRDB_/J/JVC/Switcher/243_-1.ir
index cb99c19e..4397cc1a 100644
--- a/_CSV-IRDB_/J/JVC/Switcher/243_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Switcher/243_-1.ir
@@ -109,7 +109,7 @@ protocol: NECext
 address: F3 00 00 00
 command: AA 00 00 00
 #
-name: KEY_LOCK
+name: LOCK
 type: parsed
 protocol: NECext
 address: F3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/TV/3_-1.ir b/_CSV-IRDB_/J/JVC/TV/3_-1.ir
index b564becc..b328cd71 100644
--- a/_CSV-IRDB_/J/JVC/TV/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/TV/3_-1.ir
@@ -217,7 +217,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: CHAN_DOWN
+name: CH-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -319,13 +319,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -355,13 +355,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Tuner/163_-1.ir b/_CSV-IRDB_/J/JVC/Tuner/163_-1.ir
index 8441fc71..0e947937 100644
--- a/_CSV-IRDB_/J/JVC/Tuner/163_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Tuner/163_-1.ir
@@ -73,13 +73,13 @@ protocol: NECext
 address: A3 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_440/179_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_440/179_-1.ir
index 04db631b..a423449e 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_440/179_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_440/179_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 44 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: B3 00 00 00
 command: 47 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -49,67 +49,67 @@ protocol: NECext
 address: B3 00 00 00
 command: 59 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 60 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 61 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 62 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 63 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 64 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 65 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 66 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 67 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 67 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: B3 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 70 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_JVC-RM-C475W/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_JVC-RM-C475W/3_-1.ir
index 52576d71..e39906fe 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_JVC-RM-C475W/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_JVC-RM-C475W/3_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -31,103 +31,103 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 5B 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 77 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_JVC/159_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_JVC/159_-1.ir
index 66e416cb..fc661253 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_JVC/159_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_JVC/159_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -37,97 +37,97 @@ protocol: NECext
 address: 9F 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2A 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 70 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 77 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_JvcDishPlayer500/3_0.ir b/_CSV-IRDB_/J/JVC/Unknown_JvcDishPlayer500/3_0.ir
index cd144195..34356535 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_JvcDishPlayer500/3_0.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_JvcDishPlayer500/3_0.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 02 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 03 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 12 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -157,49 +157,49 @@ protocol: NECext
 address: 03 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 31 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 32 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_LP20106-002/67_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_LP20106-002/67_-1.ir
index dee01306..3b8f00ff 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_LP20106-002/67_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_LP20106-002/67_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 03 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -43,91 +43,91 @@ protocol: NECext
 address: 43 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 17 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 19 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 29 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 35 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 38 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 43 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_PQ10543/83_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_PQ10543/83_-1.ir
index 33a18200..18d66750 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_PQ10543/83_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_PQ10543/83_-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 07 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 19 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 29 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 31 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 33 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 53 00 00 00
 command: 91 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 53 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-C1251G/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-C1251G/3_-1.ir
index c57f6110..a32beac6 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-C1251G/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-C1251G/3_-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -37,97 +37,97 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 42 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 77 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 03 00 00 00
 command: D5 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-C360/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-C360/3_-1.ir
index 5dc6d7fd..d0e7348a 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-C360/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-C360/3_-1.ir
@@ -25,19 +25,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -49,91 +49,91 @@ protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 79 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 7B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 92 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-C410/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-C410/3_-1.ir
index f874a28f..70b93e94 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-C410/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-C410/3_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 03 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-C462/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-C462/3_-1.ir
index 7b75cf83..a8975c8b 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-C462/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-C462/3_-1.ir
@@ -19,97 +19,97 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 99 00 00 00
 #
-name: KEY_MAX
+name: MAX
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-C530/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-C530/3_-1.ir
index 7c31887d..3a12aeeb 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-C530/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-C530/3_-1.ir
@@ -19,97 +19,97 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 92 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-C670/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-C670/3_-1.ir
index acf52268..f9bb8eef 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-C670/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-C670/3_-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 00 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -43,103 +43,103 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 5B 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 77 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 7C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 89 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: B2 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-C678/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-C678/3_-1.ir
index ea1a3522..84ae44d0 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-C678/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-C678/3_-1.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -25,109 +25,109 @@ protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 5B 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 77 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-RK50/143_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-RK50/143_-1.ir
index 47c8df9f..d3b7aa8d 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-RK50/143_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-RK50/143_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 84 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 85 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-RK60/143_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-RK60/143_-1.ir
index 1ddd2755..57593669 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-RK60/143_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-RK60/143_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 84 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
@@ -25,31 +25,31 @@ protocol: NECext
 address: 8F 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 92 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 93 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
 command: 94 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 8F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-RX130/159_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-RX130/159_-1.ir
index 2fbb3829..51737327 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-RX130/159_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-RX130/159_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -43,73 +43,73 @@ protocol: NECext
 address: 9F 00 00 00
 command: 12 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 77 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-RX250/159_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-RX250/159_-1.ir
index 2c0d6bdb..15e38fd1 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-RX250/159_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-RX250/159_-1.ir
@@ -7,85 +7,85 @@ protocol: NECext
 address: 9F 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 70 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 71 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 74 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-RXU1/159_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-RXU1/159_-1.ir
index efa0b4b2..a9040d3f 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-RXU1/159_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-RXU1/159_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 9F 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -61,73 +61,73 @@ protocol: NECext
 address: 9F 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 9F 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 33 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -175,37 +175,37 @@ protocol: NECext
 address: 9F 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 44 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 45 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 74 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 77 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-RXUA4/159_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-RXUA4/159_-1.ir
index a73f3df5..b1b27cd9 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-RXUA4/159_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-RXUA4/159_-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -31,73 +31,73 @@ protocol: NECext
 address: 9F 00 00 00
 command: 13 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-RXUT200R/159_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-RXUT200R/159_-1.ir
index 730d219d..d48b3ac4 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-RXUT200R/159_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-RXUT200R/159_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 9F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -79,85 +79,85 @@ protocol: NECext
 address: 9F 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 9F 00 00 00
 command: 41 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 70 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 77 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-SMXJ100E/0_4.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-SMXJ100E/0_4.ir
index d16e9caf..830a20dd 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-SMXJ100E/0_4.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-SMXJ100E/0_4.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 00 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 05 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 10 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 00 04 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 00 04 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 04 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 00 04 00 00
 command: 21 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 22 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 26 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 04 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 00 04 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 04 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 00 04 00 00
 command: 40 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 41 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 04 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-SX263U/179_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-SX263U/179_-1.ir
index e43a0749..debedb28 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-SX263U/179_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-SX263U/179_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: B3 00 00 00
 command: 44 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: B3 00 00 00
 command: 57 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 58 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -67,55 +67,55 @@ protocol: NECext
 address: B3 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 61 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 62 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 63 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 64 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 65 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 66 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 68 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 68 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: B3 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: B3 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B3 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: B3 00 00 00
 command: 72 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-SXVS40A/239_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-SXVS40A/239_-1.ir
index 7a295b92..59aaa0ad 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-SXVS40A/239_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-SXVS40A/239_-1.ir
@@ -7,103 +7,103 @@ protocol: NECext
 address: EF 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 44 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 60 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 61 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 62 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 63 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 64 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 65 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 66 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 67 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 68 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 69 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: EF 00 00 00
 command: 70 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: EF 00 00 00
 command: 7F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 83 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: B0 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: EF 00 00 00
 command: B9 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: BC 00 00 00
 #
-name: X_KEY_3dphonic
+name: X_3dphonic
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -175,31 +175,31 @@ protocol: NECext
 address: EF 00 00 00
 command: BE 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: C1 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: C2 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: C8 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: CB 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: EF 00 00 00
 command: D3 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D4 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: EF 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-V1E/67_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-V1E/67_-1.ir
index 986421a2..07cdd25b 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-V1E/67_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-V1E/67_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 03 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 96 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 43 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-V718U/211_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-V718U/211_-1.ir
index 98a07410..f96124af 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-V718U/211_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-V718U/211_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: D3 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: D3 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: D3 00 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: D3 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D3 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: D3 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: D3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_RM-V730U/223_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_RM-V730U/223_-1.ir
index 413580e0..afd55c6b 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_RM-V730U/223_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_RM-V730U/223_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: A0 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: A1 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: A2 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: A3 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: A4 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: DF 00 00 00
@@ -43,19 +43,19 @@ protocol: NECext
 address: DF 00 00 00
 command: A5 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: A6 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: A7 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: DF 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: DF 00 00 00
 command: AC 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: DF 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_SXV037J/239_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_SXV037J/239_-1.ir
index 9b13a41c..7ebaaaea 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_SXV037J/239_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_SXV037J/239_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: EF 00 00 00
 command: 49 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: EF 00 00 00
 command: 54 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: EF 00 00 00
 command: 69 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: EF 00 00 00
 command: 7F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: B0 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: B1 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: BC 00 00 00
 #
-name: X_KEY_3D_PHONIC
+name: X_3D_PHONIC
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: EF 00 00 00
 command: BE 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: C0 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -199,61 +199,61 @@ protocol: NECext
 address: EF 00 00 00
 command: C2 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: C8 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: CB 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: CD 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D0 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D1 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D2 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D3 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D4 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D5 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_jvc-lp20465-005-vcr/67_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_jvc-lp20465-005-vcr/67_-1.ir
index 2d169d42..203cef2a 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_jvc-lp20465-005-vcr/67_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_jvc-lp20465-005-vcr/67_-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 03 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 43 00 00 00
 command: 13 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -73,67 +73,67 @@ protocol: NECext
 address: 43 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 19 00 00 00
 #
-name: KEY_V
+name: V
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 19 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 31 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 43 00 00 00
 command: 35 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 36 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 43 00 00 00
 command: CB 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 43 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_remote/159_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_remote/159_-1.ir
index 57c3953e..3cf956bd 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_remote/159_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_remote/159_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -43,91 +43,91 @@ protocol: NECext
 address: 9F 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2A 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 9F 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: 70 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 9F 00 00 00
 command: 77 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 9F 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: F1 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
 command: F2 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 9F 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_rm-c241/3_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_rm-c241/3_-1.ir
index dd93e237..e8bc8877 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_rm-c241/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_rm-c241/3_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -55,91 +55,91 @@ protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 77 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 7A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Unknown_sw/243_-1.ir b/_CSV-IRDB_/J/JVC/Unknown_sw/243_-1.ir
index 54ddb4c4..89eb2e8a 100644
--- a/_CSV-IRDB_/J/JVC/Unknown_sw/243_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Unknown_sw/243_-1.ir
@@ -7,55 +7,55 @@ protocol: NECext
 address: F3 00 00 00
 command: 86 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: 97 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: A1 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: A2 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: A3 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: A4 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: A5 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: A6 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: F3 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: F3 00 00 00
 command: AB 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: AC 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: F3 00 00 00
 command: AD 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: F3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/VCR/163_-1.ir b/_CSV-IRDB_/J/JVC/VCR/163_-1.ir
index 17f93a98..dd8444e2 100644
--- a/_CSV-IRDB_/J/JVC/VCR/163_-1.ir
+++ b/_CSV-IRDB_/J/JVC/VCR/163_-1.ir
@@ -37,13 +37,13 @@ protocol: NECext
 address: A3 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A3 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/VCR/1_-1.ir b/_CSV-IRDB_/J/JVC/VCR/1_-1.ir
index eaf59177..0bc33ec8 100644
--- a/_CSV-IRDB_/J/JVC/VCR/1_-1.ir
+++ b/_CSV-IRDB_/J/JVC/VCR/1_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/VCR/3_-1.ir b/_CSV-IRDB_/J/JVC/VCR/3_-1.ir
index e6658325..b82829b7 100644
--- a/_CSV-IRDB_/J/JVC/VCR/3_-1.ir
+++ b/_CSV-IRDB_/J/JVC/VCR/3_-1.ir
@@ -259,13 +259,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: (TV)_VOLUME_+
+name: (TV)_VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: TV_VOLUME_+
+name: TV_VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -295,7 +295,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: VCR_VOLUME_+
+name: VCR_VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -325,13 +325,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: (TV)_VOLUME_-
+name: (TV)_VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -349,7 +349,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: TV_VOLUME_-
+name: TV_VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -367,7 +367,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: VCR_VOLUME_-
+name: VCR_VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/VCR/64_-1.ir b/_CSV-IRDB_/J/JVC/VCR/64_-1.ir
index 78db8a5d..97764bd9 100644
--- a/_CSV-IRDB_/J/JVC/VCR/64_-1.ir
+++ b/_CSV-IRDB_/J/JVC/VCR/64_-1.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 12 00 00 00
 #
-name: VCR_VOLUME_+
+name: VCR_VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: VCR_VOLUME_-
+name: VCR_VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/VCR/67_-1.ir b/_CSV-IRDB_/J/JVC/VCR/67_-1.ir
index 717dccc8..408fdd1e 100644
--- a/_CSV-IRDB_/J/JVC/VCR/67_-1.ir
+++ b/_CSV-IRDB_/J/JVC/VCR/67_-1.ir
@@ -925,7 +925,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 14 00 00 00
 #
-name: TV_VOLUME_+
+name: TV_VOL+
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -1129,7 +1129,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 15 00 00 00
 #
-name: TV_VOLUME_--
+name: TV_VOL--
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -1321,7 +1321,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 18 00 00 00
 #
-name: CH_DWN
+name: CH-
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -1489,7 +1489,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 19 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -1549,7 +1549,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 19 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 43 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Video_Projector/115_-1.ir b/_CSV-IRDB_/J/JVC/Video_Projector/115_-1.ir
index 0bcf4df5..20de4e8e 100644
--- a/_CSV-IRDB_/J/JVC/Video_Projector/115_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Video_Projector/115_-1.ir
@@ -73,7 +73,7 @@ protocol: NECext
 address: 73 00 00 00
 command: 05 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 73 00 00 00
diff --git a/_CSV-IRDB_/J/JVC/Video_Switcher/243_-1.ir b/_CSV-IRDB_/J/JVC/Video_Switcher/243_-1.ir
index 242613eb..a41d6804 100644
--- a/_CSV-IRDB_/J/JVC/Video_Switcher/243_-1.ir
+++ b/_CSV-IRDB_/J/JVC/Video_Switcher/243_-1.ir
@@ -181,7 +181,7 @@ protocol: NECext
 address: F3 00 00 00
 command: AB 00 00 00
 #
-name: KEY_LOCK
+name: LOCK
 type: parsed
 protocol: NECext
 address: F3 00 00 00
diff --git a/_CSV-IRDB_/J/Jamo/DVD_Receiver/25_-1.ir b/_CSV-IRDB_/J/Jamo/DVD_Receiver/25_-1.ir
index 2060f6ce..5e7151ea 100644
--- a/_CSV-IRDB_/J/Jamo/DVD_Receiver/25_-1.ir
+++ b/_CSV-IRDB_/J/Jamo/DVD_Receiver/25_-1.ir
@@ -133,13 +133,13 @@ protocol: NECext
 address: 19 00 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_+_A
+name: VOL+_A
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_+_B
+name: VOL+_B
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 19 00 00 00
 command: 49 00 00 00
 #
-name: VOLUME_-_A
+name: VOL-_A
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 4C 00 00 00
 #
-name: VOLUME_-_B
+name: VOL-_B
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/J/Jerrold/Cable_Box/0_-1.ir b/_CSV-IRDB_/J/Jerrold/Cable_Box/0_-1.ir
index 0641e3ce..29bfb3fc 100644
--- a/_CSV-IRDB_/J/Jerrold/Cable_Box/0_-1.ir
+++ b/_CSV-IRDB_/J/Jerrold/Cable_Box/0_-1.ir
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/J/Jerrold/Unknown_550-osd/0_-1.ir b/_CSV-IRDB_/J/Jerrold/Unknown_550-osd/0_-1.ir
index 49ea7eb8..7a030bea 100644
--- a/_CSV-IRDB_/J/Jerrold/Unknown_550-osd/0_-1.ir
+++ b/_CSV-IRDB_/J/Jerrold/Unknown_550-osd/0_-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/J/Jerrold/Unknown_CFT2000/0_-1.ir b/_CSV-IRDB_/J/Jerrold/Unknown_CFT2000/0_-1.ir
index 1e936f0f..afa79983 100644
--- a/_CSV-IRDB_/J/Jerrold/Unknown_CFT2000/0_-1.ir
+++ b/_CSV-IRDB_/J/Jerrold/Unknown_CFT2000/0_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/J/Jerrold/Unknown_MRC/-1_-1.ir b/_CSV-IRDB_/J/Jerrold/Unknown_MRC/-1_-1.ir
index b9979b34..185cb083 100644
--- a/_CSV-IRDB_/J/Jerrold/Unknown_MRC/-1_-1.ir
+++ b/_CSV-IRDB_/J/Jerrold/Unknown_MRC/-1_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -19,25 +19,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -67,19 +67,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -91,37 +91,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,31 +133,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/J/Jerrold/Unknown_RC-OSD/0_-1.ir b/_CSV-IRDB_/J/Jerrold/Unknown_RC-OSD/0_-1.ir
index 0492c088..29e6c142 100644
--- a/_CSV-IRDB_/J/Jerrold/Unknown_RC-OSD/0_-1.ir
+++ b/_CSV-IRDB_/J/Jerrold/Unknown_RC-OSD/0_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,43 +67,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/K/KAWA/Unknown_TV/11_11.ir b/_CSV-IRDB_/K/KAWA/Unknown_TV/11_11.ir
index 0e74b199..0f8503ed 100644
--- a/_CSV-IRDB_/K/KAWA/Unknown_TV/11_11.ir
+++ b/_CSV-IRDB_/K/KAWA/Unknown_TV/11_11.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 0C 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 14 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 18 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 1B 00 00 00
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1C 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1D 00 00 00
 #
-name: KEY_Y
+name: Y
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1E 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
diff --git a/_CSV-IRDB_/K/KENMORE/Unknown_253-79081/8_245.ir b/_CSV-IRDB_/K/KENMORE/Unknown_253-79081/8_245.ir
index c06d32dc..211267c2 100644
--- a/_CSV-IRDB_/K/KENMORE/Unknown_253-79081/8_245.ir
+++ b/_CSV-IRDB_/K/KENMORE/Unknown_253-79081/8_245.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 01 00 00 00
 #
-name: KEY_SAVE
+name: SAVE
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 04 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 06 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 09 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 0E 00 00 00
 #
-name: KEY_SHUFFLE
+name: SHUFFLE
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 F5 00 00
diff --git a/_CSV-IRDB_/K/KEY_DIGITAL/Matrix_Switcher/130_19.ir b/_CSV-IRDB_/K/KEY_DIGITAL/Matrix_Switcher/130_19.ir
index 32ac7982..d269edcf 100644
--- a/_CSV-IRDB_/K/KEY_DIGITAL/Matrix_Switcher/130_19.ir
+++ b/_CSV-IRDB_/K/KEY_DIGITAL/Matrix_Switcher/130_19.ir
@@ -517,7 +517,7 @@ protocol: NECext
 address: 82 13 00 00
 command: AB 00 00 00
 #
-name: VOLUME
+name: VOL+
 type: parsed
 protocol: NECext
 address: 82 13 00 00
diff --git a/_CSV-IRDB_/K/KEY_DIGITAL/Matrix_Switcher/132_-1.ir b/_CSV-IRDB_/K/KEY_DIGITAL/Matrix_Switcher/132_-1.ir
index 23815b4f..e9c68b81 100644
--- a/_CSV-IRDB_/K/KEY_DIGITAL/Matrix_Switcher/132_-1.ir
+++ b/_CSV-IRDB_/K/KEY_DIGITAL/Matrix_Switcher/132_-1.ir
@@ -109,7 +109,7 @@ protocol: NECext
 address: 84 00 00 00
 command: 12 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/K/KEY_DIGITAL/Video_Switcher/132_-1.ir b/_CSV-IRDB_/K/KEY_DIGITAL/Video_Switcher/132_-1.ir
index 23815b4f..e9c68b81 100644
--- a/_CSV-IRDB_/K/KEY_DIGITAL/Video_Switcher/132_-1.ir
+++ b/_CSV-IRDB_/K/KEY_DIGITAL/Video_Switcher/132_-1.ir
@@ -109,7 +109,7 @@ protocol: NECext
 address: 84 00 00 00
 command: 12 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/K/Kaon/Unknown_KSC-i260MCO/32_8.ir b/_CSV-IRDB_/K/Kaon/Unknown_KSC-i260MCO/32_8.ir
index 6d55c1e2..53796b81 100644
--- a/_CSV-IRDB_/K/Kaon/Unknown_KSC-i260MCO/32_8.ir
+++ b/_CSV-IRDB_/K/Kaon/Unknown_KSC-i260MCO/32_8.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 08 00 00
@@ -13,19 +13,19 @@ protocol: NECext
 address: 20 08 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 20 08 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
@@ -73,157 +73,157 @@ protocol: NECext
 address: 20 08 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0C 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0D 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 18 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 42 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 46 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 08 00 00
diff --git a/_CSV-IRDB_/K/Kaon/Unknown_KTF-100CO/32_8.ir b/_CSV-IRDB_/K/Kaon/Unknown_KTF-100CO/32_8.ir
index 2bd36f38..1d8093a8 100644
--- a/_CSV-IRDB_/K/Kaon/Unknown_KTF-100CO/32_8.ir
+++ b/_CSV-IRDB_/K/Kaon/Unknown_KTF-100CO/32_8.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
@@ -13,19 +13,19 @@ protocol: NECext
 address: 20 08 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 20 08 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
@@ -55,127 +55,127 @@ protocol: NECext
 address: 20 08 00 00
 command: 08 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 18 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 42 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 46 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 08 00 00
diff --git a/_CSV-IRDB_/K/Kaon/Unknown_KTF-I2001CO/32_8.ir b/_CSV-IRDB_/K/Kaon/Unknown_KTF-I2001CO/32_8.ir
index 58ebedfd..4bd69e31 100644
--- a/_CSV-IRDB_/K/Kaon/Unknown_KTF-I2001CO/32_8.ir
+++ b/_CSV-IRDB_/K/Kaon/Unknown_KTF-I2001CO/32_8.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 04 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
@@ -67,145 +67,145 @@ protocol: NECext
 address: 20 08 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0D 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 18 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 42 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 46 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 08 00 00
diff --git a/_CSV-IRDB_/K/Kathrein/Satellite/34_144.ir b/_CSV-IRDB_/K/Kathrein/Satellite/34_144.ir
index 48ff8af6..fbcaf2f6 100644
--- a/_CSV-IRDB_/K/Kathrein/Satellite/34_144.ir
+++ b/_CSV-IRDB_/K/Kathrein/Satellite/34_144.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 22 90 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 22 90 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 22 90 00 00
diff --git a/_CSV-IRDB_/K/Kathrein/Unknown_KathreinUFD400/0_-1.ir b/_CSV-IRDB_/K/Kathrein/Unknown_KathreinUFD400/0_-1.ir
index e0a2c3b5..31acc4ef 100644
--- a/_CSV-IRDB_/K/Kathrein/Unknown_KathreinUFD400/0_-1.ir
+++ b/_CSV-IRDB_/K/Kathrein/Unknown_KathreinUFD400/0_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_L
+name: L
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/K/Kensington/MP3_Player/51_170.ir b/_CSV-IRDB_/K/Kensington/MP3_Player/51_170.ir
index c91085b3..b69975ec 100644
--- a/_CSV-IRDB_/K/Kensington/MP3_Player/51_170.ir
+++ b/_CSV-IRDB_/K/Kensington/MP3_Player/51_170.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 33 AA 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 33 AA 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 33 AA 00 00
diff --git a/_CSV-IRDB_/K/Kensington/iPod Dock/51_170.ir b/_CSV-IRDB_/K/Kensington/iPod Dock/51_170.ir
index 73babc75..88cd7001 100644
--- a/_CSV-IRDB_/K/Kensington/iPod Dock/51_170.ir	
+++ b/_CSV-IRDB_/K/Kensington/iPod Dock/51_170.ir	
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 33 AA 00 00
 command: 00 00 00 00
 #
-name: 1_VOLUME_-
+name: 1_VOL-
 type: parsed
 protocol: NECext
 address: 33 AA 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 33 AA 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 33 AA 00 00
 command: 17 00 00 00
 #
-name: 1_VOLUME_+
+name: 1_VOL+
 type: parsed
 protocol: NECext
 address: 33 AA 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Amplifier/184_0.ir b/_CSV-IRDB_/K/Kenwood/Amplifier/184_0.ir
index 69b0736d..159e845b 100644
--- a/_CSV-IRDB_/K/Kenwood/Amplifier/184_0.ir
+++ b/_CSV-IRDB_/K/Kenwood/Amplifier/184_0.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: B8 00 00 00
 command: 97 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Pre-Amplifier/184_-1.ir b/_CSV-IRDB_/K/Kenwood/Pre-Amplifier/184_-1.ir
index e84b710a..9c8c9618 100644
--- a/_CSV-IRDB_/K/Kenwood/Pre-Amplifier/184_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Pre-Amplifier/184_-1.ir
@@ -295,7 +295,7 @@ protocol: NECext
 address: B8 00 00 00
 command: 9A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -307,7 +307,7 @@ protocol: NECext
 address: B8 00 00 00
 command: 9B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Receiver/184_-1.ir b/_CSV-IRDB_/K/Kenwood/Receiver/184_-1.ir
index accd077f..8a311149 100644
--- a/_CSV-IRDB_/K/Kenwood/Receiver/184_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Receiver/184_-1.ir
@@ -853,7 +853,7 @@ protocol: NECext
 address: B8 00 00 00
 command: 99 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -889,7 +889,7 @@ protocol: NECext
 address: B8 00 00 00
 command: 9A 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -913,7 +913,7 @@ protocol: NECext
 address: B8 00 00 00
 command: 9B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -937,7 +937,7 @@ protocol: NECext
 address: B8 00 00 00
 command: 9B 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Receiver/184_0.ir b/_CSV-IRDB_/K/Kenwood/Receiver/184_0.ir
index a26407fd..d4dc494c 100644
--- a/_CSV-IRDB_/K/Kenwood/Receiver/184_0.ir
+++ b/_CSV-IRDB_/K/Kenwood/Receiver/184_0.ir
@@ -445,13 +445,13 @@ protocol: NECext
 address: B8 00 00 00
 command: 96 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Satellite_Radio/2_255.ir b/_CSV-IRDB_/K/Kenwood/Satellite_Radio/2_255.ir
index e42d2d13..3ef2eddf 100644
--- a/_CSV-IRDB_/K/Kenwood/Satellite_Radio/2_255.ir
+++ b/_CSV-IRDB_/K/Kenwood/Satellite_Radio/2_255.ir
@@ -217,7 +217,7 @@ protocol: NECext
 address: 02 FF 00 00
 command: 18 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Sirius/2_255.ir b/_CSV-IRDB_/K/Kenwood/Sirius/2_255.ir
index d9382083..a3320723 100644
--- a/_CSV-IRDB_/K/Kenwood/Sirius/2_255.ir
+++ b/_CSV-IRDB_/K/Kenwood/Sirius/2_255.ir
@@ -133,7 +133,7 @@ protocol: NECext
 address: 02 FF 00 00
 command: 17 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 02 FF 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-160/184_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-160/184_-1.ir
index 5f43b1a2..915e4404 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-160/184_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-160/184_-1.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: B8 00 00 00
 command: 08 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: B8 00 00 00
 command: 99 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: B8 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: C6 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-A0400/184_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-A0400/184_-1.ir
index 0449a660..72636f5c 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-A0400/184_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-A0400/184_-1.ir
@@ -37,19 +37,19 @@ protocol: NECext
 address: B8 00 00 00
 command: 90 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 91 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 92 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: B8 00 00 00
 command: 99 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: B8 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B8 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-D0705.conf/182_12.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-D0705.conf/182_12.ir
index 5307427f..69c0637a 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-D0705.conf/182_12.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-D0705.conf/182_12.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: B6 0C 00 00
 command: 10 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: B6 0C 00 00
 command: 17 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: 19 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: B6 0C 00 00
 command: 4B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: B6 0C 00 00
 command: 98 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: B6 0C 00 00
 command: C1 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: B6 0C 00 00
 command: C3 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
@@ -193,31 +193,31 @@ protocol: NECext
 address: B6 0C 00 00
 command: C9 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: D3 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: D6 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: D7 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
 command: D8 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: B6 0C 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-M0301/182_4.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-M0301/182_4.ir
index 41309a5b..344d33e8 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-M0301/182_4.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-M0301/182_4.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 09 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 0C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 10 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 16 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B6 04 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: B6 04 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 1F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: B6 04 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: B6 04 00 00
 command: 52 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 54 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: B6 04 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: B6 04 00 00
 command: 57 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 9A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B6 04 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: B6 04 00 00
 command: C4 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: C5 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B6 04 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-M0701/182_4.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-M0701/182_4.ir
index bfc32547..378e2b1b 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-M0701/182_4.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-M0701/182_4.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 04 00 00
@@ -25,49 +25,49 @@ protocol: NECext
 address: B6 04 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 09 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: B6 04 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: B6 04 00 00
 command: 18 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 04 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: B6 04 00 00
 command: 9A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B6 04 00 00
 command: 9D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: B6 04 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: B6 04 00 00
 command: C7 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B6 04 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P030/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P030/182_-1.ir
index 320130ad..1beea9da 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P030/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P030/182_-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 09 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: B6 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SPACE
+name: SPACE
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 42 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 48 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 49 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: B6 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0400/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0400/182_-1.ir
index de9bbcdf..b87423bd 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0400/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0400/182_-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 09 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P070/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P070/182_-1.ir
index 2a1aff51..bdd32c80 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P070/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P070/182_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 09 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 10 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: B6 00 00 00
 command: 18 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: B6 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SPACE
+name: SPACE
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: B6 00 00 00
 command: 45 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 46 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 49 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -193,67 +193,67 @@ protocol: NECext
 address: B6 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 89 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: B6 00 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0702/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0702/182_-1.ir
index a3c89688..ef6c65c1 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0702/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0702/182_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 09 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: B6 00 00 00
 command: 18 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: B6 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_P
+name: P
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0715/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0715/182_-1.ir
index f85503e4..c489fc7a 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0715/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P0715/182_-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 09 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 17 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 18 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: B6 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 48 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 49 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P2030/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P2030/182_-1.ir
index f59c0265..92e59881 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P2030/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P2030/182_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: B6 00 00 00
 command: 18 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: B6 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P600/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P600/182_-1.ir
index 704197b0..df00be04 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-P600/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-P600/182_-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 09 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: B6 00 00 00
 command: 16 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 17 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: B6 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-R0311E/44_44.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-R0311E/44_44.ir
index 9df2c3d6..e3974d08 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-R0311E/44_44.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-R0311E/44_44.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 04 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 05 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 06 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 07 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -49,85 +49,85 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 1E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 41 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 43 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 46 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 48 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 49 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 4D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 4E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 4F 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 60 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -175,55 +175,55 @@ protocol: NECext
 address: 2C 2C 00 00
 command: A1 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: A3 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: A4 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: A5 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: A6 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: A7 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: A8 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: A9 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: AA 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: AD 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: AF 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -265,7 +265,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: B2 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: B4 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_RC-RO503/184_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_RC-RO503/184_-1.ir
index 251a5aef..71ef7be0 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_RC-RO503/184_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_RC-RO503/184_-1.ir
@@ -19,19 +19,19 @@ protocol: NECext
 address: B8 00 00 00
 command: 90 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 91 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 92 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: B8 00 00 00
 command: 95 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -61,31 +61,31 @@ protocol: NECext
 address: B8 00 00 00
 command: 99 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: C9 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B8 00 00 00
@@ -103,67 +103,67 @@ protocol: NECext
 address: B8 00 00 00
 command: CF 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: D0 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: D1 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: D2 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: D3 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: D5 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: D8 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: D9 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: DA 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: DB 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: DD 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: B8 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_rc-p800/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_rc-p800/182_-1.ir
index ddcc0d87..1713da77 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_rc-p800/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_rc-p800/182_-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 16 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 17 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: B6 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Kenwood/Unknown_rc-p87/182_-1.ir b/_CSV-IRDB_/K/Kenwood/Unknown_rc-p87/182_-1.ir
index c4e62941..3a3bb37e 100644
--- a/_CSV-IRDB_/K/Kenwood/Unknown_rc-p87/182_-1.ir
+++ b/_CSV-IRDB_/K/Kenwood/Unknown_rc-p87/182_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B6 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: B6 00 00 00
 command: 13 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: B6 00 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B6 00 00 00
diff --git a/_CSV-IRDB_/K/Khl/Unknown_REC-R3000/65_-1.ir b/_CSV-IRDB_/K/Khl/Unknown_REC-R3000/65_-1.ir
index 1e923d99..170893d7 100644
--- a/_CSV-IRDB_/K/Khl/Unknown_REC-R3000/65_-1.ir
+++ b/_CSV-IRDB_/K/Khl/Unknown_REC-R3000/65_-1.ir
@@ -7,73 +7,73 @@ protocol: NECext
 address: 41 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 41 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 41 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 41 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 41 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 18 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 41 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 41 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 41 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 41 00 00 00
diff --git a/_CSV-IRDB_/K/Kinergetics_Research/Pre-Amplifier/28_-1.ir b/_CSV-IRDB_/K/Kinergetics_Research/Pre-Amplifier/28_-1.ir
index 035f9c50..d360af7e 100644
--- a/_CSV-IRDB_/K/Kinergetics_Research/Pre-Amplifier/28_-1.ir
+++ b/_CSV-IRDB_/K/Kinergetics_Research/Pre-Amplifier/28_-1.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 0D 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 1D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
diff --git a/_CSV-IRDB_/K/Kinergetics_Research/Surround_Processor/7_-1.ir b/_CSV-IRDB_/K/Kinergetics_Research/Surround_Processor/7_-1.ir
index 62fe701f..e0fde592 100644
--- a/_CSV-IRDB_/K/Kinergetics_Research/Surround_Processor/7_-1.ir
+++ b/_CSV-IRDB_/K/Kinergetics_Research/Surround_Processor/7_-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 21 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/K/Kiss/Unknown_DP-1500s/25_-1.ir b/_CSV-IRDB_/K/Kiss/Unknown_DP-1500s/25_-1.ir
index ba9f7f69..3b51b7d7 100644
--- a/_CSV-IRDB_/K/Kiss/Unknown_DP-1500s/25_-1.ir
+++ b/_CSV-IRDB_/K/Kiss/Unknown_DP-1500s/25_-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 19 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -109,61 +109,61 @@ protocol: NECext
 address: 19 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 36 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 41 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 42 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 43 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 44 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -175,55 +175,55 @@ protocol: NECext
 address: 19 00 00 00
 command: 46 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 48 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 49 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 50 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 51 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 55 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 56 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/K/Klipsch/Subwoofer/17_81.ir b/_CSV-IRDB_/K/Klipsch/Subwoofer/17_81.ir
index f770d864..1a515b14 100644
--- a/_CSV-IRDB_/K/Klipsch/Subwoofer/17_81.ir
+++ b/_CSV-IRDB_/K/Klipsch/Subwoofer/17_81.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 51 00 00
 command: 00 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 51 00 00
diff --git a/_CSV-IRDB_/K/Knoll/Video_Projector/24_233.ir b/_CSV-IRDB_/K/Knoll/Video_Projector/24_233.ir
index b3c44a54..42583e7d 100644
--- a/_CSV-IRDB_/K/Knoll/Video_Projector/24_233.ir
+++ b/_CSV-IRDB_/K/Knoll/Video_Projector/24_233.ir
@@ -49,13 +49,13 @@ protocol: NECext
 address: 18 E9 00 00
 command: 47 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 48 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
diff --git a/_CSV-IRDB_/K/Konka/Unknown_KK-Y199/25_1.ir b/_CSV-IRDB_/K/Konka/Unknown_KK-Y199/25_1.ir
index 9376eb0b..a7eec14a 100644
--- a/_CSV-IRDB_/K/Konka/Unknown_KK-Y199/25_1.ir
+++ b/_CSV-IRDB_/K/Konka/Unknown_KK-Y199/25_1.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: 19 01 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 19 01 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 19 01 00 00
 command: 07 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 19 01 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 19 01 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 19 01 00 00
@@ -73,67 +73,67 @@ protocol: NECext
 address: 19 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 19 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 19 01 00 00
diff --git a/_CSV-IRDB_/K/Konka/Unknown_KK-Y250A/25_1.ir b/_CSV-IRDB_/K/Konka/Unknown_KK-Y250A/25_1.ir
index 38585f25..801d27a6 100644
--- a/_CSV-IRDB_/K/Konka/Unknown_KK-Y250A/25_1.ir
+++ b/_CSV-IRDB_/K/Konka/Unknown_KK-Y250A/25_1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 09 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 19 01 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 19 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 19 01 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 19 01 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 19 01 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 19 01 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 19 01 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 19 01 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 19 01 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 19 01 00 00
diff --git a/_CSV-IRDB_/K/Krell/Pre-Amplifier/16_-1.ir b/_CSV-IRDB_/K/Krell/Pre-Amplifier/16_-1.ir
index fd06c398..7da42d93 100644
--- a/_CSV-IRDB_/K/Krell/Pre-Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/K/Krell/Pre-Amplifier/16_-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/K/Krell/Surround_Processor/28_-1.ir b/_CSV-IRDB_/K/Krell/Surround_Processor/28_-1.ir
index e86b5863..44549feb 100644
--- a/_CSV-IRDB_/K/Krell/Surround_Processor/28_-1.ir
+++ b/_CSV-IRDB_/K/Krell/Surround_Processor/28_-1.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 0B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
diff --git a/_CSV-IRDB_/K/Kworld/Unknown_ATSC/0_251.ir b/_CSV-IRDB_/K/Kworld/Unknown_ATSC/0_251.ir
index 9aebba09..07df4fcd 100644
--- a/_CSV-IRDB_/K/Kworld/Unknown_ATSC/0_251.ir
+++ b/_CSV-IRDB_/K/Kworld/Unknown_ATSC/0_251.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -73,49 +73,49 @@ protocol: NECext
 address: 00 FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0D 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 15 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 16 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -151,37 +151,37 @@ protocol: NECext
 address: 00 FB 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -211,61 +211,61 @@ protocol: NECext
 address: 00 FB 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 44 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 45 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 48 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 49 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4A 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4B 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4C 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4D 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4E 00 00 00
 #
-name: KEY_H
+name: H
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
diff --git a/_CSV-IRDB_/K/Kworld/Unknown_DVB-T/134_107.ir b/_CSV-IRDB_/K/Kworld/Unknown_DVB-T/134_107.ir
index 47c385f3..0929d8fb 100644
--- a/_CSV-IRDB_/K/Kworld/Unknown_DVB-T/134_107.ir
+++ b/_CSV-IRDB_/K/Kworld/Unknown_DVB-T/134_107.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -73,85 +73,85 @@ protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0B 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -211,49 +211,49 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -265,7 +265,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -289,13 +289,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -307,7 +307,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -319,31 +319,31 @@ protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -355,19 +355,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -379,7 +379,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -391,19 +391,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -415,13 +415,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/K/Kworld/Unknown_KWorld-DVBT-220/0_251.ir b/_CSV-IRDB_/K/Kworld/Unknown_KWorld-DVBT-220/0_251.ir
index cc86699e..978f5a9f 100644
--- a/_CSV-IRDB_/K/Kworld/Unknown_KWorld-DVBT-220/0_251.ir
+++ b/_CSV-IRDB_/K/Kworld/Unknown_KWorld-DVBT-220/0_251.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -73,49 +73,49 @@ protocol: NECext
 address: 00 FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0D 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 15 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 16 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 1D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 44 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
diff --git a/_CSV-IRDB_/K/Kworld/Unknown_KWorld-DVBT-PE310/0_251.ir b/_CSV-IRDB_/K/Kworld/Unknown_KWorld-DVBT-PE310/0_251.ir
index cc86699e..978f5a9f 100644
--- a/_CSV-IRDB_/K/Kworld/Unknown_KWorld-DVBT-PE310/0_251.ir
+++ b/_CSV-IRDB_/K/Kworld/Unknown_KWorld-DVBT-PE310/0_251.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -73,49 +73,49 @@ protocol: NECext
 address: 00 FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0D 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 15 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 16 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 1D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 1E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 00 FB 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 44 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
diff --git a/_CSV-IRDB_/K/Kworld/Unknown_VS-PRV-TV/134_107.ir b/_CSV-IRDB_/K/Kworld/Unknown_VS-PRV-TV/134_107.ir
index 347c155d..a503c4bd 100644
--- a/_CSV-IRDB_/K/Kworld/Unknown_VS-PRV-TV/134_107.ir
+++ b/_CSV-IRDB_/K/Kworld/Unknown_VS-PRV-TV/134_107.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -91,55 +91,55 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -181,61 +181,61 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 21 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 22 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 23 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 40 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 41 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 42 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -247,19 +247,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 48 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 49 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 4A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/K/kendo/Unknown_RC-610/134_124.ir b/_CSV-IRDB_/K/kendo/Unknown_RC-610/134_124.ir
index cb17a8e6..c23553f3 100644
--- a/_CSV-IRDB_/K/kendo/Unknown_RC-610/134_124.ir
+++ b/_CSV-IRDB_/K/kendo/Unknown_RC-610/134_124.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 01 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 02 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 07 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
@@ -55,103 +55,103 @@ protocol: NECext
 address: 86 7C 00 00
 command: 09 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0B 00 00 00
 #
-name: KEY_DISPLAYTOGGLE
+name: DISPLAYTOGGLE
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 19 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 86 7C 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
diff --git a/_CSV-IRDB_/K/konig/Unknown_konig/128_99.ir b/_CSV-IRDB_/K/konig/Unknown_konig/128_99.ir
index 7d265e6c..c50a93e0 100644
--- a/_CSV-IRDB_/K/konig/Unknown_konig/128_99.ir
+++ b/_CSV-IRDB_/K/konig/Unknown_konig/128_99.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 0F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 80 63 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 80 63 00 00
 command: 12 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 13 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 80 63 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 80 63 00 00
 command: 44 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 80 63 00 00
@@ -235,25 +235,25 @@ protocol: NECext
 address: 80 63 00 00
 command: 49 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 4A 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 4B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 80 63 00 00
 command: 4C 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 80 63 00 00
diff --git a/_CSV-IRDB_/K/kosmos/Unknown_kosmos/8_-1.ir b/_CSV-IRDB_/K/kosmos/Unknown_kosmos/8_-1.ir
index 386993e2..48ec6631 100644
--- a/_CSV-IRDB_/K/kosmos/Unknown_kosmos/8_-1.ir
+++ b/_CSV-IRDB_/K/kosmos/Unknown_kosmos/8_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -37,85 +37,85 @@ protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/L/LEMON/Unknown_LEMON/7_-1.ir b/_CSV-IRDB_/L/LEMON/Unknown_LEMON/7_-1.ir
index 1e3eaf64..4e5a9694 100644
--- a/_CSV-IRDB_/L/LEMON/Unknown_LEMON/7_-1.ir
+++ b/_CSV-IRDB_/L/LEMON/Unknown_LEMON/7_-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 21 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 24 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 25 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -145,43 +145,43 @@ protocol: NECext
 address: 07 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 37 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 38 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Plasma/4_-1.ir b/_CSV-IRDB_/L/LG/Plasma/4_-1.ir
index 9219dc1c..d0ee3914 100644
--- a/_CSV-IRDB_/L/LG/Plasma/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Plasma/4_-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Sound_Bar/44_44.ir b/_CSV-IRDB_/L/LG/Sound_Bar/44_44.ir
index 7cbca015..919cbe44 100644
--- a/_CSV-IRDB_/L/LG/Sound_Bar/44_44.ir
+++ b/_CSV-IRDB_/L/LG/Sound_Bar/44_44.ir
@@ -31,13 +31,13 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 16 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
diff --git a/_CSV-IRDB_/L/LG/TV/4_-1.ir b/_CSV-IRDB_/L/LG/TV/4_-1.ir
index 0072474c..0d4da41a 100644
--- a/_CSV-IRDB_/L/LG/TV/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/TV/4_-1.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_42H3000/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_42H3000/4_-1.ir
index a7e557ed..932b4063 100644
--- a/_CSV-IRDB_/L/LG/Unknown_42H3000/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_42H3000/4_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 53 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 61 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 63 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 95 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: AA 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_6710CDAP01B/44_44.ir b/_CSV-IRDB_/L/LG/Unknown_6710CDAP01B/44_44.ir
index 0216ccbb..1b11e147 100644
--- a/_CSV-IRDB_/L/LG/Unknown_6710CDAP01B/44_44.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_6710CDAP01B/44_44.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 04 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -43,85 +43,85 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 1E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 41 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 43 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 46 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 48 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 49 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 4D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 6A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 7A 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: 2C 2C 00 00
 command: 82 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 8A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: 9A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: A1 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 2C 2C 00 00
 command: A3 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: A4 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -253,19 +253,19 @@ protocol: NECext
 address: 2C 2C 00 00
 command: AD 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: AE 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
 command: AF 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: B2 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
@@ -295,7 +295,7 @@ protocol: NECext
 address: 2C 2C 00 00
 command: B4 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 2C 2C 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_6710T00009B/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_6710T00009B/4_-1.ir
index 7b53c5a0..6f72d7df 100644
--- a/_CSV-IRDB_/L/LG/Unknown_6710T00009B/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_6710T00009B/4_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -67,61 +67,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -133,31 +133,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 44 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 79 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 98 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_6710V00067G/0_-1.ir b/_CSV-IRDB_/L/LG/Unknown_6710V00067G/0_-1.ir
index 6da46d28..2b916bb1 100644
--- a/_CSV-IRDB_/L/LG/Unknown_6710V00067G/0_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_6710V00067G/0_-1.ir
@@ -1,235 +1,235 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_P
+name: P
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MEDIA
+name: MEDIA
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_S
+name: S
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_DIGITS
+name: DIGITS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_SAVE
+name: SAVE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_REDO
+name: REDO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PROPS
+name: PROPS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_MAX
+name: MAX
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_SHOP
+name: SHOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_INSERT
+name: INSERT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_6710V00070A/0_-1.ir b/_CSV-IRDB_/L/LG/Unknown_6710V00070A/0_-1.ir
index e41babce..2cdf926a 100644
--- a/_CSV-IRDB_/L/LG/Unknown_6710V00070A/0_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_6710V00070A/0_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_6710V00090D/0_-1.ir b/_CSV-IRDB_/L/LG/Unknown_6710V00090D/0_-1.ir
index fc984d68..d361f5a5 100644
--- a/_CSV-IRDB_/L/LG/Unknown_6710V00090D/0_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_6710V00090D/0_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_6710V00090N/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_6710V00090N/4_-1.ir
index 0d9473c1..3744d3e6 100644
--- a/_CSV-IRDB_/L/LG/Unknown_6710V00090N/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_6710V00090N/4_-1.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,67 +55,67 @@ protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_6710V00091N/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_6710V00091N/4_-1.ir
index 129c2bec..2488744b 100644
--- a/_CSV-IRDB_/L/LG/Unknown_6710V00091N/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_6710V00091N/4_-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_6710V00133A/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_6710V00133A/4_-1.ir
index 6bd07ed9..518aaf09 100644
--- a/_CSV-IRDB_/L/LG/Unknown_6710V00133A/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_6710V00133A/4_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 92 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: A4 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: A5 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_AKB69680403/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_AKB69680403/4_-1.ir
index b4ce9930..a7c88c10 100644
--- a/_CSV-IRDB_/L/LG/Unknown_AKB69680403/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_AKB69680403/4_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 53 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 61 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 63 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 95 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: AA 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_AKB72915207/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_AKB72915207/4_-1.ir
index 41b9782b..60ec1d52 100644
--- a/_CSV-IRDB_/L/LG/Unknown_AKB72915207/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_AKB72915207/4_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 53 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 63 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 7E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -253,31 +253,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 95 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: AA 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: AB 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: B0 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: B1 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_AKB73715601/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_AKB73715601/4_-1.ir
index b21a8adb..0bf9015f 100644
--- a/_CSV-IRDB_/L/LG/Unknown_AKB73715601/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_AKB73715601/4_-1.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SWITCHVIDEOMODE
+name: SWITCHVIDEOMODE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNEL
+name: CHANNEL
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CONFIG
+name: CONFIG
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 28 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -163,79 +163,79 @@ protocol: NECext
 address: 04 00 00 00
 command: 42 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 44 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 53 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 61 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 63 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 72 00 00 00
 #
-name: KEY_PROPS
+name: PROPS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 79 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 7C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -247,43 +247,43 @@ protocol: NECext
 address: 04 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: AA 00 00 00
 #
-name: KEY_PROGRAM
+name: PROGRAM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: AB 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: B0 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: B1 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: BA 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: BD 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_BC205P/110_-1.ir b/_CSV-IRDB_/L/LG/Unknown_BC205P/110_-1.ir
index f2c15596..7a2d29f1 100644
--- a/_CSV-IRDB_/L/LG/Unknown_BC205P/110_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_BC205P/110_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -67,31 +67,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -103,31 +103,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -145,43 +145,43 @@ protocol: NECext
 address: 6E 00 00 00
 command: 56 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 82 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 83 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 89 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 90 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: B6 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_BD300/45_45.ir b/_CSV-IRDB_/L/LG/Unknown_BD300/45_45.ir
index 0c5f6545..8d346f38 100644
--- a/_CSV-IRDB_/L/LG/Unknown_BD300/45_45.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_BD300/45_45.ir
@@ -1,301 +1,301 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 34 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 35 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 36 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 38 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 39 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3F 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 40 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 41 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 42 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 43 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 44 00 00 00
 #
-name: X_KEY_RETURN
+name: X_RETURN
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 45 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 47 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 48 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 4B 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 4C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 4F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 50 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 50 00 00 00
 #
-name: KEY_AB
+name: AB
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 55 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 5A 00 00 00
 #
-name: X_KEY_PIP
+name: X_PIP
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 5F 00 00 00
 #
-name: X_KEY_MARKER
+name: X_MARKER
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 61 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 62 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 64 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 67 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 75 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 76 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7C 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7C 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7D 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7E 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 7F 00 00 00
 #
-name: X_KEY_RESOLUTION
+name: X_RESOLUTION
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: F5 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_CC470TW/110_-1.ir b/_CSV-IRDB_/L/LG/Unknown_CC470TW/110_-1.ir
index 9609950c..a598a83d 100644
--- a/_CSV-IRDB_/L/LG/Unknown_CC470TW/110_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_CC470TW/110_-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 56 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 82 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 83 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 89 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_LG-AKB69680403/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_LG-AKB69680403/4_-1.ir
index 1b5b8d25..26d7d1a5 100644
--- a/_CSV-IRDB_/L/LG/Unknown_LG-AKB69680403/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_LG-AKB69680403/4_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 53 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 61 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 63 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 95 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: AA 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_LG-EV230/110_-1.ir b/_CSV-IRDB_/L/LG/Unknown_LG-EV230/110_-1.ir
index cf8857b2..d34e6645 100644
--- a/_CSV-IRDB_/L/LG/Unknown_LG-EV230/110_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_LG-EV230/110_-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -121,49 +121,49 @@ protocol: NECext
 address: 6E 00 00 00
 command: 56 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 82 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 83 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 89 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 90 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: B6 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: B8 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_LG.6710V00005G/110_-1.ir b/_CSV-IRDB_/L/LG/Unknown_LG.6710V00005G/110_-1.ir
index cc7053e3..605e3af8 100644
--- a/_CSV-IRDB_/L/LG/Unknown_LG.6710V00005G/110_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_LG.6710V00005G/110_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -67,61 +67,61 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -169,25 +169,25 @@ protocol: NECext
 address: 6E 00 00 00
 command: 56 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 58 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 59 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 77 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_LG.6710V00008K/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_LG.6710V00008K/4_-1.ir
index fa9b2531..e6b75ead 100644
--- a/_CSV-IRDB_/L/LG/Unknown_LG.6710V00008K/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_LG.6710V00008K/4_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -49,67 +49,67 @@ protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_LG/110_-1.ir b/_CSV-IRDB_/L/LG/Unknown_LG/110_-1.ir
index 0a4d3e6f..2607167f 100644
--- a/_CSV-IRDB_/L/LG/Unknown_LG/110_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_LG/110_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_MKJ40653807/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_MKJ40653807/4_-1.ir
index 9fe3d4c8..3ffc0846 100644
--- a/_CSV-IRDB_/L/LG/Unknown_MKJ40653807/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_MKJ40653807/4_-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 53 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,25 +187,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 60 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 61 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 63 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -223,37 +223,37 @@ protocol: NECext
 address: 04 00 00 00
 command: 7E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: B0 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: B1 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: BA 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_MKJ61842704/4_-1.ir b/_CSV-IRDB_/L/LG/Unknown_MKJ61842704/4_-1.ir
index ebc2ac90..32f2d084 100644
--- a/_CSV-IRDB_/L/LG/Unknown_MKJ61842704/4_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_MKJ61842704/4_-1.ir
@@ -1,253 +1,253 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: X_KEY_INPUTSOURCE
+name: X_INPUTSOURCE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: X_KEY_QUICKVIEW
+name: X_QUICKVIEW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: X_KEY_RETURN
+name: X_RETURN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 28 00 00 00
 #
-name: X_KEY_AVMODE
+name: X_AVMODE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 44 00 00 00
 #
-name: X_KEY_QUICKMENU
+name: X_QUICKMENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 53 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 61 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 63 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 72 00 00 00
 #
-name: X_KEY_XSTUDIO
+name: X_XSTUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 7C 00 00 00
 #
-name: X_KEY_SMPLINK
+name: X_SMPLINK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 7E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 8F 00 00 00
 #
-name: X_KEY_ENERGYSAVING
+name: X_ENERGYSAVING
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 95 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: B0 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: B1 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/L/LG/Unknown_PBAFA0189A/110_-1.ir b/_CSV-IRDB_/L/LG/Unknown_PBAFA0189A/110_-1.ir
index fa114ab8..207bbb60 100644
--- a/_CSV-IRDB_/L/LG/Unknown_PBAFA0189A/110_-1.ir
+++ b/_CSV-IRDB_/L/LG/Unknown_PBAFA0189A/110_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 76 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 82 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 83 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 89 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/L/L_S/Unknown_30755/5_-1.ir b/_CSV-IRDB_/L/L_S/Unknown_30755/5_-1.ir
index fa9cc443..520c3a79 100644
--- a/_CSV-IRDB_/L/L_S/Unknown_30755/5_-1.ir
+++ b/_CSV-IRDB_/L/L_S/Unknown_30755/5_-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -97,61 +97,61 @@ protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -163,49 +163,49 @@ protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/L/L_S/Unknown_LS/164_164.ir b/_CSV-IRDB_/L/L_S/Unknown_LS/164_164.ir
index 79b29305..96819bdb 100644
--- a/_CSV-IRDB_/L/L_S/Unknown_LS/164_164.ir
+++ b/_CSV-IRDB_/L/L_S/Unknown_LS/164_164.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: A4 A4 00 00
 command: 04 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: A4 A4 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: A4 A4 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
@@ -67,19 +67,19 @@ protocol: NECext
 address: A4 A4 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 60 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
diff --git a/_CSV-IRDB_/L/Lacie/Unknown_Lacie/64_64.ir b/_CSV-IRDB_/L/Lacie/Unknown_Lacie/64_64.ir
index 9521d3a5..69ffda7b 100644
--- a/_CSV-IRDB_/L/Lacie/Unknown_Lacie/64_64.ir
+++ b/_CSV-IRDB_/L/Lacie/Unknown_Lacie/64_64.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -49,85 +49,85 @@ protocol: NECext
 address: 40 40 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 11 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 40 40 00 00
 command: 16 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 17 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -157,49 +157,49 @@ protocol: NECext
 address: 40 40 00 00
 command: 19 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 40 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 43 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 45 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 40 40 00 00
 command: 47 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 48 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/L/Lacie/Unknown_PNE-N1SS/0_127.ir b/_CSV-IRDB_/L/Lacie/Unknown_PNE-N1SS/0_127.ir
index 22868099..55ef76d4 100644
--- a/_CSV-IRDB_/L/Lacie/Unknown_PNE-N1SS/0_127.ir
+++ b/_CSV-IRDB_/L/Lacie/Unknown_PNE-N1SS/0_127.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 26 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 3E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 4C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 56 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 5C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 64 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 66 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 7C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 7E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 8C 00 00 00
 #
-name: X_KEY_SETTINGS
+name: X_SETTINGS
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 94 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: A4 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: A4 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: AC 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: B4 00 00 00
 #
-name: X_KEY_SHUTDOWN
+name: X_SHUTDOWN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: C4 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/_CSV-IRDB_/L/Lasonic/Unknown_LasonicR2000/16_-1.ir b/_CSV-IRDB_/L/Lasonic/Unknown_LasonicR2000/16_-1.ir
index 583814c4..81ed4ebf 100644
--- a/_CSV-IRDB_/L/Lasonic/Unknown_LasonicR2000/16_-1.ir
+++ b/_CSV-IRDB_/L/Lasonic/Unknown_LasonicR2000/16_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_3D
+name: 3D
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -19,31 +19,31 @@ protocol: NECext
 address: 10 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 10 00 00 00
 command: 17 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 40 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 45 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -133,31 +133,31 @@ protocol: NECext
 address: 10 00 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 48 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 49 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 10 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 50 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -205,55 +205,55 @@ protocol: NECext
 address: 10 00 00 00
 command: 53 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 55 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 56 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 57 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 58 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 59 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/L/LeadTek/Unknown_RM-0007/3_-1.ir b/_CSV-IRDB_/L/LeadTek/Unknown_RM-0007/3_-1.ir
index 2c8d4285..2af3f6d3 100644
--- a/_CSV-IRDB_/L/LeadTek/Unknown_RM-0007/3_-1.ir
+++ b/_CSV-IRDB_/L/LeadTek/Unknown_RM-0007/3_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 00 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 01 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -25,91 +25,91 @@ protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 08 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 10 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -133,31 +133,31 @@ protocol: NECext
 address: 03 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 16 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/L/LeadTek/Unknown_Y0400046/3_-1.ir b/_CSV-IRDB_/L/LeadTek/Unknown_Y0400046/3_-1.ir
index 67733b94..bbadb30c 100644
--- a/_CSV-IRDB_/L/LeadTek/Unknown_Y0400046/3_-1.ir
+++ b/_CSV-IRDB_/L/LeadTek/Unknown_Y0400046/3_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 02 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 10 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 41 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 43 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 46 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -223,25 +223,25 @@ protocol: NECext
 address: 03 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/L/LeadTek/Unknown_Y0400052/3_-1.ir b/_CSV-IRDB_/L/LeadTek/Unknown_Y0400052/3_-1.ir
index df82e08a..55387020 100644
--- a/_CSV-IRDB_/L/LeadTek/Unknown_Y0400052/3_-1.ir
+++ b/_CSV-IRDB_/L/LeadTek/Unknown_Y0400052/3_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -13,109 +13,109 @@ protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 08 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 10 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 03 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOT
+name: DOT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 41 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 43 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 46 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 46 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -247,43 +247,43 @@ protocol: NECext
 address: 03 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -301,37 +301,37 @@ protocol: NECext
 address: 03 00 00 00
 command: 52 00 00 00
 #
-name: KEY_L
+name: L
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 53 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 54 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 55 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 57 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/L/LeadTek/Unknown_Y04G0004/3_-1.ir b/_CSV-IRDB_/L/LeadTek/Unknown_Y04G0004/3_-1.ir
index 32b3f3f5..d5b7a10d 100644
--- a/_CSV-IRDB_/L/LeadTek/Unknown_Y04G0004/3_-1.ir
+++ b/_CSV-IRDB_/L/LeadTek/Unknown_Y04G0004/3_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -13,103 +13,103 @@ protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 08 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 10 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 03 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOT
+name: DOT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 43 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 46 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 46 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -211,37 +211,37 @@ protocol: NECext
 address: 03 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -253,43 +253,43 @@ protocol: NECext
 address: 03 00 00 00
 command: 51 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 53 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 54 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 55 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 57 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/L/Leadership/Unknown_GOTEC/0_-1.ir b/_CSV-IRDB_/L/Leadership/Unknown_GOTEC/0_-1.ir
index b0d7636b..7708fcc0 100644
--- a/_CSV-IRDB_/L/Leadership/Unknown_GOTEC/0_-1.ir
+++ b/_CSV-IRDB_/L/Leadership/Unknown_GOTEC/0_-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,49 +151,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,49 +229,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/L/Lenovo/Unknown_Y530/4_69.ir b/_CSV-IRDB_/L/Lenovo/Unknown_Y530/4_69.ir
index 15abbe4e..1ece0e52 100644
--- a/_CSV-IRDB_/L/Lenovo/Unknown_Y530/4_69.ir
+++ b/_CSV-IRDB_/L/Lenovo/Unknown_Y530/4_69.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 1F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 21 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 2C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 2E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 37 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 3E 00 00 00
 #
-name: KEY_MEDIA
+name: MEDIA
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 5B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 5C 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 5D 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 83 00 00 00
 #
-name: KEY_PVR
+name: PVR
 type: parsed
 protocol: NECext
 address: 04 45 00 00
 command: 9B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 45 00 00
diff --git a/_CSV-IRDB_/L/Lexicon/Receiver/130_11.ir b/_CSV-IRDB_/L/Lexicon/Receiver/130_11.ir
index 3f711c8f..86edf6b3 100644
--- a/_CSV-IRDB_/L/Lexicon/Receiver/130_11.ir
+++ b/_CSV-IRDB_/L/Lexicon/Receiver/130_11.ir
@@ -73,13 +73,13 @@ protocol: NECext
 address: 82 0B 00 00
 command: 15 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 16 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
diff --git a/_CSV-IRDB_/L/Lexicon/Surround_Processor/130_11.ir b/_CSV-IRDB_/L/Lexicon/Surround_Processor/130_11.ir
index fb592c59..6a3d51c0 100644
--- a/_CSV-IRDB_/L/Lexicon/Surround_Processor/130_11.ir
+++ b/_CSV-IRDB_/L/Lexicon/Surround_Processor/130_11.ir
@@ -355,31 +355,31 @@ protocol: NECext
 address: 82 0B 00 00
 command: 15 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 16 00 00 00
 #
-name: MAIN:_VOLUME_-1DB
+name: MAIN:_VOL-1DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 16 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 17 00 00 00
 #
-name: MAIN:_VOLUME_+1DB
+name: MAIN:_VOL+1DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 17 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
@@ -811,25 +811,25 @@ protocol: NECext
 address: 82 0B 00 00
 command: 55 00 00 00
 #
-name: Z-2_VOLUME_-
+name: Z-2_VOL-
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 56 00 00 00
 #
-name: ZONE:_VOLUME_-1DB
+name: ZONE:_VOL-1DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 56 00 00 00
 #
-name: Z-2_VOLUME_+
+name: Z-2_VOL+
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 57 00 00 00
 #
-name: ZONE:_VOLUME_+1DB
+name: ZONE:_VOL+1DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
@@ -1243,13 +1243,13 @@ protocol: NECext
 address: 82 0B 00 00
 command: 96 00 00 00
 #
-name: VOLUME_-5_DB
+name: VOL-5_DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 96 00 00 00
 #
-name: MAIN:_VOLUME_-3DB
+name: MAIN:_VOL-3DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
@@ -1261,13 +1261,13 @@ protocol: NECext
 address: 82 0B 00 00
 command: 97 00 00 00
 #
-name: VOLUME_+5_DB
+name: VOL+5_DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: 97 00 00 00
 #
-name: MAIN:_VOLUME_+3DB
+name: MAIN:_VOL+3DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
@@ -1507,13 +1507,13 @@ protocol: NECext
 address: 82 0B 00 00
 command: D5 00 00 00
 #
-name: REC:_VOLUME_-1DB
+name: REC:_VOL-1DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
 command: D6 00 00 00
 #
-name: REC:_VOLUME_+1DB
+name: REC:_VOL+1DB
 type: parsed
 protocol: NECext
 address: 82 0B 00 00
diff --git a/_CSV-IRDB_/L/Lexicon/Surround_Processor/133_2.ir b/_CSV-IRDB_/L/Lexicon/Surround_Processor/133_2.ir
index d2d10e06..14255033 100644
--- a/_CSV-IRDB_/L/Lexicon/Surround_Processor/133_2.ir
+++ b/_CSV-IRDB_/L/Lexicon/Surround_Processor/133_2.ir
@@ -181,13 +181,13 @@ protocol: NECext
 address: 85 02 00 00
 command: 15 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 85 02 00 00
 command: 16 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 85 02 00 00
@@ -415,13 +415,13 @@ protocol: NECext
 address: 85 02 00 00
 command: 55 00 00 00
 #
-name: Z-2_VOLUME_-
+name: Z-2_VOL-
 type: parsed
 protocol: NECext
 address: 85 02 00 00
 command: 56 00 00 00
 #
-name: Z-2_VOLUME_+
+name: Z-2_VOL+
 type: parsed
 protocol: NECext
 address: 85 02 00 00
@@ -649,13 +649,13 @@ protocol: NECext
 address: 85 02 00 00
 command: 95 00 00 00
 #
-name: VOLUME_-5_DB
+name: VOL-5_DB
 type: parsed
 protocol: NECext
 address: 85 02 00 00
 command: 96 00 00 00
 #
-name: VOLUME_+5_DB
+name: VOL+5_DB
 type: parsed
 protocol: NECext
 address: 85 02 00 00
diff --git a/_CSV-IRDB_/L/Lexicon/Surround_Processor/28_-1.ir b/_CSV-IRDB_/L/Lexicon/Surround_Processor/28_-1.ir
index 3aa20f99..c330c50b 100644
--- a/_CSV-IRDB_/L/Lexicon/Surround_Processor/28_-1.ir
+++ b/_CSV-IRDB_/L/Lexicon/Surround_Processor/28_-1.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 1C 00 00 00
 command: 56 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 57 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 83 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 87 00 00 00
 #
-name: ON/OFF-SIMPLE_REMOTE
+name: POWER-SIMPLE_REMOTE
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -379,7 +379,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: D0 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -409,7 +409,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: D7 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
diff --git a/_CSV-IRDB_/L/Life-view/Unknown_3000/96_1.ir b/_CSV-IRDB_/L/Life-view/Unknown_3000/96_1.ir
index ab79e630..a854beda 100644
--- a/_CSV-IRDB_/L/Life-view/Unknown_3000/96_1.ir
+++ b/_CSV-IRDB_/L/Life-view/Unknown_3000/96_1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 00 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 05 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: 60 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 10 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 14 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 60 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 60 01 00 00
diff --git a/_CSV-IRDB_/L/Life-view/Unknown_flyvideo/96_1.ir b/_CSV-IRDB_/L/Life-view/Unknown_flyvideo/96_1.ir
index 07cdd6f2..47cf8895 100644
--- a/_CSV-IRDB_/L/Life-view/Unknown_flyvideo/96_1.ir
+++ b/_CSV-IRDB_/L/Life-view/Unknown_flyvideo/96_1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -13,55 +13,55 @@ protocol: NECext
 address: 60 01 00 00
 command: 01 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 05 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -73,61 +73,61 @@ protocol: NECext
 address: 60 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 10 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 12 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 60 01 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 60 01 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 18 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 19 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 60 01 00 00
 command: 1E 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 60 01 00 00
 command: E2 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 60 01 00 00
diff --git a/_CSV-IRDB_/L/Lifesat/Unknown_28/128_38.ir b/_CSV-IRDB_/L/Lifesat/Unknown_28/128_38.ir
index d580ee87..c0243c12 100644
--- a/_CSV-IRDB_/L/Lifesat/Unknown_28/128_38.ir
+++ b/_CSV-IRDB_/L/Lifesat/Unknown_28/128_38.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 02 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 80 26 00 00
 command: 0B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -49,43 +49,43 @@ protocol: NECext
 address: 80 26 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 14 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 16 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 80 26 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -109,25 +109,25 @@ protocol: NECext
 address: 80 26 00 00
 command: 1A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 26 00 00
diff --git a/_CSV-IRDB_/L/Lifetec/Unknown_LT9096/128_123.ir b/_CSV-IRDB_/L/Lifetec/Unknown_LT9096/128_123.ir
index 42ea505d..332e7c9f 100644
--- a/_CSV-IRDB_/L/Lifetec/Unknown_LT9096/128_123.ir
+++ b/_CSV-IRDB_/L/Lifetec/Unknown_LT9096/128_123.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -103,31 +103,31 @@ protocol: NECext
 address: 80 7B 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 17 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 1E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 45 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 4C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
diff --git a/_CSV-IRDB_/L/Lifetec/Unknown_RC2000/5_-1.ir b/_CSV-IRDB_/L/Lifetec/Unknown_RC2000/5_-1.ir
index ee624829..7bf27594 100644
--- a/_CSV-IRDB_/L/Lifetec/Unknown_RC2000/5_-1.ir
+++ b/_CSV-IRDB_/L/Lifetec/Unknown_RC2000/5_-1.ir
@@ -1,187 +1,187 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/L/Lifetec/Unknown_remote/164_164.ir b/_CSV-IRDB_/L/Lifetec/Unknown_remote/164_164.ir
index e0e2882d..d419046e 100644
--- a/_CSV-IRDB_/L/Lifetec/Unknown_remote/164_164.ir
+++ b/_CSV-IRDB_/L/Lifetec/Unknown_remote/164_164.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 04 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 0C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A4 A4 00 00
diff --git a/_CSV-IRDB_/L/Linksys/Unknown_WMA11B-R/134_107.ir b/_CSV-IRDB_/L/Linksys/Unknown_WMA11B-R/134_107.ir
index eae24bde..f0a2312c 100644
--- a/_CSV-IRDB_/L/Linksys/Unknown_WMA11B-R/134_107.ir
+++ b/_CSV-IRDB_/L/Linksys/Unknown_WMA11B-R/134_107.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/L/Linn/Surround_Processor/16_-1.ir b/_CSV-IRDB_/L/Linn/Surround_Processor/16_-1.ir
index f40873fb..ba6a21d9 100644
--- a/_CSV-IRDB_/L/Linn/Surround_Processor/16_-1.ir
+++ b/_CSV-IRDB_/L/Linn/Surround_Processor/16_-1.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/L/Loewe/DVD_Player/0_-1.ir b/_CSV-IRDB_/L/Loewe/DVD_Player/0_-1.ir
index 3f7c8e2a..bb5eedf6 100644
--- a/_CSV-IRDB_/L/Loewe/DVD_Player/0_-1.ir
+++ b/_CSV-IRDB_/L/Loewe/DVD_Player/0_-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/L/Loewe/TV/0_-1.ir b/_CSV-IRDB_/L/Loewe/TV/0_-1.ir
index 3af0a6d6..09042824 100644
--- a/_CSV-IRDB_/L/Loewe/TV/0_-1.ir
+++ b/_CSV-IRDB_/L/Loewe/TV/0_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -301,7 +301,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/L/Loewe/Unknown_8500H/110_-1.ir b/_CSV-IRDB_/L/Loewe/Unknown_8500H/110_-1.ir
index 17a0c5fc..26005849 100644
--- a/_CSV-IRDB_/L/Loewe/Unknown_8500H/110_-1.ir
+++ b/_CSV-IRDB_/L/Loewe/Unknown_8500H/110_-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -61,67 +61,67 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 14 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 18 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 6E 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 6E 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 83 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/L/Loewe/Unknown_control/0_-1.ir b/_CSV-IRDB_/L/Loewe/Unknown_control/0_-1.ir
index 14c9a27a..96abd48d 100644
--- a/_CSV-IRDB_/L/Loewe/Unknown_control/0_-1.ir
+++ b/_CSV-IRDB_/L/Loewe/Unknown_control/0_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/L/Logitech/Unknown_HarmonyOne/30_-1.ir b/_CSV-IRDB_/L/Logitech/Unknown_HarmonyOne/30_-1.ir
index 46b68621..d8df6297 100644
--- a/_CSV-IRDB_/L/Logitech/Unknown_HarmonyOne/30_-1.ir
+++ b/_CSV-IRDB_/L/Logitech/Unknown_HarmonyOne/30_-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 11 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 1E 00 00 00
 command: 17 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
@@ -145,85 +145,85 @@ protocol: NECext
 address: 1E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 24 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 25 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 29 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
 command: 37 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 1E 00 00 00
diff --git a/_CSV-IRDB_/L/Logitech/Unknown_z5500/8_-1.ir b/_CSV-IRDB_/L/Logitech/Unknown_z5500/8_-1.ir
index def01da3..79423dae 100644
--- a/_CSV-IRDB_/L/Logitech/Unknown_z5500/8_-1.ir
+++ b/_CSV-IRDB_/L/Logitech/Unknown_z5500/8_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -61,25 +61,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/L/Lumagen/Scaler/2_-1.ir b/_CSV-IRDB_/L/Lumagen/Scaler/2_-1.ir
index 9610bb62..427dc038 100644
--- a/_CSV-IRDB_/L/Lumagen/Scaler/2_-1.ir
+++ b/_CSV-IRDB_/L/Lumagen/Scaler/2_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/L/Luxman/Receiver/204_-1.ir b/_CSV-IRDB_/L/Luxman/Receiver/204_-1.ir
index b299eb19..23142a5d 100644
--- a/_CSV-IRDB_/L/Luxman/Receiver/204_-1.ir
+++ b/_CSV-IRDB_/L/Luxman/Receiver/204_-1.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: CC 00 00 00
 command: 5B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: CC 00 00 00
diff --git a/_CSV-IRDB_/L/Luxor/Unknown_DV405/67_71.ir b/_CSV-IRDB_/L/Luxor/Unknown_DV405/67_71.ir
index af148290..673781d6 100644
--- a/_CSV-IRDB_/L/Luxor/Unknown_DV405/67_71.ir
+++ b/_CSV-IRDB_/L/Luxor/Unknown_DV405/67_71.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 02 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 43 47 00 00
 command: 05 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 06 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 43 47 00 00
 command: 08 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 43 47 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 43 47 00 00
 command: 11 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 12 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 13 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -139,67 +139,67 @@ protocol: NECext
 address: 43 47 00 00
 command: 16 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 17 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 40 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 42 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 43 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 45 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 46 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 47 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 43 47 00 00
 command: 4A 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 4C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
diff --git a/_CSV-IRDB_/M/M3_Electronic/Unknown_DVD-209/0_-1.ir b/_CSV-IRDB_/M/M3_Electronic/Unknown_DVD-209/0_-1.ir
index 730115f0..3a226deb 100644
--- a/_CSV-IRDB_/M/M3_Electronic/Unknown_DVD-209/0_-1.ir
+++ b/_CSV-IRDB_/M/M3_Electronic/Unknown_DVD-209/0_-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/MAGIC_LIGHTING/Lighting/0_-1.ir b/_CSV-IRDB_/M/MAGIC_LIGHTING/Lighting/0_-1.ir
index 30554500..4169d5a8 100644
--- a/_CSV-IRDB_/M/MAGIC_LIGHTING/Lighting/0_-1.ir
+++ b/_CSV-IRDB_/M/MAGIC_LIGHTING/Lighting/0_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/MAGNASONIC/Unknown_TV/131_122.ir b/_CSV-IRDB_/M/MAGNASONIC/Unknown_TV/131_122.ir
index 2804d90a..0a28f3d5 100644
--- a/_CSV-IRDB_/M/MAGNASONIC/Unknown_TV/131_122.ir
+++ b/_CSV-IRDB_/M/MAGNASONIC/Unknown_TV/131_122.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 83 7A 00 00
 command: 04 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 83 7A 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 83 7A 00 00
 command: 0B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
@@ -79,67 +79,67 @@ protocol: NECext
 address: 83 7A 00 00
 command: 0D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 0E 00 00 00
 #
-name: X_KEY_0/AM/PM
+name: X_0/AM/PM
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 83 7A 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 83 7A 00 00
diff --git a/_CSV-IRDB_/M/MCL/Unknown_RemoteController/64,-1.ir b/_CSV-IRDB_/M/MCL/Unknown_RemoteController/64,-1.ir
index b3b4c3b9..81f90317 100644
--- a/_CSV-IRDB_/M/MCL/Unknown_RemoteController/64,-1.ir
+++ b/_CSV-IRDB_/M/MCL/Unknown_RemoteController/64,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/M/METRONIC/Unknown_060501/0,127.ir b/_CSV-IRDB_/M/METRONIC/Unknown_060501/0,127.ir
index d61e6245..51594788 100644
--- a/_CSV-IRDB_/M/METRONIC/Unknown_060501/0,127.ir
+++ b/_CSV-IRDB_/M/METRONIC/Unknown_060501/0,127.ir
@@ -1,163 +1,163 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 03 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 07 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 11 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 14 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 15 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 00 7F 00 00
 command: 40 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 41 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 42 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 00 7F 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/_CSV-IRDB_/M/METRONIC/Unknown_SAT/134,-1.ir b/_CSV-IRDB_/M/METRONIC/Unknown_SAT/134,-1.ir
index 43122b46..80dc49ca 100644
--- a/_CSV-IRDB_/M/METRONIC/Unknown_SAT/134,-1.ir
+++ b/_CSV-IRDB_/M/METRONIC/Unknown_SAT/134,-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 03 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 06 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 86 00 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 86 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 86 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 86 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 86 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 86 00 00 00
 command: 13 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 86 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 86 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 86 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 86 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_2KHZ
+name: 2KHZ
 type: parsed
 protocol: NECext
 address: 86 00 00 00
diff --git a/_CSV-IRDB_/M/MIRO/Unknown_MIRO/134,107.ir b/_CSV-IRDB_/M/MIRO/Unknown_MIRO/134,107.ir
index e95ed3d5..71d5dd01 100644
--- a/_CSV-IRDB_/M/MIRO/Unknown_MIRO/134,107.ir
+++ b/_CSV-IRDB_/M/MIRO/Unknown_MIRO/134,107.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -43,85 +43,85 @@ protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0B 00 00 00
 #
-name: KEY_0_UP
+name: 0_UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/M/MS-Tech/Unknown_HTPC/0,95.ir b/_CSV-IRDB_/M/MS-Tech/Unknown_HTPC/0,95.ir
index 6985906f..ae61f7fb 100644
--- a/_CSV-IRDB_/M/MS-Tech/Unknown_HTPC/0,95.ir
+++ b/_CSV-IRDB_/M/MS-Tech/Unknown_HTPC/0,95.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 01 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 02 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 03 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 05 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 06 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 14 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
@@ -97,163 +97,163 @@ protocol: NECext
 address: 00 5F 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 1B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 1D 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 1E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 1F 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 40 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 41 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 42 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 45 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 46 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 47 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 50 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 51 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 52 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 53 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 54 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 55 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 57 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 58 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 59 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 5A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 5B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 5C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
@@ -265,7 +265,7 @@ protocol: NECext
 address: 00 5F 00 00
 command: 5E 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
diff --git a/_CSV-IRDB_/M/MS-Tech/Unknown_MS-Tech/0,95.ir b/_CSV-IRDB_/M/MS-Tech/Unknown_MS-Tech/0,95.ir
index 6bea877e..d4b5893f 100644
--- a/_CSV-IRDB_/M/MS-Tech/Unknown_MS-Tech/0,95.ir
+++ b/_CSV-IRDB_/M/MS-Tech/Unknown_MS-Tech/0,95.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 01 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 02 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 03 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 05 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 06 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 14 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 16 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 00 5F 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 1B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 1D 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 00 5F 00 00
 command: 1F 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 40 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 41 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
@@ -151,97 +151,97 @@ protocol: NECext
 address: 00 5F 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 45 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 46 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 47 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 50 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 51 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 52 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 53 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 54 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 55 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 57 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 58 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 59 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
 command: 5A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 00 5F 00 00
 command: 5C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 5F 00 00
diff --git a/_CSV-IRDB_/M/MSI/Unknown_MegaPC/134,107.ir b/_CSV-IRDB_/M/MSI/Unknown_MegaPC/134,107.ir
index eab4e861..213e918e 100644
--- a/_CSV-IRDB_/M/MSI/Unknown_MegaPC/134,107.ir
+++ b/_CSV-IRDB_/M/MSI/Unknown_MegaPC/134,107.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -91,55 +91,55 @@ protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: 86 6B 00 00
 command: 41 00 00 00
 #
-name: KEY_MP3
+name: MP3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 42 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 43 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 44 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 47 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 48 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 49 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 4F 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 52 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 53 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -241,43 +241,43 @@ protocol: NECext
 address: 86 6B 00 00
 command: 58 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/M/MSI/Unknown_PC/134,107.ir b/_CSV-IRDB_/M/MSI/Unknown_PC/134,107.ir
index 21c64c8c..5c7a6a3b 100644
--- a/_CSV-IRDB_/M/MSI/Unknown_PC/134,107.ir
+++ b/_CSV-IRDB_/M/MSI/Unknown_PC/134,107.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/M/MSI/Unknown_lircd.conf/134,107.ir b/_CSV-IRDB_/M/MSI/Unknown_lircd.conf/134,107.ir
index ccea6d9f..2d6369aa 100644
--- a/_CSV-IRDB_/M/MSI/Unknown_lircd.conf/134,107.ir
+++ b/_CSV-IRDB_/M/MSI/Unknown_lircd.conf/134,107.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -223,61 +223,61 @@ protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 40 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -295,49 +295,49 @@ protocol: NECext
 address: 86 6B 00 00
 command: 41 00 00 00
 #
-name: KEY_MP3
+name: MP3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 42 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 42 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 43 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 43 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 44 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 44 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 45 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -367,25 +367,25 @@ protocol: NECext
 address: 86 6B 00 00
 command: 47 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 48 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 49 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -403,13 +403,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 4D 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 4E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -439,67 +439,67 @@ protocol: NECext
 address: 86 6B 00 00
 command: 50 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 51 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 51 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 52 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 52 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 53 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 53 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 54 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 54 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 55 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 56 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -517,79 +517,79 @@ protocol: NECext
 address: 86 6B 00 00
 command: 58 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 59 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5B 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 5F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/M/MSI/Unknown_test/134,107.ir b/_CSV-IRDB_/M/MSI/Unknown_test/134,107.ir
index 6ee4cdff..dc8a28fc 100644
--- a/_CSV-IRDB_/M/MSI/Unknown_test/134,107.ir
+++ b/_CSV-IRDB_/M/MSI/Unknown_test/134,107.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -97,49 +97,49 @@ protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/M/Macro_Image_Technology/Unknown_MyHD/48_-1.ir b/_CSV-IRDB_/M/Macro_Image_Technology/Unknown_MyHD/48_-1.ir
index 523e20dd..4ed8039d 100644
--- a/_CSV-IRDB_/M/Macro_Image_Technology/Unknown_MyHD/48_-1.ir
+++ b/_CSV-IRDB_/M/Macro_Image_Technology/Unknown_MyHD/48_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -13,133 +13,133 @@ protocol: NECext
 address: 30 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 13 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 18 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 19 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 20 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 21 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 22 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 30 00 00 00
 command: 25 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 26 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 30 00 00 00
 command: 28 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 29 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 32 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/M/Madrigal/Receiver/5_-1.ir b/_CSV-IRDB_/M/Madrigal/Receiver/5_-1.ir
index 74da0535..b6760ef6 100644
--- a/_CSV-IRDB_/M/Madrigal/Receiver/5_-1.ir
+++ b/_CSV-IRDB_/M/Madrigal/Receiver/5_-1.ir
@@ -43,7 +43,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/M/Magnavox/TV/0_-1.ir b/_CSV-IRDB_/M/Magnavox/TV/0_-1.ir
index 0cb16372..942a95b3 100644
--- a/_CSV-IRDB_/M/Magnavox/TV/0_-1.ir
+++ b/_CSV-IRDB_/M/Magnavox/TV/0_-1.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Magnavox/Unknown_UNIFIED6TRANS/0_-1.ir b/_CSV-IRDB_/M/Magnavox/Unknown_UNIFIED6TRANS/0_-1.ir
index e33ea2d0..745db7dc 100644
--- a/_CSV-IRDB_/M/Magnavox/Unknown_UNIFIED6TRANS/0_-1.ir
+++ b/_CSV-IRDB_/M/Magnavox/Unknown_UNIFIED6TRANS/0_-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,61 +85,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Magnum/Unknown_5520VT/1_-1.ir b/_CSV-IRDB_/M/Magnum/Unknown_5520VT/1_-1.ir
index 9233ded3..de3a02d1 100644
--- a/_CSV-IRDB_/M/Magnum/Unknown_5520VT/1_-1.ir
+++ b/_CSV-IRDB_/M/Magnum/Unknown_5520VT/1_-1.ir
@@ -7,67 +7,67 @@ protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,31 +133,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 26 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 29 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 35 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 37 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/M/Majestic/Unknown_DVX377USB/0_-1.ir b/_CSV-IRDB_/M/Majestic/Unknown_DVX377USB/0_-1.ir
index 4a6503d7..17df22b4 100644
--- a/_CSV-IRDB_/M/Majestic/Unknown_DVX377USB/0_-1.ir
+++ b/_CSV-IRDB_/M/Majestic/Unknown_DVX377USB/0_-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,67 +55,67 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,37 +211,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -271,13 +271,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -301,13 +301,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Manhattan/Unknown_DVD/29_-1.ir b/_CSV-IRDB_/M/Manhattan/Unknown_DVD/29_-1.ir
index 8024f788..f19f4fe7 100644
--- a/_CSV-IRDB_/M/Manhattan/Unknown_DVD/29_-1.ir
+++ b/_CSV-IRDB_/M/Manhattan/Unknown_DVD/29_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 00 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 03 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 06 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 09 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 11 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 1D 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 20 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 1D 00 00 00
 command: 23 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 29 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 1D 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 1D 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
@@ -193,31 +193,31 @@ protocol: NECext
 address: 1D 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 34 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 36 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 37 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1D 00 00 00
diff --git a/_CSV-IRDB_/M/Manta/Unknown_DVD-002/0_-1.ir b/_CSV-IRDB_/M/Manta/Unknown_DVD-002/0_-1.ir
index da1cb32c..a00fbdb9 100644
--- a/_CSV-IRDB_/M/Manta/Unknown_DVD-002/0_-1.ir
+++ b/_CSV-IRDB_/M/Manta/Unknown_DVD-002/0_-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,43 +31,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,43 +127,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,37 +181,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,55 +223,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Manta/Unknown_DVD-007/0_-1.ir b/_CSV-IRDB_/M/Manta/Unknown_DVD-007/0_-1.ir
index ae38c8ee..02c6eaeb 100644
--- a/_CSV-IRDB_/M/Manta/Unknown_DVD-007/0_-1.ir
+++ b/_CSV-IRDB_/M/Manta/Unknown_DVD-007/0_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,43 +19,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,61 +79,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,61 +163,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,31 +229,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Amplifier/16_-1.ir b/_CSV-IRDB_/M/Marantz/Amplifier/16_-1.ir
index 93f322ea..cd559724 100644
--- a/_CSV-IRDB_/M/Marantz/Amplifier/16_-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Amplifier/16_-1.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/CD_Player/20_-1.ir b/_CSV-IRDB_/M/Marantz/CD_Player/20_-1.ir
index 9c5e77b2..dba92b41 100644
--- a/_CSV-IRDB_/M/Marantz/CD_Player/20_-1.ir
+++ b/_CSV-IRDB_/M/Marantz/CD_Player/20_-1.ir
@@ -175,7 +175,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/D-VHS/67,-1.ir b/_CSV-IRDB_/M/Marantz/D-VHS/67,-1.ir
index 362ae153..44bcde05 100644
--- a/_CSV-IRDB_/M/Marantz/D-VHS/67,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/D-VHS/67,-1.ir
@@ -91,7 +91,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 1A 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 43 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/MP3_Player/16,-1.ir b/_CSV-IRDB_/M/Marantz/MP3_Player/16,-1.ir
index ad97aeb8..177b34da 100644
--- a/_CSV-IRDB_/M/Marantz/MP3_Player/16,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/MP3_Player/16,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Plasma/24,-1.ir b/_CSV-IRDB_/M/Marantz/Plasma/24,-1.ir
index ead20e82..f842ae96 100644
--- a/_CSV-IRDB_/M/Marantz/Plasma/24,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Plasma/24,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 08 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Plasma/80,-1.ir b/_CSV-IRDB_/M/Marantz/Plasma/80,-1.ir
index 10d6b214..e2d6924e 100644
--- a/_CSV-IRDB_/M/Marantz/Plasma/80,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Plasma/80,-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Plasma_Displays/24,-1.ir b/_CSV-IRDB_/M/Marantz/Plasma_Displays/24,-1.ir
index a8fc33ad..61be525e 100644
--- a/_CSV-IRDB_/M/Marantz/Plasma_Displays/24,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Plasma_Displays/24,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Receiver/16,-1.ir b/_CSV-IRDB_/M/Marantz/Receiver/16,-1.ir
index 8c3d3345..4e1c4d9b 100644
--- a/_CSV-IRDB_/M/Marantz/Receiver/16,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Receiver/16,-1.ir
@@ -85,7 +85,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/TV/0,-1.ir b/_CSV-IRDB_/M/Marantz/TV/0,-1.ir
index 3f54d6ba..f9e4fc3e 100644
--- a/_CSV-IRDB_/M/Marantz/TV/0,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/TV/0,-1.ir
@@ -31,13 +31,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/TV/24,-1.ir b/_CSV-IRDB_/M/Marantz/TV/24,-1.ir
index a68246af..655fe2ff 100644
--- a/_CSV-IRDB_/M/Marantz/TV/24,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/TV/24,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/TV/80,-1.ir b/_CSV-IRDB_/M/Marantz/TV/80,-1.ir
index 10d6b214..e2d6924e 100644
--- a/_CSV-IRDB_/M/Marantz/TV/80,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/TV/80,-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Unknown_Marantz-RC-63CD/20,-1.ir b/_CSV-IRDB_/M/Marantz/Unknown_Marantz-RC-63CD/20,-1.ir
index 0f21632f..92f967f8 100644
--- a/_CSV-IRDB_/M/Marantz/Unknown_Marantz-RC-63CD/20,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Unknown_Marantz-RC-63CD/20,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 47 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Unknown_RC-1400/4,-1.ir b/_CSV-IRDB_/M/Marantz/Unknown_RC-1400/4,-1.ir
index f6305df0..a1fbcfed 100644
--- a/_CSV-IRDB_/M/Marantz/Unknown_RC-1400/4,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Unknown_RC-1400/4,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -91,43 +91,43 @@ protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 22 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,85 +151,85 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_3-D
+name: 3-D
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 78 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 82 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 04 00 00 00
 command: C8 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 04 00 00 00
 command: D7 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Unknown_RC-65CD/20,-1.ir b/_CSV-IRDB_/M/Marantz/Unknown_RC-65CD/20,-1.ir
index f2939ac1..f14cb0c2 100644
--- a/_CSV-IRDB_/M/Marantz/Unknown_RC-65CD/20,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Unknown_RC-65CD/20,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Unknown_RC-72CD/20,-1.ir b/_CSV-IRDB_/M/Marantz/Unknown_RC-72CD/20,-1.ir
index a839651b..efdab905 100644
--- a/_CSV-IRDB_/M/Marantz/Unknown_RC-72CD/20,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Unknown_RC-72CD/20,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -19,55 +19,55 @@ protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -103,19 +103,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -151,37 +151,37 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Unknown_RC4000CD/20,-1.ir b/_CSV-IRDB_/M/Marantz/Unknown_RC4000CD/20,-1.ir
index 132fc802..cf8c00c8 100644
--- a/_CSV-IRDB_/M/Marantz/Unknown_RC4000CD/20,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Unknown_RC4000CD/20,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Unknown_RC4300CC/20,-1.ir b/_CSV-IRDB_/M/Marantz/Unknown_RC4300CC/20,-1.ir
index 86c385a7..383a6e7e 100644
--- a/_CSV-IRDB_/M/Marantz/Unknown_RC4300CC/20,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Unknown_RC4300CC/20,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -115,37 +115,37 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 31 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 47 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/Unknown_rc/4,-1.ir b/_CSV-IRDB_/M/Marantz/Unknown_rc/4,-1.ir
index 26e7e0e0..3bfa1da1 100644
--- a/_CSV-IRDB_/M/Marantz/Unknown_rc/4,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/Unknown_rc/4,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 71 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 82 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 04 00 00 00
 command: F0 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: F1 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/M/Marantz/iPod_Dock/16,-1.ir b/_CSV-IRDB_/M/Marantz/iPod_Dock/16,-1.ir
index 5e5e06c0..d39dd219 100644
--- a/_CSV-IRDB_/M/Marantz/iPod_Dock/16,-1.ir
+++ b/_CSV-IRDB_/M/Marantz/iPod_Dock/16,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/M/Mark/Unknown_rc5/0,-1.ir b/_CSV-IRDB_/M/Mark/Unknown_rc5/0,-1.ir
index eab28e50..b3a7b382 100644
--- a/_CSV-IRDB_/M/Mark/Unknown_rc5/0,-1.ir
+++ b/_CSV-IRDB_/M/Mark/Unknown_rc5/0,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Mark_Levinson/CD_Player/3,-1.ir b/_CSV-IRDB_/M/Mark_Levinson/CD_Player/3,-1.ir
index c5fc00e8..80e9594f 100644
--- a/_CSV-IRDB_/M/Mark_Levinson/CD_Player/3,-1.ir
+++ b/_CSV-IRDB_/M/Mark_Levinson/CD_Player/3,-1.ir
@@ -145,13 +145,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 2B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/M/Mark_Levinson/Pre-Amplifier/7,-1.ir b/_CSV-IRDB_/M/Mark_Levinson/Pre-Amplifier/7,-1.ir
index 5c9d4d5e..82f5e617 100644
--- a/_CSV-IRDB_/M/Mark_Levinson/Pre-Amplifier/7,-1.ir
+++ b/_CSV-IRDB_/M/Mark_Levinson/Pre-Amplifier/7,-1.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 1D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/M/Mas/Unknown_HSD-303/0,-1.ir b/_CSV-IRDB_/M/Mas/Unknown_HSD-303/0,-1.ir
index bc709af0..43cc7c6b 100644
--- a/_CSV-IRDB_/M/Mas/Unknown_HSD-303/0,-1.ir
+++ b/_CSV-IRDB_/M/Mas/Unknown_HSD-303/0,-1.ir
@@ -13,55 +13,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,55 +85,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,85 +163,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -253,19 +253,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Mas/Unknown_HSD-400/0,-1.ir b/_CSV-IRDB_/M/Mas/Unknown_HSD-400/0,-1.ir
index 99404b7e..a5e17891 100644
--- a/_CSV-IRDB_/M/Mas/Unknown_HSD-400/0,-1.ir
+++ b/_CSV-IRDB_/M/Mas/Unknown_HSD-400/0,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,73 +169,73 @@ protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -247,19 +247,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -271,19 +271,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -295,19 +295,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Mas/Unknown_RC-0135/6,-1.ir b/_CSV-IRDB_/M/Mas/Unknown_RC-0135/6,-1.ir
index 82c926ff..9b04b729 100644
--- a/_CSV-IRDB_/M/Mas/Unknown_RC-0135/6,-1.ir
+++ b/_CSV-IRDB_/M/Mas/Unknown_RC-0135/6,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 00 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 06 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 03 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 04 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -43,43 +43,43 @@ protocol: NECext
 address: 06 00 00 00
 command: 07 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 08 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_2ch/multich
+name: 2ch/multich
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 06 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 06 00 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 06 00 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 06 00 00 00
 command: 17 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -169,49 +169,49 @@ protocol: NECext
 address: 06 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 42 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 46 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -223,37 +223,37 @@ protocol: NECext
 address: 06 00 00 00
 command: 48 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 49 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 06 00 00 00
diff --git a/_CSV-IRDB_/M/Maxx/Plasma/96,-1.ir b/_CSV-IRDB_/M/Maxx/Plasma/96,-1.ir
index 21eaba60..651dc1c4 100644
--- a/_CSV-IRDB_/M/Maxx/Plasma/96,-1.ir
+++ b/_CSV-IRDB_/M/Maxx/Plasma/96,-1.ir
@@ -121,7 +121,7 @@ protocol: NECext
 address: 60 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 60 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 60 00 00 00
 command: 48 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 60 00 00 00
diff --git a/_CSV-IRDB_/M/McIntosh/Pre-Amplifier/202,85.ir b/_CSV-IRDB_/M/McIntosh/Pre-Amplifier/202,85.ir
index b176f4eb..f0f39365 100644
--- a/_CSV-IRDB_/M/McIntosh/Pre-Amplifier/202,85.ir
+++ b/_CSV-IRDB_/M/McIntosh/Pre-Amplifier/202,85.ir
@@ -181,13 +181,13 @@ protocol: NECext
 address: CA 55 00 00
 command: 41 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: CA 55 00 00
 command: 42 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: CA 55 00 00
diff --git a/_CSV-IRDB_/M/Medion/Unknown_JX-2006B/0,-1.ir b/_CSV-IRDB_/M/Medion/Unknown_JX-2006B/0,-1.ir
index 5030426b..e04839e2 100644
--- a/_CSV-IRDB_/M/Medion/Unknown_JX-2006B/0,-1.ir
+++ b/_CSV-IRDB_/M/Medion/Unknown_JX-2006B/0,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Medion/Unknown_MD-5410/5,-1.ir b/_CSV-IRDB_/M/Medion/Unknown_MD-5410/5,-1.ir
index 25f1bf82..3e21c560 100644
--- a/_CSV-IRDB_/M/Medion/Unknown_MD-5410/5,-1.ir
+++ b/_CSV-IRDB_/M/Medion/Unknown_MD-5410/5,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -67,133 +67,133 @@ protocol: NECext
 address: 05 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_CAMERA
+name: CAMERA
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/M/Medion/Unknown_MD81035/23,105.ir b/_CSV-IRDB_/M/Medion/Unknown_MD81035/23,105.ir
index 4180fd41..e621d27c 100644
--- a/_CSV-IRDB_/M/Medion/Unknown_MD81035/23,105.ir
+++ b/_CSV-IRDB_/M/Medion/Unknown_MD81035/23,105.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 17 69 00 00
 command: 00 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -37,127 +37,127 @@ protocol: NECext
 address: 17 69 00 00
 command: 06 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 11 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 13 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 17 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -175,49 +175,49 @@ protocol: NECext
 address: 17 69 00 00
 command: 40 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 42 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 49 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 4C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -229,37 +229,37 @@ protocol: NECext
 address: 17 69 00 00
 command: 4F 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 50 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 51 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 52 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 53 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 54 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -271,25 +271,25 @@ protocol: NECext
 address: 17 69 00 00
 command: 58 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 59 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 5A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 5C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 17 69 00 00
diff --git a/_CSV-IRDB_/M/Medion/Unknown_MD81880/23,105.ir b/_CSV-IRDB_/M/Medion/Unknown_MD81880/23,105.ir
index c049e662..cd5a4bcd 100644
--- a/_CSV-IRDB_/M/Medion/Unknown_MD81880/23,105.ir
+++ b/_CSV-IRDB_/M/Medion/Unknown_MD81880/23,105.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -19,67 +19,67 @@ protocol: NECext
 address: 17 69 00 00
 command: 04 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 11 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -91,49 +91,49 @@ protocol: NECext
 address: 17 69 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 17 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -145,37 +145,37 @@ protocol: NECext
 address: 17 69 00 00
 command: 1F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 42 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -187,49 +187,49 @@ protocol: NECext
 address: 17 69 00 00
 command: 4C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 4D 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 50 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 51 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 52 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 53 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 54 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 55 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 17 69 00 00
 command: 5A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 17 69 00 00
diff --git a/_CSV-IRDB_/M/Medion/Unknown_medion/128,123.ir b/_CSV-IRDB_/M/Medion/Unknown_medion/128,123.ir
index af97015b..e54c23e5 100644
--- a/_CSV-IRDB_/M/Medion/Unknown_medion/128,123.ir
+++ b/_CSV-IRDB_/M/Medion/Unknown_medion/128,123.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 80 7B 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 17 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 80 7B 00 00
 command: 1E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 45 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 47 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 4C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
diff --git a/_CSV-IRDB_/M/Medion/Unknown_rc2000/5,-1.ir b/_CSV-IRDB_/M/Medion/Unknown_rc2000/5,-1.ir
index ee624829..7bf27594 100644
--- a/_CSV-IRDB_/M/Medion/Unknown_rc2000/5,-1.ir
+++ b/_CSV-IRDB_/M/Medion/Unknown_rc2000/5,-1.ir
@@ -1,187 +1,187 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Melectronic/Unknown_PP3600/2,-1.ir b/_CSV-IRDB_/M/Melectronic/Unknown_PP3600/2,-1.ir
index 81783fb7..dad1609b 100644
--- a/_CSV-IRDB_/M/Melectronic/Unknown_PP3600/2,-1.ir
+++ b/_CSV-IRDB_/M/Melectronic/Unknown_PP3600/2,-1.ir
@@ -37,7 +37,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 0D 00 00 00
 #
-name: on
+POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/M/Meliconi/Unknown_Facile/0,-1.ir b/_CSV-IRDB_/M/Meliconi/Unknown_Facile/0,-1.ir
index 941cce5e..325ac1d0 100644
--- a/_CSV-IRDB_/M/Meliconi/Unknown_Facile/0,-1.ir
+++ b/_CSV-IRDB_/M/Meliconi/Unknown_Facile/0,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1-/--
+name: 1-/--
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,31 +127,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Meliconi/Unknown_MELICONI-U3/10,-1.ir b/_CSV-IRDB_/M/Meliconi/Unknown_MELICONI-U3/10,-1.ir
index 61100b34..49bf5d6d 100644
--- a/_CSV-IRDB_/M/Meliconi/Unknown_MELICONI-U3/10,-1.ir
+++ b/_CSV-IRDB_/M/Meliconi/Unknown_MELICONI-U3/10,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_1-/--
+name: 1-/--
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 61 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/M/Meliconi/Unknown_MeliconiSpeedy2/5,-1.ir b/_CSV-IRDB_/M/Meliconi/Unknown_MeliconiSpeedy2/5,-1.ir
index c430d9e1..323e9658 100644
--- a/_CSV-IRDB_/M/Meliconi/Unknown_MeliconiSpeedy2/5,-1.ir
+++ b/_CSV-IRDB_/M/Meliconi/Unknown_MeliconiSpeedy2/5,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/M/Meliconi/Unknown_Speedy/7,7.ir b/_CSV-IRDB_/M/Meliconi/Unknown_Speedy/7,7.ir
index 61274be5..828ef274 100644
--- a/_CSV-IRDB_/M/Meliconi/Unknown_Speedy/7,7.ir
+++ b/_CSV-IRDB_/M/Meliconi/Unknown_Speedy/7,7.ir
@@ -7,37 +7,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/M/Memorex/TV/4,-1.ir b/_CSV-IRDB_/M/Memorex/TV/4,-1.ir
index 28d61360..15b936ca 100644
--- a/_CSV-IRDB_/M/Memorex/TV/4,-1.ir
+++ b/_CSV-IRDB_/M/Memorex/TV/4,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/M/Meridian/800_System_Remote/19,-1.ir b/_CSV-IRDB_/M/Meridian/800_System_Remote/19,-1.ir
index 77d48059..d274528a 100644
--- a/_CSV-IRDB_/M/Meridian/800_System_Remote/19,-1.ir
+++ b/_CSV-IRDB_/M/Meridian/800_System_Remote/19,-1.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 13 00 00 00
diff --git a/_CSV-IRDB_/M/Meridian/CD_Player/19,-1.ir b/_CSV-IRDB_/M/Meridian/CD_Player/19,-1.ir
index 6d568650..67fb9f42 100644
--- a/_CSV-IRDB_/M/Meridian/CD_Player/19,-1.ir
+++ b/_CSV-IRDB_/M/Meridian/CD_Player/19,-1.ir
@@ -103,7 +103,7 @@ protocol: NECext
 address: 13 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 13 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 13 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 13 00 00 00
diff --git a/_CSV-IRDB_/M/Meridian/Pre-Amplifier/19,-1.ir b/_CSV-IRDB_/M/Meridian/Pre-Amplifier/19,-1.ir
index 5552431c..e1e9a51c 100644
--- a/_CSV-IRDB_/M/Meridian/Pre-Amplifier/19,-1.ir
+++ b/_CSV-IRDB_/M/Meridian/Pre-Amplifier/19,-1.ir
@@ -73,13 +73,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 13 00 00 00
diff --git a/_CSV-IRDB_/M/Meridian/Remote_Control/19,-1.ir b/_CSV-IRDB_/M/Meridian/Remote_Control/19,-1.ir
index 5fe5061d..1f9c44b4 100644
--- a/_CSV-IRDB_/M/Meridian/Remote_Control/19,-1.ir
+++ b/_CSV-IRDB_/M/Meridian/Remote_Control/19,-1.ir
@@ -295,13 +295,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+_B
+name: VOL+_B
 type: parsed
 protocol: NECext
 address: 13 00 00 00
@@ -319,13 +319,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-_B
+name: VOL-_B
 type: parsed
 protocol: NECext
 address: 13 00 00 00
diff --git a/_CSV-IRDB_/M/Meridian/Surround_Processor/19,-1.ir b/_CSV-IRDB_/M/Meridian/Surround_Processor/19,-1.ir
index 7651728d..1cd5af05 100644
--- a/_CSV-IRDB_/M/Meridian/Surround_Processor/19,-1.ir
+++ b/_CSV-IRDB_/M/Meridian/Surround_Processor/19,-1.ir
@@ -85,7 +85,7 @@ protocol: NECext
 address: 13 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 13 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 13 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 13 00 00 00
diff --git a/_CSV-IRDB_/M/Metronome/CD_Player/20,-1.ir b/_CSV-IRDB_/M/Metronome/CD_Player/20,-1.ir
index f44cf85c..d8570fe2 100644
--- a/_CSV-IRDB_/M/Metronome/CD_Player/20,-1.ir
+++ b/_CSV-IRDB_/M/Metronome/CD_Player/20,-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/M/Microsoft/Game_Console/116,15.ir b/_CSV-IRDB_/M/Microsoft/Game_Console/116,15.ir
index 78f2887f..64e258fc 100644
--- a/_CSV-IRDB_/M/Microsoft/Game_Console/116,15.ir
+++ b/_CSV-IRDB_/M/Microsoft/Game_Console/116,15.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 74 0F 00 00
 command: 0C 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 74 0F 00 00
 command: 12 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
diff --git a/_CSV-IRDB_/M/Microsoft/Home_Media_PC/4,15.ir b/_CSV-IRDB_/M/Microsoft/Home_Media_PC/4,15.ir
index 59f21bd3..3575e035 100644
--- a/_CSV-IRDB_/M/Microsoft/Home_Media_PC/4,15.ir
+++ b/_CSV-IRDB_/M/Microsoft/Home_Media_PC/4,15.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/M/Microsoft/Unknown_MCE/5,-1.ir b/_CSV-IRDB_/M/Microsoft/Unknown_MCE/5,-1.ir
index e4aa6712..2ea287f8 100644
--- a/_CSV-IRDB_/M/Microsoft/Unknown_MCE/5,-1.ir
+++ b/_CSV-IRDB_/M/Microsoft/Unknown_MCE/5,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,91 +79,91 @@ protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 39 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -175,97 +175,97 @@ protocol: NECext
 address: 05 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 57 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 59 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: CE 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: D6 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: D7 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: DA 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: E7 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: F4 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: F4 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: F6 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: F8 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/M/Microsoft/Unknown_Xbox360/116,15.ir b/_CSV-IRDB_/M/Microsoft/Unknown_Xbox360/116,15.ir
index 5790df47..6a8a8fef 100644
--- a/_CSV-IRDB_/M/Microsoft/Unknown_Xbox360/116,15.ir
+++ b/_CSV-IRDB_/M/Microsoft/Unknown_Xbox360/116,15.ir
@@ -1,175 +1,175 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 74 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
@@ -211,37 +211,37 @@ protocol: NECext
 address: 74 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_Y
+name: Y
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 74 0F 00 00
 command: 4F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
@@ -265,13 +265,13 @@ protocol: NECext
 address: 74 0F 00 00
 command: 64 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
 command: 66 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 74 0F 00 00
diff --git a/_CSV-IRDB_/M/Microsoft/Windows_Media_Center/4,15.ir b/_CSV-IRDB_/M/Microsoft/Windows_Media_Center/4,15.ir
index 9f198bbc..1f461522 100644
--- a/_CSV-IRDB_/M/Microsoft/Windows_Media_Center/4,15.ir
+++ b/_CSV-IRDB_/M/Microsoft/Windows_Media_Center/4,15.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/M/Mitochiba/Unknown_JX-9902/134,107.ir b/_CSV-IRDB_/M/Mitochiba/Unknown_JX-9902/134,107.ir
index dd9edc85..4da7b899 100644
--- a/_CSV-IRDB_/M/Mitochiba/Unknown_JX-9902/134,107.ir
+++ b/_CSV-IRDB_/M/Mitochiba/Unknown_JX-9902/134,107.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -25,73 +25,73 @@ protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -103,61 +103,61 @@ protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 49 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 4B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 50 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 52 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 53 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 57 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/M/Mitochiba/Unknown_KF220100/134,107.ir b/_CSV-IRDB_/M/Mitochiba/Unknown_KF220100/134,107.ir
index 6cf2a047..20d2bd98 100644
--- a/_CSV-IRDB_/M/Mitochiba/Unknown_KF220100/134,107.ir
+++ b/_CSV-IRDB_/M/Mitochiba/Unknown_KF220100/134,107.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -31,109 +31,109 @@ protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 49 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 50 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 52 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -271,19 +271,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 56 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 57 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 59 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/Cable_Box/0,-1.ir b/_CSV-IRDB_/M/Mitsubishi/Cable_Box/0,-1.ir
index ed33da33..0e75cac2 100644
--- a/_CSV-IRDB_/M/Mitsubishi/Cable_Box/0,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/Cable_Box/0,-1.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/DSS/64,-1.ir b/_CSV-IRDB_/M/Mitsubishi/DSS/64,-1.ir
index 089fb817..0c383b77 100644
--- a/_CSV-IRDB_/M/Mitsubishi/DSS/64,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/DSS/64,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/TV/1,-1.ir b/_CSV-IRDB_/M/Mitsubishi/TV/1,-1.ir
index f8361b23..c86b0900 100644
--- a/_CSV-IRDB_/M/Mitsubishi/TV/1,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/TV/1,-1.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/TV/71,-1.ir b/_CSV-IRDB_/M/Mitsubishi/TV/71,-1.ir
index 7dbd03c1..8b49173b 100644
--- a/_CSV-IRDB_/M/Mitsubishi/TV/71,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/TV/71,-1.ir
@@ -367,7 +367,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -409,7 +409,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 28 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -655,7 +655,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 41 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 47 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/Unknown_75501/87,-1.ir b/_CSV-IRDB_/M/Mitsubishi/Unknown_75501/87,-1.ir
index 9a652b7e..e3bb7051 100644
--- a/_CSV-IRDB_/M/Mitsubishi/Unknown_75501/87,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/Unknown_75501/87,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 00 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 01 00 00 00
 #
-name: vcr_power
+name: vcr_POWER
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 02 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -31,31 +31,31 @@ protocol: NECext
 address: 57 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -67,19 +67,19 @@ protocol: NECext
 address: 57 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 12 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 57 00 00 00
 command: 16 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 20 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 57 00 00 00
 command: 27 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 57 00 00 00
 command: 33 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 35 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 36 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 57 00 00 00
 command: 49 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 57 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/Unknown_HD1000/240,-1.ir b/_CSV-IRDB_/M/Mitsubishi/Unknown_HD1000/240,-1.ir
index 131f8786..970f5f48 100644
--- a/_CSV-IRDB_/M/Mitsubishi/Unknown_HD1000/240,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/Unknown_HD1000/240,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: PowerOn
+name: POWEROn
 type: parsed
 protocol: NECext
 address: F0 00 00 00
 command: 41 00 00 00
 #
-name: PowerOff
+name: POWEROff
 type: parsed
 protocol: NECext
 address: F0 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/Unknown_HS-349/87,-1.ir b/_CSV-IRDB_/M/Mitsubishi/Unknown_HS-349/87,-1.ir
index cbe92d82..270a55b8 100644
--- a/_CSV-IRDB_/M/Mitsubishi/Unknown_HS-349/87,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/Unknown_HS-349/87,-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 02 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 57 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 57 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 57 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 57 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 57 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 57 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 57 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 57 00 00 00
 command: 33 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 57 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/Unknown_mitsubishi/71,-1.ir b/_CSV-IRDB_/M/Mitsubishi/Unknown_mitsubishi/71,-1.ir
index 1f9fc4c4..be1cabb4 100644
--- a/_CSV-IRDB_/M/Mitsubishi/Unknown_mitsubishi/71,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/Unknown_mitsubishi/71,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 00 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 47 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -61,61 +61,61 @@ protocol: NECext
 address: 47 00 00 00
 command: 17 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 22 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 28 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 30 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 32 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 35 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 38 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 49 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 47 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/Unknown_tv/71,-1.ir b/_CSV-IRDB_/M/Mitsubishi/Unknown_tv/71,-1.ir
index 53afdbc9..76d633d9 100644
--- a/_CSV-IRDB_/M/Mitsubishi/Unknown_tv/71,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/Unknown_tv/71,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 00 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -25,25 +25,25 @@ protocol: NECext
 address: 47 00 00 00
 command: 03 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 06 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -61,25 +61,25 @@ protocol: NECext
 address: 47 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 47 00 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 18 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 47 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 22 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 47 00 00 00
 command: 26 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 27 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 28 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -187,25 +187,25 @@ protocol: NECext
 address: 47 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 30 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 32 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 47 00 00 00
 command: 36 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 47 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -301,13 +301,13 @@ protocol: NECext
 address: 47 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -325,13 +325,13 @@ protocol: NECext
 address: 47 00 00 00
 command: 67 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -361,7 +361,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 77 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 47 00 00 00
diff --git a/_CSV-IRDB_/M/Mitsubishi/VCR/71,-1.ir b/_CSV-IRDB_/M/Mitsubishi/VCR/71,-1.ir
index 6b06362b..e448ddbd 100644
--- a/_CSV-IRDB_/M/Mitsubishi/VCR/71,-1.ir
+++ b/_CSV-IRDB_/M/Mitsubishi/VCR/71,-1.ir
@@ -157,7 +157,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 22 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 47 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 47 00 00 00
 command: 2A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
diff --git a/_CSV-IRDB_/M/Monoprice/Unknown_HDX(C)-501E/0,-1.ir b/_CSV-IRDB_/M/Monoprice/Unknown_HDX(C)-501E/0,-1.ir
index 6e364fb8..1185e066 100644
--- a/_CSV-IRDB_/M/Monoprice/Unknown_HDX(C)-501E/0,-1.ir
+++ b/_CSV-IRDB_/M/Monoprice/Unknown_HDX(C)-501E/0,-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Morgans_Daytona/Unknown_T15/128,38.ir b/_CSV-IRDB_/M/Morgans_Daytona/Unknown_T15/128,38.ir
index 749b123e..907703b2 100644
--- a/_CSV-IRDB_/M/Morgans_Daytona/Unknown_T15/128,38.ir
+++ b/_CSV-IRDB_/M/Morgans_Daytona/Unknown_T15/128,38.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 01 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 02 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 80 26 00 00
 command: 0B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -55,43 +55,43 @@ protocol: NECext
 address: 80 26 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 14 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 16 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -103,31 +103,31 @@ protocol: NECext
 address: 80 26 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 19 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 26 00 00
diff --git a/_CSV-IRDB_/M/Morgans_Daytona/Unknown_Tornado/202,165.ir b/_CSV-IRDB_/M/Morgans_Daytona/Unknown_Tornado/202,165.ir
index 93fa288d..ed794964 100644
--- a/_CSV-IRDB_/M/Morgans_Daytona/Unknown_Tornado/202,165.ir
+++ b/_CSV-IRDB_/M/Morgans_Daytona/Unknown_Tornado/202,165.ir
@@ -7,61 +7,61 @@ protocol: NECext
 address: CA A5 00 00
 command: 04 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 05 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 06 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 0E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: CA A5 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: CA A5 00 00
 command: 1B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 1C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 1D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: CA A5 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: CA A5 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Cable_Box/0,-1.ir b/_CSV-IRDB_/M/Motorola/Cable_Box/0,-1.ir
index fc3212e7..d67f770f 100644
--- a/_CSV-IRDB_/M/Motorola/Cable_Box/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Cable_Box/0,-1.ir
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: CHAN_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: CHAN_DOWN
+name: CH-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -289,13 +289,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -319,7 +319,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -361,7 +361,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Cable_Box/1,-1.ir b/_CSV-IRDB_/M/Motorola/Cable_Box/1,-1.ir
index 03e1cd56..7fb08efa 100644
--- a/_CSV-IRDB_/M/Motorola/Cable_Box/1,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Cable_Box/1,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Cable_Box/15,-1.ir b/_CSV-IRDB_/M/Motorola/Cable_Box/15,-1.ir
index fcaa3b85..5711a0cb 100644
--- a/_CSV-IRDB_/M/Motorola/Cable_Box/15,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Cable_Box/15,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Cable_Box/170,-1.ir b/_CSV-IRDB_/M/Motorola/Cable_Box/170,-1.ir
index a77b7585..8fd2b860 100644
--- a/_CSV-IRDB_/M/Motorola/Cable_Box/170,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Cable_Box/170,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: AA 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Cable_Box/4,-1.ir b/_CSV-IRDB_/M/Motorola/Cable_Box/4,-1.ir
index 395aecbb..a3ed13e1 100644
--- a/_CSV-IRDB_/M/Motorola/Cable_Box/4,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Cable_Box/4,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Cable_Box/5,1.ir b/_CSV-IRDB_/M/Motorola/Cable_Box/5,1.ir
index a6693058..7aa4f6d9 100644
--- a/_CSV-IRDB_/M/Motorola/Cable_Box/5,1.ir
+++ b/_CSV-IRDB_/M/Motorola/Cable_Box/5,1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 01 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 01 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Cable_Box/64,-1.ir b/_CSV-IRDB_/M/Motorola/Cable_Box/64,-1.ir
index 9feb3acf..cd963e06 100644
--- a/_CSV-IRDB_/M/Motorola/Cable_Box/64,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Cable_Box/64,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Cox/64,-1.ir b/_CSV-IRDB_/M/Motorola/Cox/64,-1.ir
index 089fb817..0c383b77 100644
--- a/_CSV-IRDB_/M/Motorola/Cox/64,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Cox/64,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/IP_box/16,0.ir b/_CSV-IRDB_/M/Motorola/IP_box/16,0.ir
index ab744420..db90d293 100644
--- a/_CSV-IRDB_/M/Motorola/IP_box/16,0.ir
+++ b/_CSV-IRDB_/M/Motorola/IP_box/16,0.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 3C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 4C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_4dtv/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_4dtv/0,-1.ir
index 95da44c4..ee5d4ac8 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_4dtv/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_4dtv/0,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -109,37 +109,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,25 +157,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_Cable/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_Cable/0,-1.ir
index fb7bf348..ab856e1d 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_Cable/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_Cable/0,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,37 +79,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,55 +139,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_DCH3416/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_DCH3416/0,-1.ir
index a515c920..bc580b12 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_DCH3416/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_DCH3416/0,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,115 +85,115 @@ protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_DCT2000/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_DCT2000/0,-1.ir
index 55d74a46..908f53c3 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_DCT2000/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_DCT2000/0,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,61 +139,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,25 +223,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_DCT2244/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_DCT2244/0,-1.ir
index f699c4ab..19910fc4 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_DCT2244/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_DCT2244/0,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_DCT2524/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_DCT2524/0,-1.ir
index 4e63bfcf..ff03cf28 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_DCT2524/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_DCT2524/0,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,49 +175,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,19 +235,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_DRC800/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_DRC800/0,-1.ir
index ae225f82..b0b0ce41 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_DRC800/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_DRC800/0,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,61 +211,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -283,31 +283,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_DTH320-4/134,47.ir b/_CSV-IRDB_/M/Motorola/Unknown_DTH320-4/134,47.ir
index d55ada35..a221a478 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_DTH320-4/134,47.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_DTH320-4/134,47.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 02 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 07 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 12 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 14 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 16 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 17 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 1B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 1E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 1F 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 82 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 88 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 86 2F 00 00
 command: 8F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 86 2F 00 00
 command: 93 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 9C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_DTH355/134,47.ir b/_CSV-IRDB_/M/Motorola/Unknown_DTH355/134,47.ir
index d55ada35..a221a478 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_DTH355/134,47.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_DTH355/134,47.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 02 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 07 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 12 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 14 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 16 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 17 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 1B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 1E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 1F 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 82 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 88 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 86 2F 00 00
 command: 8F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 86 2F 00 00
 command: 93 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
 command: 9C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 2F 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_DVi2030/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_DVi2030/0,-1.ir
index 9cf29049..ef4ac3df 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_DVi2030/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_DVi2030/0,-1.ir
@@ -1,169 +1,169 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 70 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 00 00 00 00
 command: D8 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_MOTOROLA/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_MOTOROLA/0,-1.ir
index 889e4994..376ba760 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_MOTOROLA/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_MOTOROLA/0,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,97 +139,97 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_QIP2500/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_QIP2500/0,-1.ir
index 9b281894..d190dfd3 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_QIP2500/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_QIP2500/0,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -301,13 +301,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_RC1445302-00B-REV2/0,-1.ir b/_CSV-IRDB_/M/Motorola/Unknown_RC1445302-00B-REV2/0,-1.ir
index 15b84a27..c04cce3c 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_RC1445302-00B-REV2/0,-1.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_RC1445302-00B-REV2/0,-1.ir
@@ -1,181 +1,181 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1_symbols
+name: 1_symbols
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2_abc
+name: 2_abc
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3_def
+name: 3_def
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4_ghi
+name: 4_ghi
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5_jkl
+name: 5_jkl
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6_mno
+name: 6_mno
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7_pqrs
+name: 7_pqrs
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8_tuv
+name: 8_tuv
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9_wxyz
+name: 9_wxyz
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -319,7 +319,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -331,7 +331,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -397,13 +397,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -421,7 +421,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_KPASTERISK
+name: KPASTERISK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/M/Motorola/Unknown_VIP/35,64.ir b/_CSV-IRDB_/M/Motorola/Unknown_VIP/35,64.ir
index 8b768b50..54ef852a 100644
--- a/_CSV-IRDB_/M/Motorola/Unknown_VIP/35,64.ir
+++ b/_CSV-IRDB_/M/Motorola/Unknown_VIP/35,64.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 09 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 23 40 00 00
@@ -91,127 +91,127 @@ protocol: NECext
 address: 23 40 00 00
 command: 21 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 37 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 38 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 39 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 44 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 4C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 4D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 54 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 55 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 5C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 83 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: 86 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 23 40 00 00
@@ -223,19 +223,19 @@ protocol: NECext
 address: 23 40 00 00
 command: A8 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: CC 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 23 40 00 00
 command: E1 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 23 40 00 00
diff --git a/_CSV-IRDB_/M/Multi_Canal/Unknown_Canal/133,123.ir b/_CSV-IRDB_/M/Multi_Canal/Unknown_Canal/133,123.ir
index e10eb73c..e0b6ebfe 100644
--- a/_CSV-IRDB_/M/Multi_Canal/Unknown_Canal/133,123.ir
+++ b/_CSV-IRDB_/M/Multi_Canal/Unknown_Canal/133,123.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 84 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 85 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 86 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 87 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 88 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 89 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 8A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 8B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 8D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 8E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 8F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 91 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 92 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 93 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 95 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
 command: 96 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 85 7B 00 00
diff --git a/_CSV-IRDB_/M/Multichoice/Unknown_DSD910/24,-1.ir b/_CSV-IRDB_/M/Multichoice/Unknown_DSD910/24,-1.ir
index b1cce33c..a3c1187a 100644
--- a/_CSV-IRDB_/M/Multichoice/Unknown_DSD910/24,-1.ir
+++ b/_CSV-IRDB_/M/Multichoice/Unknown_DSD910/24,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -127,37 +127,37 @@ protocol: NECext
 address: 18 00 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 22 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 24 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 25 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -169,25 +169,25 @@ protocol: NECext
 address: 18 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 31 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/M/Mustek/Unknown_DVD/16,237.ir b/_CSV-IRDB_/M/Mustek/Unknown_DVD/16,237.ir
index 52d134d8..fa7f4324 100644
--- a/_CSV-IRDB_/M/Mustek/Unknown_DVD/16,237.ir
+++ b/_CSV-IRDB_/M/Mustek/Unknown_DVD/16,237.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 10 ED 00 00
 command: 03 00 00 00
 #
-name: Volume
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 10 ED 00 00
 command: 05 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 10 ED 00 00
 command: 07 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 0A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -79,61 +79,61 @@ protocol: NECext
 address: 10 ED 00 00
 command: 11 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 12 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 13 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 14 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 15 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1B 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 1D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 10 ED 00 00
 command: 41 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 10 ED 00 00
 command: 43 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 44 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 45 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -199,43 +199,43 @@ protocol: NECext
 address: 10 ED 00 00
 command: 47 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 49 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 4A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 50 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 51 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -247,31 +247,31 @@ protocol: NECext
 address: 10 ED 00 00
 command: 55 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 58 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 59 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -283,13 +283,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 5D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
diff --git a/_CSV-IRDB_/M/Mustek/Unknown_MustekDVD/16,237.ir b/_CSV-IRDB_/M/Mustek/Unknown_MustekDVD/16,237.ir
index 0ad60bbc..c4f5f7bb 100644
--- a/_CSV-IRDB_/M/Mustek/Unknown_MustekDVD/16,237.ir
+++ b/_CSV-IRDB_/M/Mustek/Unknown_MustekDVD/16,237.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 00 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -25,49 +25,49 @@ protocol: NECext
 address: 10 ED 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 04 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 05 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 06 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 07 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 0A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -91,37 +91,37 @@ protocol: NECext
 address: 10 ED 00 00
 command: 12 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 13 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1B 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 1D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 41 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 10 ED 00 00
 command: 43 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 44 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 45 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -193,37 +193,37 @@ protocol: NECext
 address: 10 ED 00 00
 command: 47 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 49 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 4A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 50 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -235,37 +235,37 @@ protocol: NECext
 address: 10 ED 00 00
 command: 52 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 53 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 58 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 59 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -277,13 +277,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 5D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
diff --git a/_CSV-IRDB_/M/Mustek/Unknown_RMC-V300/16,237.ir b/_CSV-IRDB_/M/Mustek/Unknown_RMC-V300/16,237.ir
index 927cf353..e73ea2c0 100644
--- a/_CSV-IRDB_/M/Mustek/Unknown_RMC-V300/16,237.ir
+++ b/_CSV-IRDB_/M/Mustek/Unknown_RMC-V300/16,237.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 00 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 01 00 00 00
 #
-name: X_KEY_1/all
+name: X_1/all
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -25,19 +25,19 @@ protocol: NECext
 address: 10 ED 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 04 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 05 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -49,25 +49,25 @@ protocol: NECext
 address: 10 ED 00 00
 command: 07 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 0A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -91,37 +91,37 @@ protocol: NECext
 address: 10 ED 00 00
 command: 12 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 13 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1B 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 1D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 41 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 10 ED 00 00
 command: 43 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 44 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 45 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -193,31 +193,31 @@ protocol: NECext
 address: 10 ED 00 00
 command: 47 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 49 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 4A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -241,31 +241,31 @@ protocol: NECext
 address: 10 ED 00 00
 command: 53 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 58 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 59 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -277,13 +277,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 5D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
diff --git a/_CSV-IRDB_/M/Mvision/Unknown_FCIS7000E+/64,64.ir b/_CSV-IRDB_/M/Mvision/Unknown_FCIS7000E+/64,64.ir
index 222a71d2..fe2e6874 100644
--- a/_CSV-IRDB_/M/Mvision/Unknown_FCIS7000E+/64,64.ir
+++ b/_CSV-IRDB_/M/Mvision/Unknown_FCIS7000E+/64,64.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -85,31 +85,31 @@ protocol: NECext
 address: 40 40 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 11 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 40 40 00 00
 command: 13 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 15 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 40 40 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 18 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -169,37 +169,37 @@ protocol: NECext
 address: 40 40 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1C 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 40 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 44 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/M/Myryad/Pre-Amplifier/16,-1.ir b/_CSV-IRDB_/M/Myryad/Pre-Amplifier/16,-1.ir
index 886fd59b..2005a850 100644
--- a/_CSV-IRDB_/M/Myryad/Pre-Amplifier/16,-1.ir
+++ b/_CSV-IRDB_/M/Myryad/Pre-Amplifier/16,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/M/Myryad/Receiver/16,-1.ir b/_CSV-IRDB_/M/Myryad/Receiver/16,-1.ir
index 886fd59b..2005a850 100644
--- a/_CSV-IRDB_/M/Myryad/Receiver/16,-1.ir
+++ b/_CSV-IRDB_/M/Myryad/Receiver/16,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/M/mStation/Unknown_mStation/64,175.ir b/_CSV-IRDB_/M/mStation/Unknown_mStation/64,175.ir
index 72e1d3fd..7c6f4491 100644
--- a/_CSV-IRDB_/M/mStation/Unknown_mStation/64,175.ir
+++ b/_CSV-IRDB_/M/mStation/Unknown_mStation/64,175.ir
@@ -7,49 +7,49 @@ protocol: NECext
 address: 40 AF 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 05 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 0F 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 40 AF 00 00
 command: 1A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
diff --git a/_CSV-IRDB_/M/media-tech/Unknown_RUMBA/128,-1.ir b/_CSV-IRDB_/M/media-tech/Unknown_RUMBA/128,-1.ir
index 495d5f6c..41e6b679 100644
--- a/_CSV-IRDB_/M/media-tech/Unknown_RUMBA/128,-1.ir
+++ b/_CSV-IRDB_/M/media-tech/Unknown_RUMBA/128,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 80 00 00 00
 command: 09 00 00 00
 #
-name: KEY_L
+name: L
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 80 00 00 00
 command: 17 00 00 00
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 80 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/M/mivar/Unknown_mivar/7,-1.ir b/_CSV-IRDB_/M/mivar/Unknown_mivar/7,-1.ir
index 40246d86..3ff8130c 100644
--- a/_CSV-IRDB_/M/mivar/Unknown_mivar/7,-1.ir
+++ b/_CSV-IRDB_/M/mivar/Unknown_mivar/7,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/M/multiTEC/Unknown_multiTEC/7,-1.ir b/_CSV-IRDB_/M/multiTEC/Unknown_multiTEC/7,-1.ir
index b8245d16..88b5100a 100644
--- a/_CSV-IRDB_/M/multiTEC/Unknown_multiTEC/7,-1.ir
+++ b/_CSV-IRDB_/M/multiTEC/Unknown_multiTEC/7,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -13,43 +13,43 @@ protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -61,37 +61,37 @@ protocol: NECext
 address: 07 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 17 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/N/NAD/Receiver/135,124.ir b/_CSV-IRDB_/N/NAD/Receiver/135,124.ir
index 4ec6c221..40cf4af6 100644
--- a/_CSV-IRDB_/N/NAD/Receiver/135,124.ir
+++ b/_CSV-IRDB_/N/NAD/Receiver/135,124.ir
@@ -187,7 +187,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 87 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 8B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/N/NAD/Tuner/135,124.ir b/_CSV-IRDB_/N/NAD/Tuner/135,124.ir
index efeb6bb9..c1c30e0a 100644
--- a/_CSV-IRDB_/N/NAD/Tuner/135,124.ir
+++ b/_CSV-IRDB_/N/NAD/Tuner/135,124.ir
@@ -97,7 +97,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 85 00 00 00
 #
-name: MASTER_VOLUME_+
+name: MASTER_VOL+
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 89 00 00 00
 #
-name: MASTER_VOLUME_-
+name: MASTER_VOL-
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/N/NAD/Unknown/135,124.ir b/_CSV-IRDB_/N/NAD/Unknown/135,124.ir
index e7c42346..320b3c5b 100644
--- a/_CSV-IRDB_/N/NAD/Unknown/135,124.ir
+++ b/_CSV-IRDB_/N/NAD/Unknown/135,124.ir
@@ -241,7 +241,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 87 00 00 00
 #
-name: MASTER_VOLUME_+
+name: MASTER_VOL+
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 89 00 00 00
 #
-name: MASTER_VOLUME_-
+name: MASTER_VOL-
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/N/NAD/Unknown_451/135,124.ir b/_CSV-IRDB_/N/NAD/Unknown_451/135,124.ir
index abb4fcee..ebe35297 100644
--- a/_CSV-IRDB_/N/NAD/Unknown_451/135,124.ir
+++ b/_CSV-IRDB_/N/NAD/Unknown_451/135,124.ir
@@ -43,7 +43,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 24 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 57 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 85 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 89 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 91 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: C2 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/N/NAD/Unknown_NAD/17,-1.ir b/_CSV-IRDB_/N/NAD/Unknown_NAD/17,-1.ir
index 06e2034f..ed9aa150 100644
--- a/_CSV-IRDB_/N/NAD/Unknown_NAD/17,-1.ir
+++ b/_CSV-IRDB_/N/NAD/Unknown_NAD/17,-1.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/N/NAD/Unknown_RC512/135,124.ir b/_CSV-IRDB_/N/NAD/Unknown_RC512/135,124.ir
index 35f0ff11..a5ed8994 100644
--- a/_CSV-IRDB_/N/NAD/Unknown_RC512/135,124.ir
+++ b/_CSV-IRDB_/N/NAD/Unknown_RC512/135,124.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 01 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 04 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 87 7C 00 00
 command: 07 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 08 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -61,61 +61,61 @@ protocol: NECext
 address: 87 7C 00 00
 command: 0B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 0C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 0D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 0F 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 10 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 11 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 12 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 13 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/N/NAD/Unknown_SR6/135,124.ir b/_CSV-IRDB_/N/NAD/Unknown_SR6/135,124.ir
index d8783fff..bba17d86 100644
--- a/_CSV-IRDB_/N/NAD/Unknown_SR6/135,124.ir
+++ b/_CSV-IRDB_/N/NAD/Unknown_SR6/135,124.ir
@@ -121,7 +121,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 16 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 35 00 00 00
 #
-name: tuner-fm-mute
+name: tuner-fm-MUTE
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 87 7C 00 00
 command: 4D 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 85 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 8B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 93 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -265,25 +265,25 @@ protocol: NECext
 address: 87 7C 00 00
 command: 98 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 9B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: C0 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: C1 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -343,7 +343,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: D4 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/N/NAD/Unknown_SR712/135,124.ir b/_CSV-IRDB_/N/NAD/Unknown_SR712/135,124.ir
index 2f7a33ac..653786c8 100644
--- a/_CSV-IRDB_/N/NAD/Unknown_SR712/135,124.ir
+++ b/_CSV-IRDB_/N/NAD/Unknown_SR712/135,124.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 57 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 87 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 89 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: 91 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/N/NEC/Monitor/25,-1.ir b/_CSV-IRDB_/N/NEC/Monitor/25,-1.ir
index 148d6868..2b96526d 100644
--- a/_CSV-IRDB_/N/NEC/Monitor/25,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Monitor/25,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 19 00 00 00
 command: 01 00 00 00
 #
-name: VCR_VOLUME_+
+name: VCR_VOL+
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 02 00 00 00
 #
-name: VCR_VOLUME_-
+name: VCR_VOL-
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Receiver/26,197.ir b/_CSV-IRDB_/N/NEC/Receiver/26,197.ir
index 10ada07d..188b09d2 100644
--- a/_CSV-IRDB_/N/NEC/Receiver/26,197.ir
+++ b/_CSV-IRDB_/N/NEC/Receiver/26,197.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A C5 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A C5 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 1A C5 00 00
 command: 09 00 00 00
 #
-name: REAR_VOLUME_+
+name: REAR_VOL+
 type: parsed
 protocol: NECext
 address: 1A C5 00 00
 command: 46 00 00 00
 #
-name: REAR_VOLUME_-
+name: REAR_VOL-
 type: parsed
 protocol: NECext
 address: 1A C5 00 00
diff --git a/_CSV-IRDB_/N/NEC/TV/24,-1.ir b/_CSV-IRDB_/N/NEC/TV/24,-1.ir
index dd0c584f..514fa638 100644
--- a/_CSV-IRDB_/N/NEC/TV/24,-1.ir
+++ b/_CSV-IRDB_/N/NEC/TV/24,-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 03 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/TV/4,-1.ir b/_CSV-IRDB_/N/NEC/TV/4,-1.ir
index 22a88974..c6922df1 100644
--- a/_CSV-IRDB_/N/NEC/TV/4,-1.ir
+++ b/_CSV-IRDB_/N/NEC/TV/4,-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RB-34P/25,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RB-34P/25,-1.ir
index 6edb54d6..ff33a06d 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RB-34P/25,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RB-34P/25,-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 01 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 05 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 19 00 00 00
 command: 08 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RB-73A/25,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RB-73A/25,-1.ir
index 754d4590..56992363 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RB-73A/25,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RB-73A/25,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 19 00 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 05 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -49,25 +49,25 @@ protocol: NECext
 address: 19 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RB-D3A/25,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RB-D3A/25,-1.ir
index 770f7be5..a37deaf0 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RB-D3A/25,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RB-D3A/25,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 05 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 19 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 19 00 00 00
 command: 83 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RB-DV22/45,45.ir b/_CSV-IRDB_/N/NEC/Unknown_RB-DV22/45,45.ir
index 5f872245..be87a8cd 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RB-DV22/45,45.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RB-DV22/45,45.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 31 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 34 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 35 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 2D 2D 00 00
 command: 37 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 38 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
@@ -55,115 +55,115 @@ protocol: NECext
 address: 2D 2D 00 00
 command: 3A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 3F 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 40 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 41 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 42 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 43 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 44 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 45 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 46 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 47 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 48 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 4B 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 4C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 4F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 2D 2D 00 00
 command: 51 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 2D 2D 00 00
 command: 55 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 2D 2D 00 00
 command: 57 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 2D 2D 00 00
 command: 61 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
 command: 62 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 2D 2D 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RC-1065E/24,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RC-1065E/24,-1.ir
index c0100fc0..7b991aea 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RC-1065E/24,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RC-1065E/24,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 18 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 18 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -91,79 +91,79 @@ protocol: NECext
 address: 18 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 18 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -253,25 +253,25 @@ protocol: NECext
 address: 18 00 00 00
 command: 53 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 54 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 55 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 56 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -313,7 +313,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RC-1083E/24,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RC-1083E/24,-1.ir
index 4f3f82fc..f4000b23 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RC-1083E/24,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RC-1083E/24,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -73,73 +73,73 @@ protocol: NECext
 address: 18 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RC-334E/24,233.ir b/_CSV-IRDB_/N/NEC/Unknown_RC-334E/24,233.ir
index 70adbbc4..878a586b 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RC-334E/24,233.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RC-334E/24,233.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 18 E9 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 43 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 18 E9 00 00
 command: 4D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 5C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RC-6010/24,247.ir b/_CSV-IRDB_/N/NEC/Unknown_RC-6010/24,247.ir
index 1cc0d147..ba987677 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RC-6010/24,247.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RC-6010/24,247.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 00 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 18 F7 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
@@ -31,73 +31,73 @@ protocol: NECext
 address: 18 F7 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 14 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 17 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 18 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 19 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 18 F7 00 00
 command: 47 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 5D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 5E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RD-1077E/24,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RD-1077E/24,-1.ir
index 268429f1..7b9d1587 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RD-1077E/24,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RD-1077E/24,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -73,67 +73,67 @@ protocol: NECext
 address: 18 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RD-1078E/24,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RD-1078E/24,-1.ir
index 41e2e36a..0f64ce99 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RD-1078E/24,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RD-1078E/24,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -73,67 +73,67 @@ protocol: NECext
 address: 18 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RD-1083E/24,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RD-1083E/24,-1.ir
index cfccc07d..1aae4088 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RD-1083E/24,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RD-1083E/24,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -73,73 +73,73 @@ protocol: NECext
 address: 18 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RD-337E/2,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_RD-337E/2,-1.ir
index 9476d396..e3eb0824 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RD-337E/2,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RD-337E/2,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RD-343E/24,233.ir b/_CSV-IRDB_/N/NEC/Unknown_RD-343E/24,233.ir
index 9218b47c..bd4baa82 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RD-343E/24,233.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RD-343E/24,233.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 5D 00 00 00
 #
-name: KEY_4X
+name: 4X
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RD-348E/24,233.ir b/_CSV-IRDB_/N/NEC/Unknown_RD-348E/24,233.ir
index c0b7774b..e4e48340 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RD-348E/24,233.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RD-348E/24,233.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 18 E9 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RD-409E/24,233.ir b/_CSV-IRDB_/N/NEC/Unknown_RD-409E/24,233.ir
index 77be55e7..7c2a8f0b 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RD-409E/24,233.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RD-409E/24,233.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 18 E9 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 14 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 17 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 25 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 2A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 18 E9 00 00
 command: 2D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 46 00 00 00
 #
-name: pic-mute
+name: pic-MUTE
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 4C 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 18 E9 00 00
 command: 8A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: B8 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: BA 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: BC 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RD-427E/24,233.ir b/_CSV-IRDB_/N/NEC/Unknown_RD-427E/24,233.ir
index 921eb7e7..33c2b175 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RD-427E/24,233.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RD-427E/24,233.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -55,25 +55,25 @@ protocol: NECext
 address: 18 E9 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 17 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 25 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 2A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 18 E9 00 00
 command: 2D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 46 00 00 00
 #
-name: Pic-Mute
+name: Pic-MUTE
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 4C 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_RU-1220S/24,247.ir b/_CSV-IRDB_/N/NEC/Unknown_RU-1220S/24,247.ir
index e1631023..3fa4fc65 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_RU-1220S/24,247.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_RU-1220S/24,247.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 00 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
@@ -55,31 +55,31 @@ protocol: NECext
 address: 18 F7 00 00
 command: 15 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 18 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 19 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1D 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
@@ -169,25 +169,25 @@ protocol: NECext
 address: 18 F7 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 5D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 5E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_TRB-60/49,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_TRB-60/49,-1.ir
index c2db361c..97bafabc 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_TRB-60/49,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_TRB-60/49,-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -49,31 +49,31 @@ protocol: NECext
 address: 31 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0/AV
+name: 0/AV
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 47 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_TRB-968A/25,-1.ir b/_CSV-IRDB_/N/NEC/Unknown_TRB-968A/25,-1.ir
index 173e545f..9a7ff0b7 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_TRB-968A/25,-1.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_TRB-968A/25,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -25,19 +25,19 @@ protocol: NECext
 address: 19 00 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 05 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 19 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Unknown_UR-3020/24,247.ir b/_CSV-IRDB_/N/NEC/Unknown_UR-3020/24,247.ir
index f87815a4..8f434cf1 100644
--- a/_CSV-IRDB_/N/NEC/Unknown_UR-3020/24,247.ir
+++ b/_CSV-IRDB_/N/NEC/Unknown_UR-3020/24,247.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 00 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 01 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 18 F7 00 00
 command: 12 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
@@ -67,67 +67,67 @@ protocol: NECext
 address: 18 F7 00 00
 command: 16 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 17 00 00 00
 #
-name: KEY_1/ABC
+name: 1/ABC
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 18 00 00 00
 #
-name: KEY_2/DEF
+name: 2/DEF
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 19 00 00 00
 #
-name: KEY_3/GHI
+name: 3/GHI
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1A 00 00 00
 #
-name: KEY_4/JKL
+name: 4/JKL
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1B 00 00 00
 #
-name: KEY_5/MNO
+name: 5/MNO
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1C 00 00 00
 #
-name: KEY_6/PQR
+name: 6/PQR
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1D 00 00 00
 #
-name: KEY_7/STU
+name: 7/STU
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1E 00 00 00
 #
-name: KEY_8/VWX
+name: 8/VWX
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 1F 00 00 00
 #
-name: KEY_9/YZ-
+name: 9/YZ-
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 F7 00 00
diff --git a/_CSV-IRDB_/N/NEC/VCR/25,-1.ir b/_CSV-IRDB_/N/NEC/VCR/25,-1.ir
index 663dd64b..5407fd09 100644
--- a/_CSV-IRDB_/N/NEC/VCR/25,-1.ir
+++ b/_CSV-IRDB_/N/NEC/VCR/25,-1.ir
@@ -727,13 +727,13 @@ protocol: NECext
 address: 19 00 00 00
 command: 92 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 19 00 00 00
 command: 93 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 19 00 00 00
diff --git a/_CSV-IRDB_/N/NEC/Video_Projector/24,233.ir b/_CSV-IRDB_/N/NEC/Video_Projector/24,233.ir
index 20bb6fde..af444017 100644
--- a/_CSV-IRDB_/N/NEC/Video_Projector/24,233.ir
+++ b/_CSV-IRDB_/N/NEC/Video_Projector/24,233.ir
@@ -55,7 +55,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 08 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -301,7 +301,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 43 00 00 00
 #
-name: KEY_LOCK
+name: LOCK
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -349,7 +349,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 48 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -361,7 +361,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: 49 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
@@ -673,7 +673,7 @@ protocol: NECext
 address: 18 E9 00 00
 command: C3 00 00 00
 #
-name: CTL_KEY_LOCK
+name: CTL_LOCK
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
diff --git a/_CSV-IRDB_/N/NTL/Unknown_DI4001N/10,-1.ir b/_CSV-IRDB_/N/NTL/Unknown_DI4001N/10,-1.ir
index a830d263..dc71512e 100644
--- a/_CSV-IRDB_/N/NTL/Unknown_DI4001N/10,-1.ir
+++ b/_CSV-IRDB_/N/NTL/Unknown_DI4001N/10,-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -133,49 +133,49 @@ protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 0A 00 00 00
 command: 61 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/N/NVIDIA/Unknown_Personal/128,126.ir b/_CSV-IRDB_/N/NVIDIA/Unknown_Personal/128,126.ir
index 4a37e574..8c04042a 100644
--- a/_CSV-IRDB_/N/NVIDIA/Unknown_Personal/128,126.ir
+++ b/_CSV-IRDB_/N/NVIDIA/Unknown_Personal/128,126.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: 80 7E 00 00
 command: 00 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 01 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 02 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 80 7E 00 00
 command: 05 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 06 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
@@ -61,145 +61,145 @@ protocol: NECext
 address: 80 7E 00 00
 command: 09 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 10 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 11 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 15 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 17 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 18 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 1E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
diff --git a/_CSV-IRDB_/N/Nagra/Unknown_TVA/8,-1.ir b/_CSV-IRDB_/N/Nagra/Unknown_TVA/8,-1.ir
index 6b28e355..5a306690 100644
--- a/_CSV-IRDB_/N/Nagra/Unknown_TVA/8,-1.ir
+++ b/_CSV-IRDB_/N/Nagra/Unknown_TVA/8,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/N/Nakamichi/Receiver/130,93.ir b/_CSV-IRDB_/N/Nakamichi/Receiver/130,93.ir
index 515f8c4e..0b1ad95c 100644
--- a/_CSV-IRDB_/N/Nakamichi/Receiver/130,93.ir
+++ b/_CSV-IRDB_/N/Nakamichi/Receiver/130,93.ir
@@ -43,7 +43,7 @@ protocol: NECext
 address: 82 5D 00 00
 command: 04 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 82 5D 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 82 5D 00 00
 command: 05 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 82 5D 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 82 5D 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 82 5D 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 82 5D 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 82 5D 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 82 5D 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 82 5D 00 00
diff --git a/_CSV-IRDB_/N/Nakamichi/Receiver/92,-1.ir b/_CSV-IRDB_/N/Nakamichi/Receiver/92,-1.ir
index d3b88197..80015606 100644
--- a/_CSV-IRDB_/N/Nakamichi/Receiver/92,-1.ir
+++ b/_CSV-IRDB_/N/Nakamichi/Receiver/92,-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 5C 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 5C 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 5C 00 00 00
 command: 03 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 5C 00 00 00
diff --git a/_CSV-IRDB_/N/Nakamichi/Unknown_lirc.config/103,-1.ir b/_CSV-IRDB_/N/Nakamichi/Unknown_lirc.config/103,-1.ir
index c95b36da..153ef0a1 100644
--- a/_CSV-IRDB_/N/Nakamichi/Unknown_lirc.config/103,-1.ir
+++ b/_CSV-IRDB_/N/Nakamichi/Unknown_lirc.config/103,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 67 00 00 00
@@ -25,31 +25,31 @@ protocol: NECext
 address: 67 00 00 00
 command: C3 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: C4 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: C5 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: C6 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: C7 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 67 00 00 00
@@ -67,79 +67,79 @@ protocol: NECext
 address: 67 00 00 00
 command: CA 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: CB 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: CC 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: CD 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: CE 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: CF 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: D0 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: D1 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: D2 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: D3 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: D4 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: D5 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 67 00 00 00
 command: D6 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 67 00 00 00
diff --git a/_CSV-IRDB_/N/Napa/Unknown_DAV-309/0,-1.ir b/_CSV-IRDB_/N/Napa/Unknown_DAV-309/0,-1.ir
index 133c297e..98ea4944 100644
--- a/_CSV-IRDB_/N/Napa/Unknown_DAV-309/0,-1.ir
+++ b/_CSV-IRDB_/N/Napa/Unknown_DAV-309/0,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_Z
+name: Z
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,55 +85,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/N/Nebula_Electronics/Unknown_DVB/0,-1.ir b/_CSV-IRDB_/N/Nebula_Electronics/Unknown_DVB/0,-1.ir
index 61fcf34a..07e92b8c 100644
--- a/_CSV-IRDB_/N/Nebula_Electronics/Unknown_DVB/0,-1.ir
+++ b/_CSV-IRDB_/N/Nebula_Electronics/Unknown_DVB/0,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,127 +91,127 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,37 +223,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -265,19 +265,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -289,13 +289,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -307,25 +307,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_WWW
+name: WWW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_EMAIL
+name: EMAIL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PHONE
+name: PHONE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/N/Netgem/Unknown_iPlayer/131,51.ir b/_CSV-IRDB_/N/Netgem/Unknown_iPlayer/131,51.ir
index ffba02c0..1b5fc24f 100644
--- a/_CSV-IRDB_/N/Netgem/Unknown_iPlayer/131,51.ir
+++ b/_CSV-IRDB_/N/Netgem/Unknown_iPlayer/131,51.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 83 33 00 00
@@ -31,49 +31,49 @@ protocol: NECext
 address: 83 33 00 00
 command: 45 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 46 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 47 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 48 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 49 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 50 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 51 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 52 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 83 33 00 00
@@ -85,115 +85,115 @@ protocol: NECext
 address: 83 33 00 00
 command: 54 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 56 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 57 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 58 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 59 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 60 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 61 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 62 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 63 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 64 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 65 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 66 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 67 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 68 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 69 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 70 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 71 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 33 00 00
 command: 72 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 33 00 00
diff --git a/_CSV-IRDB_/N/Nextwave/Unknown_EX300/4,16.ir b/_CSV-IRDB_/N/Nextwave/Unknown_EX300/4,16.ir
index 19277249..fa430a33 100644
--- a/_CSV-IRDB_/N/Nextwave/Unknown_EX300/4,16.ir
+++ b/_CSV-IRDB_/N/Nextwave/Unknown_EX300/4,16.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 04 10 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 04 10 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 04 10 00 00
 command: 17 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 10 00 00
 command: 18 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 10 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 04 10 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 10 00 00
diff --git a/_CSV-IRDB_/N/Nikko/Unknown_Nikko/5,-1.ir b/_CSV-IRDB_/N/Nikko/Unknown_Nikko/5,-1.ir
index 338a87f9..08f2d032 100644
--- a/_CSV-IRDB_/N/Nikko/Unknown_Nikko/5,-1.ir
+++ b/_CSV-IRDB_/N/Nikko/Unknown_Nikko/5,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/N/Niles_Audio/Unknown/128,93.ir b/_CSV-IRDB_/N/Niles_Audio/Unknown/128,93.ir
index 9108c428..b627a164 100644
--- a/_CSV-IRDB_/N/Niles_Audio/Unknown/128,93.ir
+++ b/_CSV-IRDB_/N/Niles_Audio/Unknown/128,93.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 80 5D 00 00
diff --git a/_CSV-IRDB_/N/No_Brand/Unknown_YK-001/0,-1.ir b/_CSV-IRDB_/N/No_Brand/Unknown_YK-001/0,-1.ir
index d3ad1cad..d9a20bac 100644
--- a/_CSV-IRDB_/N/No_Brand/Unknown_YK-001/0,-1.ir
+++ b/_CSV-IRDB_/N/No_Brand/Unknown_YK-001/0,-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_EQUAL
+name: EQUAL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/N/Nokia/Unknown_624/74,-1.ir b/_CSV-IRDB_/N/Nokia/Unknown_624/74,-1.ir
index c51ceb32..0dd5dc74 100644
--- a/_CSV-IRDB_/N/Nokia/Unknown_624/74,-1.ir
+++ b/_CSV-IRDB_/N/Nokia/Unknown_624/74,-1.ir
@@ -61,7 +61,7 @@ protocol: NECext
 address: 4A 00 00 00
 command: 09 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 4A 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 4A 00 00 00
 command: 0F 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 4A 00 00 00
diff --git a/_CSV-IRDB_/N/Nokia/Unknown_NokiaVC620/3,-1.ir b/_CSV-IRDB_/N/Nokia/Unknown_NokiaVC620/3,-1.ir
index f896816d..54cff2b9 100644
--- a/_CSV-IRDB_/N/Nokia/Unknown_NokiaVC620/3,-1.ir
+++ b/_CSV-IRDB_/N/Nokia/Unknown_NokiaVC620/3,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -91,61 +91,61 @@ protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 98 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/N/Nokia/Unknown_RCN610/74,-1.ir b/_CSV-IRDB_/N/Nokia/Unknown_RCN610/74,-1.ir
index dc3dc01e..48bf6d94 100644
--- a/_CSV-IRDB_/N/Nokia/Unknown_RCN610/74,-1.ir
+++ b/_CSV-IRDB_/N/Nokia/Unknown_RCN610/74,-1.ir
@@ -61,7 +61,7 @@ protocol: NECext
 address: 4A 00 00 00
 command: 09 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 4A 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 4A 00 00 00
 command: 23 00 00 00
 #
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 4A 00 00 00
diff --git a/_CSV-IRDB_/N/Nokia/Unknown_VCN620/3,-1.ir b/_CSV-IRDB_/N/Nokia/Unknown_VCN620/3,-1.ir
index 58f24042..ea6b97e6 100644
--- a/_CSV-IRDB_/N/Nokia/Unknown_VCN620/3,-1.ir
+++ b/_CSV-IRDB_/N/Nokia/Unknown_VCN620/3,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -91,61 +91,61 @@ protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 29 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 98 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/N/Nokia/Unknown_VCR/137,119.ir b/_CSV-IRDB_/N/Nokia/Unknown_VCR/137,119.ir
index 1e196a11..ac5b8c8a 100644
--- a/_CSV-IRDB_/N/Nokia/Unknown_VCR/137,119.ir
+++ b/_CSV-IRDB_/N/Nokia/Unknown_VCR/137,119.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 06 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 0F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -49,61 +49,61 @@ protocol: NECext
 address: 89 77 00 00
 command: 17 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 40 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 41 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 42 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 43 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 44 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 45 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 46 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 47 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 89 77 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 89 77 00 00
 command: 4D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 4F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 89 77 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 89 77 00 00
 command: 53 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 59 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 89 77 00 00
 command: 5C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 89 77 00 00
diff --git a/_CSV-IRDB_/N/Norcent/Unknown_DP/0,-1.ir b/_CSV-IRDB_/N/Norcent/Unknown_DP/0,-1.ir
index a94f20d6..aefb3b18 100644
--- a/_CSV-IRDB_/N/Norcent/Unknown_DP/0,-1.ir
+++ b/_CSV-IRDB_/N/Norcent/Unknown_DP/0,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,43 +19,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_0PLUS
+name: 0PLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,61 +79,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,61 +163,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,31 +229,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/N/NorthQ/Unknown_6400/8,-1.ir b/_CSV-IRDB_/N/NorthQ/Unknown_6400/8,-1.ir
index d62d86bf..e740010b 100644
--- a/_CSV-IRDB_/N/NorthQ/Unknown_6400/8,-1.ir
+++ b/_CSV-IRDB_/N/NorthQ/Unknown_6400/8,-1.ir
@@ -7,139 +7,139 @@ protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_L
+name: L
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 40 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -187,49 +187,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 54 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -241,25 +241,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/N/Novaplex/Cable_Box/27,-1.ir b/_CSV-IRDB_/N/Novaplex/Cable_Box/27,-1.ir
index 9d5d2c43..a31ebef9 100644
--- a/_CSV-IRDB_/N/Novaplex/Cable_Box/27,-1.ir
+++ b/_CSV-IRDB_/N/Novaplex/Cable_Box/27,-1.ir
@@ -121,13 +121,13 @@ protocol: NECext
 address: 1B 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/N/Now_Broadband_TV/Unknown_Broadband/128,110.ir b/_CSV-IRDB_/N/Now_Broadband_TV/Unknown_Broadband/128,110.ir
index 35e364d6..8a6aa41d 100644
--- a/_CSV-IRDB_/N/Now_Broadband_TV/Unknown_Broadband/128,110.ir
+++ b/_CSV-IRDB_/N/Now_Broadband_TV/Unknown_Broadband/128,110.ir
@@ -1,163 +1,163 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 00 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 01 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 03 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 04 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 05 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 07 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 08 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 09 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 0A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 0E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 18 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 19 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 1A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 80 6E 00 00
 command: 1E 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
@@ -187,49 +187,49 @@ protocol: NECext
 address: 80 6E 00 00
 command: 52 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 53 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 54 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 55 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 56 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 57 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 58 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
 command: 59 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 80 6E 00 00
 command: 5B 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 80 6E 00 00
 command: 5E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 80 6E 00 00
diff --git a/_CSV-IRDB_/N/Now_Broadband_TV/Unknown_Broadband/64,64.ir b/_CSV-IRDB_/N/Now_Broadband_TV/Unknown_Broadband/64,64.ir
index dfa61d8f..f91174a6 100644
--- a/_CSV-IRDB_/N/Now_Broadband_TV/Unknown_Broadband/64,64.ir
+++ b/_CSV-IRDB_/N/Now_Broadband_TV/Unknown_Broadband/64,64.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -97,127 +97,127 @@ protocol: NECext
 address: 40 40 00 00
 command: 0F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 12 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 15 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 16 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 17 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 18 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1B 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 40 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 41 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 42 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 43 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 45 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 47 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 57 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/O/OSRAM/Unknown_OSRAM/1,0.ir b/_CSV-IRDB_/O/OSRAM/Unknown_OSRAM/1,0.ir
index 0e795a10..3074d2ea 100644
--- a/_CSV-IRDB_/O/OSRAM/Unknown_OSRAM/1,0.ir
+++ b/_CSV-IRDB_/O/OSRAM/Unknown_OSRAM/1,0.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/O/Olevia/Unknown_RC-LTFN/4,-1.ir b/_CSV-IRDB_/O/Olevia/Unknown_RC-LTFN/4,-1.ir
index 5b68934f..4dcd67c8 100644
--- a/_CSV-IRDB_/O/Olevia/Unknown_RC-LTFN/4,-1.ir
+++ b/_CSV-IRDB_/O/Olevia/Unknown_RC-LTFN/4,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 55 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/O/Olevia/Unknown_RC-LTL/4,185.ir b/_CSV-IRDB_/O/Olevia/Unknown_RC-LTL/4,185.ir
index cc1e8ea5..812c9c29 100644
--- a/_CSV-IRDB_/O/Olevia/Unknown_RC-LTL/4,185.ir
+++ b/_CSV-IRDB_/O/Olevia/Unknown_RC-LTL/4,185.ir
@@ -1,163 +1,163 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 00 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 0A 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 0F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 13 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 18 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 1B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 1C 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
 command: 1D 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 04 B9 00 00
 command: 20 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 04 B9 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 04 B9 00 00
 command: 2A 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 04 B9 00 00
diff --git a/_CSV-IRDB_/O/Olympus/Unknown_RM-1/134,59.ir b/_CSV-IRDB_/O/Olympus/Unknown_RM-1/134,59.ir
index 74677e9f..b0b647b3 100644
--- a/_CSV-IRDB_/O/Olympus/Unknown_RM-1/134,59.ir
+++ b/_CSV-IRDB_/O/Olympus/Unknown_RM-1/134,59.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: 86 3B 00 00
 command: 01 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 86 3B 00 00
 command: 02 00 00 00
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: 86 3B 00 00
 command: 03 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 86 3B 00 00
 command: 04 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 86 3B 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_7720/0,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_7720/0,-1.ir
index 4bc3e69c..1c34af45 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_7720/0,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_7720/0,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,85 +121,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_For/0,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_For/0,-1.ir
index 5eeb962d..2d0794b8 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_For/0,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_For/0,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,79 +127,79 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_For/8,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_For/8,-1.ir
index fc177d48..3f743a96 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_For/8,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_For/8,-1.ir
@@ -1,163 +1,163 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -169,49 +169,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 21 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 23 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 28 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 29 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -259,25 +259,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 39 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -301,163 +301,163 @@ protocol: NECext
 address: 08 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_One-For-All/0,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_One-For-All/0,-1.ir
index d3579045..283c10f6 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_One-For-All/0,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_One-For-All/0,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: X_KEY_0B
+name: X_0B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,43 +133,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: X_KEY_1B
+name: X_1B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: X_KEY_1C
+name: X_1C
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: X_KEY_1E
+name: X_1E
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: X_KEY_1F
+name: X_1F
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,37 +211,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -283,13 +283,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: X_KEY_2F
+name: X_2F
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -301,13 +301,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -319,13 +319,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -337,43 +337,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: X_KEY_3a
+name: X_3a
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: X_KEY_3B
+name: X_3B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: X_KEY_3D
+name: X_3D
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3D 00 00 00
 #
-name: X_KEY_3E
+name: X_3E
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_Phillips/5,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_Phillips/5,-1.ir
index 2c34feaf..2546c5e5 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_Phillips/5,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_Phillips/5,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,91 +79,91 @@ protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -175,37 +175,37 @@ protocol: NECext
 address: 05 00 00 00
 command: 38 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_SAT/32,8.ir b/_CSV-IRDB_/O/One_For_All/Unknown_SAT/32,8.ir
index b954ea71..eee80f6b 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_SAT/32,8.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_SAT/32,8.ir
@@ -1,205 +1,205 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 07 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0D 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 18 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 42 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 46 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 47 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 49 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 4A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 4D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 08 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-2510(12341)/71,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-2510(12341)/71,-1.ir
index 7affd30a..b04bdf8e 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-2510(12341)/71,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-2510(12341)/71,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 32 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-3021B00-VCR-0081/5,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-3021B00-VCR-0081/5,-1.ir
index 16433dea..e2b7f569 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-3021B00-VCR-0081/5,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-3021B00-VCR-0081/5,-1.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 45 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-3440/5,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-3440/5,-1.ir
index cbaca068..e95edab0 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-3440/5,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-3440/5,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -85,43 +85,43 @@ protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-5550/11,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-5550/11,-1.ir
index 28aabd77..52e40556 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-5550/11,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-5550/11,-1.ir
@@ -1,187 +1,187 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 09 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 21 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 35 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 42 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 43 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 61 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-6012w/2,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-6012w/2,-1.ir
index 060c1fb4..71969ddc 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-6012w/2,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-6012w/2,-1.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 28 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 02 00 00 00
 command: 43 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 51 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7020/5,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7020/5,-1.ir
index 571a51d4..64efe988 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7020/5,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7020/5,-1.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -163,37 +163,37 @@ protocol: NECext
 address: 05 00 00 00
 command: 38 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7240/5,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7240/5,-1.ir
index 39340830..fc5150e8 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7240/5,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7240/5,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -67,103 +67,103 @@ protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -175,31 +175,31 @@ protocol: NECext
 address: 05 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 51 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 56 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7530/7,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7530/7,-1.ir
index 2c8b3913..a74a1927 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7530/7,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7530/7,-1.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 21 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7555/0,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7555/0,-1.ir
index f379a8fb..c165cf36 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7555/0,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7555/0,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,43 +127,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 27 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,49 +175,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 30 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,37 +229,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 75 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7562/68,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7562/68,-1.ir
index 79f44cd7..d2b24d28 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7562/68,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7562/68,-1.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 28 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 53 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 57 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -151,55 +151,55 @@ protocol: NECext
 address: 44 00 00 00
 command: 96 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 97 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: C0 00 00 00
 #
-name: KEY_H
+name: H
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: C1 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: C2 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: C5 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: D0 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: D1 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: D2 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -211,31 +211,31 @@ protocol: NECext
 address: 44 00 00 00
 command: D4 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: D5 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: D6 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: D7 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: EB 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7710/0,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7710/0,-1.ir
index ef395749..9cab219e 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-7710/0,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-7710/0,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,43 +73,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_S
+name: S
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,55 +121,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-8204.1300/32,8.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-8204.1300/32,8.ir
index a3611f65..b6e59060 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-8204.1300/32,8.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-8204.1300/32,8.ir
@@ -1,211 +1,211 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 04 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 06 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 07 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 0D 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 18 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 42 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 46 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 47 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 49 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 4A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 4C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 08 00 00
 command: 4D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 08 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_URC-8910/7,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_URC-8910/7,-1.ir
index b3ae5b8f..5ca2e2ab 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_URC-8910/7,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_URC-8910/7,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 19 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -43,55 +43,55 @@ protocol: NECext
 address: 07 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 27 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -103,91 +103,91 @@ protocol: NECext
 address: 07 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 39 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 57 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 07 00 00 00
 command: C3 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: F4 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_VCR/113,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_VCR/113,-1.ir
index 43beaa77..4bfab983 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_VCR/113,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_VCR/113,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 41 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 43 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 46 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 48 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 49 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 71 00 00 00
@@ -79,121 +79,121 @@ protocol: NECext
 address: 71 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 50 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 54 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 55 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 56 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 56 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 57 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 57 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 58 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 59 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 60 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 61 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 62 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 63 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 64 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 65 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 71 00 00 00
@@ -205,25 +205,25 @@ protocol: NECext
 address: 71 00 00 00
 command: 69 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 71 00 00 00
 command: 70 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 71 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_control-Philips-0081d/0,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_control-Philips-0081d/0,-1.ir
index 126ae9b0..057794e0 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_control-Philips-0081d/0,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_control-Philips-0081d/0,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,61 +151,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_ofa-urc-7550-vcr0150/5,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_ofa-urc-7550-vcr0150/5,-1.ir
index a9ea65c4..5c57f3b7 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_ofa-urc-7550-vcr0150/5,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_ofa-urc-7550-vcr0150/5,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -85,73 +85,73 @@ protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_urc7562/0,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_urc7562/0,-1.ir
index ca8b0c39..73be7157 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_urc7562/0,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_urc7562/0,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,43 +121,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/One_For_All/Unknown_urc7730/0,-1.ir b/_CSV-IRDB_/O/One_For_All/Unknown_urc7730/0,-1.ir
index 4c051076..2515c1a0 100644
--- a/_CSV-IRDB_/O/One_For_All/Unknown_urc7730/0,-1.ir
+++ b/_CSV-IRDB_/O/One_For_All/Unknown_urc7730/0,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,85 +121,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/Onida/Unknown_DFX/0,-1.ir b/_CSV-IRDB_/O/Onida/Unknown_DFX/0,-1.ir
index 6692583e..951b8eb6 100644
--- a/_CSV-IRDB_/O/Onida/Unknown_DFX/0,-1.ir
+++ b/_CSV-IRDB_/O/Onida/Unknown_DFX/0,-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,37 +157,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,31 +223,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -259,25 +259,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/Onida/Unknown_TVE/3,-1.ir b/_CSV-IRDB_/O/Onida/Unknown_TVE/3,-1.ir
index ab247d53..b263a645 100644
--- a/_CSV-IRDB_/O/Onida/Unknown_TVE/3,-1.ir
+++ b/_CSV-IRDB_/O/Onida/Unknown_TVE/3,-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -31,85 +31,85 @@ protocol: NECext
 address: 03 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 79 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Amplifier/210,109.ir b/_CSV-IRDB_/O/Onkyo/Amplifier/210,109.ir
index f1595ad6..3b9ff9bc 100644
--- a/_CSV-IRDB_/O/Onkyo/Amplifier/210,109.ir
+++ b/_CSV-IRDB_/O/Onkyo/Amplifier/210,109.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Receiver/210,109.ir b/_CSV-IRDB_/O/Onkyo/Receiver/210,109.ir
index 6de292a3..25e22df2 100644
--- a/_CSV-IRDB_/O/Onkyo/Receiver/210,109.ir
+++ b/_CSV-IRDB_/O/Onkyo/Receiver/210,109.ir
@@ -103,7 +103,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 03 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 04 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_CR-70R/210,109.ir b/_CSV-IRDB_/O/Onkyo/Unknown_CR-70R/210,109.ir
index 7e44c03d..d7af280c 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_CR-70R/210,109.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_CR-70R/210,109.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: D2 6D 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 52 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/160,10.ir b/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/160,10.ir
index b7198a2d..6a27c2f1 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/160,10.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/160,10.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 4A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: A0 0A 00 00
 command: 84 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/210,109.ir b/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/210,109.ir
index f70e4a07..229f0958 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/210,109.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/210,109.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: D2 6D 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 04 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 08 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 0A 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 5C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/210,44.ir b/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/210,44.ir
index b7fec89f..bdefda82 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/210,44.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_Onkyo/210,44.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: D2 2C 00 00
 command: 01 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 05 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: D2 2C 00 00
 command: 07 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
@@ -49,85 +49,85 @@ protocol: NECext
 address: D2 2C 00 00
 command: 0A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 0E 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 18 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 19 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
 command: 1B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: D2 2C 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: D2 2C 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_RC-104C/210,-1.ir b/_CSV-IRDB_/O/Onkyo/Unknown_RC-104C/210,-1.ir
index 820b015f..f9d39f13 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_RC-104C/210,-1.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_RC-104C/210,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 49 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 50 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: D2 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: D2 00 00 00
 command: 52 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 53 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: D2 00 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: D2 00 00 00
 command: 56 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 58 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 59 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: D2 00 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_RC-146T/210,13.ir b/_CSV-IRDB_/O/Onkyo/Unknown_RC-146T/210,13.ir
index 21da7f28..d46ad204 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_RC-146T/210,13.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_RC-146T/210,13.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: D2 0D 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 0D 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 0D 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: D2 0D 00 00
 command: 18 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: D2 0D 00 00
 command: 19 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: D2 0D 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_RC-184s/210,109.ir b/_CSV-IRDB_/O/Onkyo/Unknown_RC-184s/210,109.ir
index c323894a..a8101570 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_RC-184s/210,109.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_RC-184s/210,109.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 4D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 4E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 51 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_RC-425DV/210,43.ir b/_CSV-IRDB_/O/Onkyo/Unknown_RC-425DV/210,43.ir
index fc9977cd..76530ff3 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_RC-425DV/210,43.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_RC-425DV/210,43.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 04 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: D2 2B 00 00
 command: 06 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 07 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 08 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: D2 2B 00 00
 command: 0B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -61,109 +61,109 @@ protocol: NECext
 address: D2 2B 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 0E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 10 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 13 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 17 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 18 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: D2 2B 00 00
 command: 46 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: D2 2B 00 00
 command: 4A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 4B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -211,49 +211,49 @@ protocol: NECext
 address: D2 2B 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 51 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 52 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 53 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 54 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 55 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -265,7 +265,7 @@ protocol: NECext
 address: D2 2B 00 00
 command: 8F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_RC-50/210,-1.ir b/_CSV-IRDB_/O/Onkyo/Unknown_RC-50/210,-1.ir
index d58912fe..3117d4f4 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_RC-50/210,-1.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_RC-50/210,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 49 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 50 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: D2 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: D2 00 00 00
 command: 52 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 53 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: D2 00 00 00
@@ -91,49 +91,49 @@ protocol: NECext
 address: D2 00 00 00
 command: 57 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 58 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 59 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: D2 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: D2 00 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_RC-682M/210,43.ir b/_CSV-IRDB_/O/Onkyo/Unknown_RC-682M/210,43.ir
index a5f3d9d8..11809f8d 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_RC-682M/210,43.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_RC-682M/210,43.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: D2 2B 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 08 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -25,109 +25,109 @@ protocol: NECext
 address: D2 2B 00 00
 command: 0A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 0E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 10 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 13 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 17 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: D2 2B 00 00
 command: 4B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 4D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: D2 2B 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 51 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 52 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: D2 2B 00 00
 command: 55 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: 58 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
 command: D3 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: D2 2B 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_rc-211s/210,109.ir b/_CSV-IRDB_/O/Onkyo/Unknown_rc-211s/210,109.ir
index f6a2ad3b..4be7b5c1 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_rc-211s/210,109.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_rc-211s/210,109.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: D2 6D 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 5A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/O/Onkyo/Unknown_rc-252s/210,109.ir b/_CSV-IRDB_/O/Onkyo/Unknown_rc-252s/210,109.ir
index b693e7d8..e5caabd8 100644
--- a/_CSV-IRDB_/O/Onkyo/Unknown_rc-252s/210,109.ir
+++ b/_CSV-IRDB_/O/Onkyo/Unknown_rc-252s/210,109.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: D2 6D 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: D2 6D 00 00
 command: 5C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/O/Onkyo_Integra/Receiver/210,109.ir b/_CSV-IRDB_/O/Onkyo_Integra/Receiver/210,109.ir
index 9904feb3..a406a340 100644
--- a/_CSV-IRDB_/O/Onkyo_Integra/Receiver/210,109.ir
+++ b/_CSV-IRDB_/O/Onkyo_Integra/Receiver/210,109.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: D2 6D 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: D2 6D 00 00
diff --git a/_CSV-IRDB_/O/Optex/Unknown_ORT/0,-1.ir b/_CSV-IRDB_/O/Optex/Unknown_ORT/0,-1.ir
index a22485ac..2158a536 100644
--- a/_CSV-IRDB_/O/Optex/Unknown_ORT/0,-1.ir
+++ b/_CSV-IRDB_/O/Optex/Unknown_ORT/0,-1.ir
@@ -1,211 +1,211 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_MEDIA
+name: MEDIA
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/oceanic/Unknown_oceanic/1,-1.ir b/_CSV-IRDB_/O/oceanic/Unknown_oceanic/1,-1.ir
index 5347ff65..78bc8ba6 100644
--- a/_CSV-IRDB_/O/oceanic/Unknown_oceanic/1,-1.ir
+++ b/_CSV-IRDB_/O/oceanic/Unknown_oceanic/1,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -13,103 +13,103 @@ protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/O/orion/Unknown_RC-CB/128,88.ir b/_CSV-IRDB_/O/orion/Unknown_RC-CB/128,88.ir
index 1240bffc..d206e19d 100644
--- a/_CSV-IRDB_/O/orion/Unknown_RC-CB/128,88.ir
+++ b/_CSV-IRDB_/O/orion/Unknown_RC-CB/128,88.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 58 00 00
@@ -31,49 +31,49 @@ protocol: NECext
 address: 80 58 00 00
 command: 04 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 05 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 06 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 07 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 0D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 58 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 80 58 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 58 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 80 58 00 00
 command: 14 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 1A 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 1B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 1C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 1D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 58 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 58 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 80 58 00 00
 command: 40 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 80 58 00 00
diff --git a/_CSV-IRDB_/O/orion/Unknown_TV-713/0,-1.ir b/_CSV-IRDB_/O/orion/Unknown_TV-713/0,-1.ir
index 3b5b9874..65b3cf39 100644
--- a/_CSV-IRDB_/O/orion/Unknown_TV-713/0,-1.ir
+++ b/_CSV-IRDB_/O/orion/Unknown_TV-713/0,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/O/orion/Unknown_orion-RC57/128,126.ir b/_CSV-IRDB_/O/orion/Unknown_orion-RC57/128,126.ir
index c9452297..c4dd566c 100644
--- a/_CSV-IRDB_/O/orion/Unknown_orion-RC57/128,126.ir
+++ b/_CSV-IRDB_/O/orion/Unknown_orion-RC57/128,126.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
 command: 0E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7E 00 00
diff --git a/_CSV-IRDB_/O/orion/Unknown_orion/128,123.ir b/_CSV-IRDB_/O/orion/Unknown_orion/128,123.ir
index efed7960..13247063 100644
--- a/_CSV-IRDB_/O/orion/Unknown_orion/128,123.ir
+++ b/_CSV-IRDB_/O/orion/Unknown_orion/128,123.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -109,31 +109,31 @@ protocol: NECext
 address: 80 7B 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 17 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 1E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 45 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 4C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 4F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
diff --git a/_CSV-IRDB_/P/PHAST/PLR-IR1/85,-1.ir b/_CSV-IRDB_/P/PHAST/PLR-IR1/85,-1.ir
index ab0f81dc..1b0a31f1 100644
--- a/_CSV-IRDB_/P/PHAST/PLR-IR1/85,-1.ir
+++ b/_CSV-IRDB_/P/PHAST/PLR-IR1/85,-1.ir
@@ -121,25 +121,25 @@ protocol: NECext
 address: 55 00 00 00
 command: 57 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: 58 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: 59 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: 5A 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 55 00 00 00
@@ -433,25 +433,25 @@ protocol: NECext
 address: 55 00 00 00
 command: 93 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: 94 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: 95 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: 96 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 55 00 00 00
@@ -745,25 +745,25 @@ protocol: NECext
 address: 55 00 00 00
 command: D3 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: D4 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: D5 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 55 00 00 00
 command: D6 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 55 00 00 00
diff --git a/_CSV-IRDB_/P/PLU2/Unknown_DVX-345pro/0,-1.ir b/_CSV-IRDB_/P/PLU2/Unknown_DVX-345pro/0,-1.ir
index fe60e0dd..9dc23602 100644
--- a/_CSV-IRDB_/P/PLU2/Unknown_DVX-345pro/0,-1.ir
+++ b/_CSV-IRDB_/P/PLU2/Unknown_DVX-345pro/0,-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,67 +31,67 @@ protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,85 +127,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -277,19 +277,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_DC551P/27,-1.ir b/_CSV-IRDB_/P/Pace/Unknown_DC551P/27,-1.ir
index d7c3c0bd..6aa65b08 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_DC551P/27,-1.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_DC551P/27,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_DI4001N/10,-1.ir b/_CSV-IRDB_/P/Pace/Unknown_DI4001N/10,-1.ir
index 3024a7a3..9f98bbbe 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_DI4001N/10,-1.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_DI4001N/10,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -121,55 +121,55 @@ protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -181,31 +181,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 61 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_EMAIL
+name: EMAIL
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 70 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_DI4010I/10,-1.ir b/_CSV-IRDB_/P/Pace/Unknown_DI4010I/10,-1.ir
index 7ab5e526..6df87e6f 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_DI4010I/10,-1.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_DI4010I/10,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -121,55 +121,55 @@ protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -181,31 +181,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 61 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_EMAIL
+name: EMAIL
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 70 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_DS420/16,80.ir b/_CSV-IRDB_/P/Pace/Unknown_DS420/16,80.ir
index a1805ec7..b97a3ef7 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_DS420/16,80.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_DS420/16,80.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: 10 50 00 00
 command: 00 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 50 00 00
 command: 00 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 50 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 10 50 00 00
 command: 06 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 50 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_DS620/132,60.ir b/_CSV-IRDB_/P/Pace/Unknown_DS620/132,60.ir
index 4fac56f9..e84987f9 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_DS620/132,60.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_DS620/132,60.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 20 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 21 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 22 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 23 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 24 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 26 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 27 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 28 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 29 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: 84 3C 00 00
 command: 2C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2D 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 30 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 31 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 32 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 33 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 34 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -133,55 +133,55 @@ protocol: NECext
 address: 84 3C 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 37 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 38 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 39 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_Digital/0,0.ir b/_CSV-IRDB_/P/Pace/Unknown_Digital/0,0.ir
index 8529007d..d4a3b7de 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_Digital/0,0.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_Digital/0,0.ir
@@ -61,7 +61,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_PACE-RC-10/132,60.ir b/_CSV-IRDB_/P/Pace/Unknown_PACE-RC-10/132,60.ir
index 5035bdf9..5810de1e 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_PACE-RC-10/132,60.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_PACE-RC-10/132,60.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 00 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 02 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -43,49 +43,49 @@ protocol: NECext
 address: 84 3C 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0A 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 84 3C 00 00
 command: 0F 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 10 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 84 3C 00 00
 command: 12 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 84 3C 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 84 3C 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_RC-17/132,60.ir b/_CSV-IRDB_/P/Pace/Unknown_RC-17/132,60.ir
index a648cffe..b6567c18 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_RC-17/132,60.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_RC-17/132,60.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 00 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 02 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -43,61 +43,61 @@ protocol: NECext
 address: 84 3C 00 00
 command: 06 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 0F 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 84 3C 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 84 3C 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 84 3C 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 84 3C 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_RC-30/132,60.ir b/_CSV-IRDB_/P/Pace/Unknown_RC-30/132,60.ir
index 5216aea3..66d1f57b 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_RC-30/132,60.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_RC-30/132,60.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 20 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 21 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 22 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 23 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 24 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 26 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 27 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 28 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 29 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 84 3C 00 00
 command: 2C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -97,37 +97,37 @@ protocol: NECext
 address: 84 3C 00 00
 command: 2F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 30 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 31 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 32 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 33 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 34 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -139,55 +139,55 @@ protocol: NECext
 address: 84 3C 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 37 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 38 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 39 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_TDS460NNZ/35,128.ir b/_CSV-IRDB_/P/Pace/Unknown_TDS460NNZ/35,128.ir
index 38609bb7..5564061a 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_TDS460NNZ/35,128.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_TDS460NNZ/35,128.ir
@@ -1,139 +1,139 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 21 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 23 80 00 00
@@ -145,79 +145,79 @@ protocol: NECext
 address: 23 80 00 00
 command: 38 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 5B 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 5C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 70 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 81 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 23 80 00 00
 command: 83 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 23 80 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_pacetwin/34,-1.ir b/_CSV-IRDB_/P/Pace/Unknown_pacetwin/34,-1.ir
index d586719f..e0f7c73d 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_pacetwin/34,-1.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_pacetwin/34,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 00 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 22 00 00 00
 command: 32 00 00 00
 #
-name: ch_up
+name: CH+
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 22 00 00 00
 command: 34 00 00 00
 #
-name: vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 22 00 00 00
 command: 37 00 00 00
 #
-name: vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 22 00 00 00
diff --git a/_CSV-IRDB_/P/Pace/Unknown_xsat/34,-1.ir b/_CSV-IRDB_/P/Pace/Unknown_xsat/34,-1.ir
index c2c2f499..15aef6d4 100644
--- a/_CSV-IRDB_/P/Pace/Unknown_xsat/34,-1.ir
+++ b/_CSV-IRDB_/P/Pace/Unknown_xsat/34,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 22 00 00 00
 command: 11 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 22 00 00 00
 command: 14 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -151,49 +151,49 @@ protocol: NECext
 address: 22 00 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 58 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 22 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_QUIT
+name: QUIT
 type: parsed
 protocol: NECext
 address: 22 00 00 00
diff --git a/_CSV-IRDB_/P/Packard_Bell/Unknown_PackBell/16,-1.ir b/_CSV-IRDB_/P/Packard_Bell/Unknown_PackBell/16,-1.ir
index 6386c079..5963c3fe 100644
--- a/_CSV-IRDB_/P/Packard_Bell/Unknown_PackBell/16,-1.ir
+++ b/_CSV-IRDB_/P/Packard_Bell/Unknown_PackBell/16,-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 00 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 01 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 02 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 03 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PHONE
+name: PHONE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -49,43 +49,43 @@ protocol: NECext
 address: 10 00 00 00
 command: 07 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 08 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 09 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -97,49 +97,49 @@ protocol: NECext
 address: 10 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 13 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 14 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 16 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -157,25 +157,25 @@ protocol: NECext
 address: 10 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 42 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/P/Palcom/Unknown_DSL-6/192,-1.ir b/_CSV-IRDB_/P/Palcom/Unknown_DSL-6/192,-1.ir
index de9c3e74..16cc36fc 100644
--- a/_CSV-IRDB_/P/Palcom/Unknown_DSL-6/192,-1.ir
+++ b/_CSV-IRDB_/P/Palcom/Unknown_DSL-6/192,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 81 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 83 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 84 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 85 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 86 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 87 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 88 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 89 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: C0 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: C0 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 91 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: C0 00 00 00
@@ -121,49 +121,49 @@ protocol: NECext
 address: C0 00 00 00
 command: 93 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 94 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 95 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 97 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 98 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 99 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: C0 00 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: C0 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: C0 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: C0 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: C0 00 00 00
 command: D8 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: C0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/DVD_Player/160,0.ir b/_CSV-IRDB_/P/Panasonic/DVD_Player/160,0.ir
index 14360259..20162f39 100644
--- a/_CSV-IRDB_/P/Panasonic/DVD_Player/160,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/DVD_Player/160,0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/DVD_Player/176,0.ir b/_CSV-IRDB_/P/Panasonic/DVD_Player/176,0.ir
index 9fd0de4c..6b967507 100644
--- a/_CSV-IRDB_/P/Panasonic/DVD_Player/176,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/DVD_Player/176,0.ir
@@ -427,7 +427,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 93 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Receiver/160,0.ir b/_CSV-IRDB_/P/Panasonic/Receiver/160,0.ir
index 9a7e493b..aeac59e7 100644
--- a/_CSV-IRDB_/P/Panasonic/Receiver/160,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Receiver/160,0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_CARC60EX/129,106.ir b/_CSV-IRDB_/P/Panasonic/Unknown_CARC60EX/129,106.ir
index 8b4a391c..872add8e 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_CARC60EX/129,106.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_CARC60EX/129,106.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 81 6A 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 81 6A 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 81 6A 00 00
 command: 19 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 81 6A 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 81 6A 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 81 6A 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR57510/144,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR57510/144,0.ir
index 563d6540..71181662 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR57510/144,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR57510/144,0.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 90 00 00 00
 command: 06 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 90 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR642162/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR642162/160,194.ir
index 51ed2197..c88f6f08 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR642162/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR642162/160,194.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: A0 C2 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 81 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 84 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 85 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -37,97 +37,97 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 8D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 90 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 91 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 92 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 93 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 94 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 95 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 97 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 98 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 99 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 9F 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: AC 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B1 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR642195/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR642195/160,194.ir
index 7aea389a..160552d8 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR642195/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR642195/160,194.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: 82 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 84 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -55,67 +55,67 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 90 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 91 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 92 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 93 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 94 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 95 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 97 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 98 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 9F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: A0 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: A2 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: AF 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BC 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BF 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR643820/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR643820/160,194.ir
index b9cd3e17..32d72dfd 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR643820/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR643820/160,194.ir
@@ -43,7 +43,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: AE 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BC 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR643826/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR643826/160,194.ir
index 548a4501..9fc31d4e 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR643826/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR643826/160,194.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: AF 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BC 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR7617010/176,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR7617010/176,0.ir
index 2d22530a..b69d6118 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR7617010/176,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR7617010/176,0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -19,91 +19,91 @@ protocol: NECext
 address: B0 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 33 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: B0 00 00 00
 command: 48 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 49 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -139,49 +139,49 @@ protocol: NECext
 address: B0 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 81 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 83 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 85 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 87 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -205,25 +205,25 @@ protocol: NECext
 address: B0 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 92 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: B0 00 00 00
 command: C0 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: B0 00 00 00
 command: D5 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: B0 00 00 00
 command: E0 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR7621010/176,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR7621010/176,0.ir
index b12b7bbb..73832305 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR7621010/176,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR7621010/176,0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -19,91 +19,91 @@ protocol: NECext
 address: B0 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 33 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -115,61 +115,61 @@ protocol: NECext
 address: B0 00 00 00
 command: 46 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 49 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 81 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 83 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 85 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 87 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: B0 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 92 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: B0 00 00 00
 command: C0 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: B0 00 00 00
 command: E0 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR7631010/176,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR7631010/176,0.ir
index c893bebf..9018fadf 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR7631010/176,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR7631010/176,0.ir
@@ -1,193 +1,193 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 00 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 33 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 49 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 63 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 64 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 81 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 85 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 87 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 88 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 91 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 92 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_EUR7914Z20/128,72.ir b/_CSV-IRDB_/P/Panasonic/Unknown_EUR7914Z20/128,72.ir
index 639a58b9..a046db60 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_EUR7914Z20/128,72.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_EUR7914Z20/128,72.ir
@@ -13,31 +13,31 @@ protocol: NECext
 address: 80 48 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 3D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 48 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 80 48 00 00
 command: 6E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 72 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 48 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 80 48 00 00
 command: 82 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_N2QADC000006/128,72.ir b/_CSV-IRDB_/P/Panasonic/Unknown_N2QADC000006/128,72.ir
index b1d47af9..16b82e76 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_N2QADC000006/128,72.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_N2QADC000006/128,72.ir
@@ -13,49 +13,49 @@ protocol: NECext
 address: 80 48 00 00
 command: 05 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 21 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 3D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 48 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 80 48 00 00
 command: 6D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 72 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 79 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 48 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_N2QAHB0048/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_N2QAHB0048/160,194.ir
index 6b9fecfe..750df352 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_N2QAHB0048/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_N2QAHB0048/160,194.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: A0 C2 00 00
 command: 46 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 81 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 84 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 85 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 87 00 00 00
 #
-name: KEY_PROGRAM
+name: PROGRAM
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -43,91 +43,91 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 90 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 91 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 92 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 93 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 94 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 95 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 97 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 98 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 99 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 9F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: A0 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: A2 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: A3 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -139,49 +139,49 @@ protocol: NECext
 address: A0 C2 00 00
 command: AF 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B1 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BC 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BD 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BE 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BF 00 00 00
 #
-name: KEY_SOUND
+name: SOUND
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: DA 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: E7 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_N2QAYB000064/128,72.ir b/_CSV-IRDB_/P/Panasonic/Unknown_N2QAYB000064/128,72.ir
index 1d42b21c..69a62e80 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_N2QAYB000064/128,72.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_N2QAYB000064/128,72.ir
@@ -7,43 +7,43 @@ protocol: NECext
 address: 80 48 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 3D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 3E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 5C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 48 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 80 48 00 00
 command: 6D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 72 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 48 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 80 48 00 00
 command: 7E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 80 48 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 80 48 00 00
 command: 8F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 48 00 00
 command: 90 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 80 48 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_NV-F65/144,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_NV-F65/144,0.ir
index 53aa4e21..38055ef8 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_NV-F65/144,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_NV-F65/144,0.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 90 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -31,73 +31,73 @@ protocol: NECext
 address: 90 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 90 00 00 00
 command: 54 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 56 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 90 00 00 00
 command: 91 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 90 00 00 00
 command: F1 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: F2 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_PANASONIC/0,-1.ir b/_CSV-IRDB_/P/Panasonic/Unknown_PANASONIC/0,-1.ir
index 715cdd4f..05540541 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_PANASONIC/0,-1.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_PANASONIC/0,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: X_KEY_QUIT
+name: X_QUIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 25 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_PANASONIC/176,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_PANASONIC/176,0.ir
index d045a150..432c00ab 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_PANASONIC/176,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_PANASONIC/176,0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: B0 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -67,43 +67,43 @@ protocol: NECext
 address: B0 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 33 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: B0 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 81 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 88 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: B0 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 92 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: B0 00 00 00
 command: D5 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_Panasonic-EUR571100/144,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_Panasonic-EUR571100/144,0.ir
index f66277ac..e211a437 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_Panasonic-EUR571100/144,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_Panasonic-EUR571100/144,0.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 06 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 90 00 00 00
 command: 36 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 90 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_Panasonic-RAK-RX314W/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_Panasonic-RAK-RX314W/160,194.ir
index e3646fbe..f584d082 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_Panasonic-RAK-RX314W/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_Panasonic-RAK-RX314W/160,194.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -61,55 +61,55 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 90 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 91 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 92 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 93 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 94 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 95 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 97 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: A0 C2 00 00
 command: AF 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B1 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BC 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_RAK-RX309W/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_RAK-RX309W/160,194.ir
index a17b1487..51dd4162 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_RAK-RX309W/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_RAK-RX309W/160,194.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -61,55 +61,55 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 90 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 91 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 92 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 93 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 94 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 95 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 97 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: A3 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: A0 C2 00 00
 command: AF 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B1 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BC 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_RC4346-01B/0,-1.ir b/_CSV-IRDB_/P/Panasonic/Unknown_RC4346-01B/0,-1.ir
index 8fe8dc3a..7a97e788 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_RC4346-01B/0,-1.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_RC4346-01B/0,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,55 +67,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,61 +133,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 00 00 00 00
 command: BE 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 00 00 00 00
 command: D3 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_RX-ED70/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_RX-ED70/160,194.ir
index ae84334f..2ed69ba2 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_RX-ED70/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_RX-ED70/160,194.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: AF 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BC 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_TV/0,-1.ir b/_CSV-IRDB_/P/Panasonic/Unknown_TV/0,-1.ir
index f1684bd2..b0759c3e 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_TV/0,-1.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_TV/0,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,97 +25,97 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_VCR/144,1.ir b/_CSV-IRDB_/P/Panasonic/Unknown_VCR/144,1.ir
index 69e95261..1f10b16c 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_VCR/144,1.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_VCR/144,1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -13,55 +13,55 @@ protocol: NECext
 address: 90 01 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 02 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 90 01 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 03 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 90 01 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 90 01 00 00
 command: 04 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 90 01 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 06 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -73,67 +73,67 @@ protocol: NECext
 address: 90 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 90 00 00 00
 command: 33 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 34 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 90 00 00 00
 command: 36 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 90 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 90 01 00 00
 command: 56 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 90 01 00 00
 command: 58 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 90 01 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_VEQ0910/144,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_VEQ0910/144,0.ir
index 06ae06f4..43c149c1 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_VEQ0910/144,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_VEQ0910/144,0.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 90 00 00 00
 command: 06 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -49,73 +49,73 @@ protocol: NECext
 address: 90 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 33 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 90 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 90 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_VEQ1309/144,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_VEQ1309/144,0.ir
index ab03ca70..18ed2a9f 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_VEQ1309/144,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_VEQ1309/144,0.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 90 00 00 00
 command: 06 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -49,67 +49,67 @@ protocol: NECext
 address: 90 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 19 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 90 00 00 00
 command: 93 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 90 00 00 00
 command: F1 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: F2 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_VEQ1697/112,8.ir b/_CSV-IRDB_/P/Panasonic/Unknown_VEQ1697/112,8.ir
index 528f1f86..0f8a2db9 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_VEQ1697/112,8.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_VEQ1697/112,8.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 70 08 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 70 08 00 00
 command: 02 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 70 08 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 70 08 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 70 08 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 70 08 00 00
 command: 0A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 70 08 00 00
 command: 0A 00 00 00
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: 70 08 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 70 08 00 00
 command: 62 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 70 08 00 00
 command: 63 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 70 08 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_VEQ2380/176,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_VEQ2380/176,0.ir
index 8748d1aa..918ec215 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_VEQ2380/176,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_VEQ2380/176,0.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 33 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -127,49 +127,49 @@ protocol: NECext
 address: B0 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 81 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 83 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 85 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 87 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: B0 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 92 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_VSQS0531/2,-1.ir b/_CSV-IRDB_/P/Panasonic/Unknown_VSQS0531/2,-1.ir
index 3ef660fe..62ca927b 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_VSQS0531/2,-1.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_VSQS0531/2,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -49,19 +49,19 @@ protocol: NECext
 address: 02 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_cd/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_cd/160,194.ir
index e3f4de9a..57149e89 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_cd/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_cd/160,194.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: A0 C2 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 81 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 84 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 85 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8B 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: AC 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: B5 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_panas928/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_panas928/160,194.ir
index 5f8511f1..0f983759 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_panas928/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_panas928/160,194.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: +vol
+name: +VOL
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: -vol
+name: -VOL
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_panasonic-RAX-RX318W/160,194.ir b/_CSV-IRDB_/P/Panasonic/Unknown_panasonic-RAX-RX318W/160,194.ir
index 339ea791..8b4e119c 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_panasonic-RAX-RX318W/160,194.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_panasonic-RAX-RX318W/160,194.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: 85 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 8D 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -67,55 +67,55 @@ protocol: NECext
 address: A0 C2 00 00
 command: 8F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 90 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 91 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 92 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 93 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 94 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 95 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: 97 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: A0 C2 00 00
 command: A3 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: AD 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: B0 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: A0 C2 00 00
 command: B8 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
 command: BC 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 C2 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_panasonic.conf/144,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_panasonic.conf/144,0.ir
index 972134c8..36f2461d 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_panasonic.conf/144,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_panasonic.conf/144,0.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 06 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 08 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -49,79 +49,79 @@ protocol: NECext
 address: 90 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: 33 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 90 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 90 00 00 00
 command: 54 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 90 00 00 00
 command: 91 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 90 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 90 00 00 00
 command: F1 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 90 00 00 00
 command: F2 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 90 00 00 00
diff --git a/_CSV-IRDB_/P/Panasonic/Unknown_veq2249/176,0.ir b/_CSV-IRDB_/P/Panasonic/Unknown_veq2249/176,0.ir
index 814aa03a..d96fb323 100644
--- a/_CSV-IRDB_/P/Panasonic/Unknown_veq2249/176,0.ir
+++ b/_CSV-IRDB_/P/Panasonic/Unknown_veq2249/176,0.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 00 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -25,85 +25,85 @@ protocol: NECext
 address: B0 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 33 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -127,49 +127,49 @@ protocol: NECext
 address: B0 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 81 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 83 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 85 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 87 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: B0 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 94 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/P/Panda/Unknown_DVD-6838/0,-1.ir b/_CSV-IRDB_/P/Panda/Unknown_DVD-6838/0,-1.ir
index 70de0197..3c60e91c 100644
--- a/_CSV-IRDB_/P/Panda/Unknown_DVD-6838/0,-1.ir
+++ b/_CSV-IRDB_/P/Panda/Unknown_DVD-6838/0,-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,37 +31,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,79 +73,79 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,37 +181,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -265,19 +265,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Pansat/Unknown_2500a/0,249.ir b/_CSV-IRDB_/P/Pansat/Unknown_2500a/0,249.ir
index ee62dd06..330fc60e 100644
--- a/_CSV-IRDB_/P/Pansat/Unknown_2500a/0,249.ir
+++ b/_CSV-IRDB_/P/Pansat/Unknown_2500a/0,249.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 03 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
@@ -55,133 +55,133 @@ protocol: NECext
 address: 00 F9 00 00
 command: 08 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 19 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 1B 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 1C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 1D 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 1F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 41 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 43 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
diff --git a/_CSV-IRDB_/P/Pansat/Unknown_2700/8,-1.ir b/_CSV-IRDB_/P/Pansat/Unknown_2700/8,-1.ir
index 85a7e581..b8b81813 100644
--- a/_CSV-IRDB_/P/Pansat/Unknown_2700/8,-1.ir
+++ b/_CSV-IRDB_/P/Pansat/Unknown_2700/8,-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: volume
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -61,127 +61,127 @@ protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/P/Pansat/Unknown_2700a/8,-1.ir b/_CSV-IRDB_/P/Pansat/Unknown_2700a/8,-1.ir
index f4e38c73..aaacf4cd 100644
--- a/_CSV-IRDB_/P/Pansat/Unknown_2700a/8,-1.ir
+++ b/_CSV-IRDB_/P/Pansat/Unknown_2700a/8,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -55,127 +55,127 @@ protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 08 00 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -211,25 +211,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -247,25 +247,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/P/Parasound/Receiver/27,-1.ir b/_CSV-IRDB_/P/Parasound/Receiver/27,-1.ir
index 8d7ca88d..e60d8ab0 100644
--- a/_CSV-IRDB_/P/Parasound/Receiver/27,-1.ir
+++ b/_CSV-IRDB_/P/Parasound/Receiver/27,-1.ir
@@ -205,7 +205,7 @@ protocol: NECext
 address: 1B 00 00 00
 command: 21 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 1B 00 00 00
 command: 24 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/P/Parasound/Receiver/3,240.ir b/_CSV-IRDB_/P/Parasound/Receiver/3,240.ir
index 3638ea36..ff673e02 100644
--- a/_CSV-IRDB_/P/Parasound/Receiver/3,240.ir
+++ b/_CSV-IRDB_/P/Parasound/Receiver/3,240.ir
@@ -61,19 +61,19 @@ protocol: NECext
 address: 03 F0 00 00
 command: 89 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
 command: 8A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
 command: 8D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 03 F0 00 00
 command: 9F 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 03 F0 00 00
 command: C1 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
 command: C2 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
diff --git a/_CSV-IRDB_/P/Parasound/Surround_Processor/3,240.ir b/_CSV-IRDB_/P/Parasound/Surround_Processor/3,240.ir
index 9ffd1432..1fac34a0 100644
--- a/_CSV-IRDB_/P/Parasound/Surround_Processor/3,240.ir
+++ b/_CSV-IRDB_/P/Parasound/Surround_Processor/3,240.ir
@@ -97,7 +97,7 @@ protocol: NECext
 address: 03 F0 00 00
 command: 9C 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 03 F0 00 00
 command: C8 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
 command: CB 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 F0 00 00
diff --git a/_CSV-IRDB_/P/Peekton/Unknown_IR6005/0,-1.ir b/_CSV-IRDB_/P/Peekton/Unknown_IR6005/0,-1.ir
index ab032f0a..1f23977c 100644
--- a/_CSV-IRDB_/P/Peekton/Unknown_IR6005/0,-1.ir
+++ b/_CSV-IRDB_/P/Peekton/Unknown_IR6005/0,-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,61 +235,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philco/Unknown_PCR-111/80,-1.ir b/_CSV-IRDB_/P/Philco/Unknown_PCR-111/80,-1.ir
index 0cc0f0ee..00dca109 100644
--- a/_CSV-IRDB_/P/Philco/Unknown_PCR-111/80,-1.ir
+++ b/_CSV-IRDB_/P/Philco/Unknown_PCR-111/80,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 04 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 06 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 50 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -97,49 +97,49 @@ protocol: NECext
 address: 50 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 19 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 50 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 50 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 50 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 50 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/TV/0,-1.ir b/_CSV-IRDB_/P/Philips/TV/0,-1.ir
index f6d06971..813f03af 100644
--- a/_CSV-IRDB_/P/Philips/TV/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/TV/0,-1.ir
@@ -163,7 +163,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_01/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_01/0,-1.ir
index 0d1bb444..7c0fce4f 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_01/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_01/0,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_01/48,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_01/48,-1.ir
index 7ecd4c42..926d6dc7 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_01/48,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_01/48,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 30 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 22 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 30 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 30 00 00 00
 command: 43 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -193,31 +193,31 @@ protocol: NECext
 address: 30 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -229,25 +229,25 @@ protocol: NECext
 address: 30 00 00 00
 command: C8 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: CF 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: EE 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: F7 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_101/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_101/5,-1.ir
index 6a46bfb4..acf64f80 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_101/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_101/5,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,61 +79,61 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 52 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_130A/138,245.ir b/_CSV-IRDB_/P/Philips/Unknown_130A/138,245.ir
index a970bc8c..1e3dc353 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_130A/138,245.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_130A/138,245.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 8A F5 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -37,67 +37,67 @@ protocol: NECext
 address: 8A F5 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 10 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 11 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 12 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 15 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 8A F5 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 1C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 1D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_17PT1563/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_17PT1563/0,-1.ir
index 2678ba41..ca2d6305 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_17PT1563/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_17PT1563/0,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_26PFL5604H/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_26PFL5604H/0,-1.ir
index 86100efc..224a4958 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_26PFL5604H/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_26PFL5604H/0,-1.ir
@@ -1,199 +1,199 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 70 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_32PFL5403D/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_32PFL5403D/0,-1.ir
index 658ca774..6b2c1ee4 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_32PFL5403D/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_32PFL5403D/0,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,43 +67,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,61 +115,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,31 +181,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 70 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_5260/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_5260/0,-1.ir
index 83c078d9..cbc9da7e 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_5260/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_5260/0,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,25 +223,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_5300/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_5300/0,-1.ir
index eac4929c..1cefc1bc 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_5300/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_5300/0,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_5373/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_5373/5,-1.ir
index 870020cf..c0e91b56 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_5373/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_5373/5,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -373,13 +373,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -457,7 +457,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -481,43 +481,43 @@ protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -529,7 +529,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_8243/10,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_8243/10,-1.ir
index 52bfbf29..ece0a329 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_8243/10,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_8243/10,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -145,37 +145,37 @@ protocol: NECext
 address: 0A 00 00 00
 command: 61 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_95/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_95/5,-1.ir
index 1daa7585..6dbb1442 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_95/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_95/5,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -19,31 +19,31 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -55,43 +55,43 @@ protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_AV5609/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_AV5609/5,-1.ir
index a0693d0d..d62dddea 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_AV5609/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_AV5609/5,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -13,19 +13,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -61,31 +61,31 @@ protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_CD/20,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_CD/20,-1.ir
index 2148eea2..8f5fa0cc 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_CD/20,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_CD/20,-1.ir
@@ -67,13 +67,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 14 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_CD720/20,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_CD720/20,-1.ir
index b2d6503b..992f336d 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_CD720/20,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_CD720/20,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -25,19 +25,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -49,25 +49,25 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_CD723/20,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_CD723/20,-1.ir
index 9d139729..312f8fc3 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_CD723/20,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_CD723/20,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_DSX-5500/39,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_DSX-5500/39,-1.ir
index d79bec03..68e9f927 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_DSX-5500/39,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_DSX-5500/39,-1.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 21 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 43 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 54 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 55 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 27 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 27 00 00 00
 command: 71 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 83 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 27 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 27 00 00 00
 command: AF 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: CB 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 27 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 27 00 00 00
 command: CD 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 27 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_DVD-724/4,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_DVD-724/4,-1.ir
index a7173aea..a41fde59 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_DVD-724/4,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_DVD-724/4,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 82 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 85 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: D5 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_DVD711/4,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_DVD711/4,-1.ir
index d902bba3..5042bf95 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_DVD711/4,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_DVD711/4,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,61 +121,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 04 00 00 00
 command: C8 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_DVP-5982/4,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_DVP-5982/4,-1.ir
index e4ed5c29..1079de48 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_DVP-5982/4,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_DVP-5982/4,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -67,31 +67,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -103,43 +103,43 @@ protocol: NECext
 address: 04 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 7E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: C7 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: D1 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_DVP-642/4,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_DVP-642/4,-1.ir
index 1a7ca7dc..165da3b5 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_DVP-642/4,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_DVP-642/4,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 82 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 85 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: D5 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_FW2104/134,83.ir b/_CSV-IRDB_/P/Philips/Unknown_FW2104/134,83.ir
index ad6182ce..e5d90cf5 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_FW2104/134,83.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_FW2104/134,83.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 01 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 02 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 03 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 04 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 53 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 86 53 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 86 53 00 00
@@ -91,73 +91,73 @@ protocol: NECext
 address: 86 53 00 00
 command: 14 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 16 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 17 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 18 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 19 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 1A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 1B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 1C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 1D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 1E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 53 00 00
 command: 1F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 86 53 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 86 53 00 00
 command: 44 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 86 53 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 86 53 00 00
 command: 47 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 86 53 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 86 53 00 00
 command: 49 00 00 00
 #
-name: KEY_SPACE
+name: SPACE
 type: parsed
 protocol: NECext
 address: 86 53 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_LV2/20,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_LV2/20,-1.ir
index ccd34447..fa16fd22 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_LV2/20,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_LV2/20,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 21 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 24 00 00 00
 #
-name: KEY_S
+name: S
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_MULTI/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_MULTI/0,-1.ir
index e00735af..d3779bf8 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_MULTI/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_MULTI/0,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_MULTI/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_MULTI/5,-1.ir
index c84781d2..270e464d 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_MULTI/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_MULTI/5,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -73,79 +73,79 @@ protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_MULTI/6,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_MULTI/6,-1.ir
index f7567c7e..135b84e3 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_MULTI/6,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_MULTI/6,-1.ir
@@ -85,19 +85,19 @@ protocol: NECext
 address: 06 00 00 00
 command: 0D 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 10 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 11 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 06 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_PHDVD5/26,154.ir b/_CSV-IRDB_/P/Philips/Unknown_PHDVD5/26,154.ir
index 756e3ea9..657b7904 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_PHDVD5/26,154.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_PHDVD5/26,154.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
@@ -67,61 +67,61 @@ protocol: NECext
 address: 1A 9A 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 1B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
@@ -145,79 +145,79 @@ protocol: NECext
 address: 1A 9A 00 00
 command: 2B 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 5E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 5F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 60 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 61 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 61 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 62 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 63 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 6F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 6F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 72 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 72 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 1A 9A 00 00
 command: 73 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_PHILIPS/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_PHILIPS/0,-1.ir
index e78cb9fd..ba8978b2 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_PHILIPS/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_PHILIPS/0,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,67 +127,67 @@ protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_PHILIPS/34,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_PHILIPS/34,-1.ir
index 37b4ce29..bf60b27a 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_PHILIPS/34,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_PHILIPS/34,-1.ir
@@ -115,7 +115,7 @@ protocol: NECext
 address: 22 00 00 00
 command: 14 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 22 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_PM725S/27,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_PM725S/27,-1.ir
index bc6e3761..d16705b3 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_PM725S/27,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_PM725S/27,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 05 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 1B 00 00 00
 command: 08 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -61,109 +61,109 @@ protocol: NECext
 address: 1B 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 22 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 1B 00 00 00
 command: 29 00 00 00
 #
-name: KEY_QUIT
+name: QUIT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 33 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 1B 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_Philips-PMDVD6T-Universal-AUX/64,47.ir b/_CSV-IRDB_/P/Philips/Unknown_Philips-PMDVD6T-Universal-AUX/64,47.ir
index db165193..829f349c 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_Philips-PMDVD6T-Universal-AUX/64,47.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_Philips-PMDVD6T-Universal-AUX/64,47.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 40 2F 00 00
 command: 01 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
@@ -31,37 +31,37 @@ protocol: NECext
 address: 40 2F 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 06 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 07 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 08 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 09 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 40 2F 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 0D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
@@ -97,37 +97,37 @@ protocol: NECext
 address: 40 2F 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 40 2F 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 40 2F 00 00
 command: 19 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 40 2F 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 1B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 40 2F 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
 command: 1F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 40 2F 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_R-48F01/20,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_R-48F01/20,-1.ir
index 74889828..f9353495 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_R-48F01/20,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_R-48F01/20,-1.ir
@@ -19,25 +19,25 @@ protocol: NECext
 address: 14 00 00 00
 command: 11 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 12 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 13 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 14 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC-2012/4,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC-2012/4,-1.ir
index eaa628d5..97a0fa70 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC-2012/4,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC-2012/4,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -67,31 +67,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -103,43 +103,43 @@ protocol: NECext
 address: 04 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 7E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 82 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 83 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: C7 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: D1 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC-7843/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC-7843/0,-1.ir
index f3f1f8d9..05deaa64 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC-7843/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC-7843/0,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,37 +139,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC/0,-1.ir
index 015497da..2a194fcd 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC/0,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -295,25 +295,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 67 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -325,7 +325,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC/20,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC/20,-1.ir
index b9aa2cd9..60921065 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC/20,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC/20,-1.ir
@@ -67,19 +67,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC19042002/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC19042002/0,-1.ir
index 5181570a..1f516f07 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC19042002/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC19042002/0,-1.ir
@@ -73,7 +73,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: tv-mute
+name: tv-MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: tv-vol+
+name: tv-VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: tv-vol-
+name: tv-VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC19237006/4,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC19237006/4,-1.ir
index cc8d8215..64308df7 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC19237006/4,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC19237006/4,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -103,19 +103,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 48 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -157,31 +157,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 82 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 04 00 00 00
 command: C8 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC19335003-01P/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC19335003-01P/0,-1.ir
index dba7e7f9..2719184c 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC19335003-01P/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC19335003-01P/0,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC2034302/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC2034302/0,-1.ir
index ef161287..7fae1f2d 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC2034302/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC2034302/0,-1.ir
@@ -1,229 +1,229 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_AB
+name: AB
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_SWITCHVIDEOMODE
+name: SWITCHVIDEOMODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_SCREEN
+name: SCREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 70 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C1 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: CC 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC2070/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC2070/0,-1.ir
index 332d19d5..19e9146d 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC2070/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC2070/0,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_N
+name: N
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: alt_power
+name: alt_POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_3_and_up
+name: 3_and_up
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC2582/39,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC2582/39,-1.ir
index 47908f9a..22f700ef 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC2582/39,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC2582/39,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 27 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 27 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 27 00 00 00
@@ -79,67 +79,67 @@ protocol: NECext
 address: 27 00 00 00
 command: 43 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 58 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 83 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 84 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: CB 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 27 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 27 00 00 00
 command: CD 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: CE 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC5-BP6/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC5-BP6/0,-1.ir
index bc31242b..797c5628 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC5-BP6/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC5-BP6/0,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,37 +91,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,49 +169,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC7843/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC7843/0,-1.ir
index 3bb1420f..8e5edad3 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC7843/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC7843/0,-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC7925/26,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC7925/26,-1.ir
index 2f23903b..8312974a 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC7925/26,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC7925/26,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -67,19 +67,19 @@ protocol: NECext
 address: 1A 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 1A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 1A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 1A 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1A 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC8244/10,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC8244/10,-1.ir
index 5c769dfa..283568e8 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC8244/10,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC8244/10,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RC8861/1,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RC8861/1,-1.ir
index 71b45471..83f66b67 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RC8861/1,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RC8861/1,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RCLE011/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RCLE011/0,-1.ir
index d123c2ad..4cc2775e 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RCLE011/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RCLE011/0,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,67 +145,67 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RD6834/20,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RD6834/20,-1.ir
index f7eebf92..7be01012 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RD6834/20,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RD6834/20,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: VOL_DWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -103,19 +103,19 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RT150/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RT150/5,-1.ir
index 25c61bfd..14b47d5b 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RT150/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RT150/5,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 70 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 7A 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_RU120/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_RU120/0,-1.ir
index db524779..874e873d 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_RU120/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_RU120/0,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_SBC-RU-520/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_SBC-RU-520/5,-1.ir
index fd5a0a41..98cf06e4 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_SBC-RU-520/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_SBC-RU-520/5,-1.ir
@@ -157,7 +157,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: tv/mute
+name: tv/MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_SBC/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_SBC/0,-1.ir
index 8f1bc375..6445ab82 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_SBC/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_SBC/0,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: Shift_Power
+name: Shift_POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_SF172/39,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_SF172/39,-1.ir
index 73c1dc1a..8eb1ef9f 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_SF172/39,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_SF172/39,-1.ir
@@ -1,217 +1,217 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 09 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 21 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 54 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 55 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 70 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 75 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 84 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: B0 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: CB 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 27 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_SRM5100/4,15.ir b/_CSV-IRDB_/P/Philips/Unknown_SRM5100/4,15.ir
index 5191fad4..17c7dc73 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_SRM5100/4,15.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_SRM5100/4,15.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -85,79 +85,79 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -169,55 +169,55 @@ protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -241,31 +241,31 @@ protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_SRU/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_SRU/0,-1.ir
index 70ce58de..baa97489 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_SRU/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_SRU/0,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,55 +169,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,37 +229,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_TIVO/133,48.ir b/_CSV-IRDB_/P/Philips/Unknown_TIVO/133,48.ir
index 89964cce..4842d1ab 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_TIVO/133,48.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_TIVO/133,48.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: 85 30 00 00
 command: 00 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 15 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 85 30 00 00
 command: 18 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -55,25 +55,25 @@ protocol: NECext
 address: 85 30 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 20 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 85 30 00 00
 command: 22 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 23 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 24 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 25 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -115,73 +115,73 @@ protocol: NECext
 address: 85 30 00 00
 command: 27 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 28 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 29 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 30 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 31 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 32 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 85 30 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_TIVO34/133,48.ir b/_CSV-IRDB_/P/Philips/Unknown_TIVO34/133,48.ir
index 99f11593..56324b72 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_TIVO34/133,48.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_TIVO34/133,48.ir
@@ -13,37 +13,37 @@ protocol: NECext
 address: 85 30 00 00
 command: 10 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 13 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 15 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 85 30 00 00
 command: 18 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -67,43 +67,43 @@ protocol: NECext
 address: 85 30 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 20 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 85 30 00 00
 command: 22 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 23 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 24 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 25 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -145,73 +145,73 @@ protocol: NECext
 address: 85 30 00 00
 command: 27 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 28 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 29 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 30 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 31 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 32 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 85 30 00 00
 command: 34 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 85 30 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_TV/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_TV/0,-1.ir
index cabd35b4..99b41b89 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_TV/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_TV/0,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_VCR/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_VCR/5,-1.ir
index d88102d9..e52dbb24 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_VCR/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_VCR/5,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -97,43 +97,43 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_VR175/5,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_VR175/5,-1.ir
index 59360476..c32a54bb 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_VR175/5,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_VR175/5,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -109,25 +109,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_digital/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_digital/0,-1.ir
index 3e8df1bc..ac86d875 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_digital/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_digital/0,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,31 +73,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_dvd712/4,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_dvd712/4,-1.ir
index d9a1c8c9..caf4566c 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_dvd712/4,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_dvd712/4,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 82 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 04 00 00 00
 command: EF 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_philips-rc2592-MODE-v1/8,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_philips-rc2592-MODE-v1/8,-1.ir
index f9b1add5..0ce3d95a 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_philips-rc2592-MODE-v1/8,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_philips-rc2592-MODE-v1/8,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 23 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -127,61 +127,61 @@ protocol: NECext
 address: 08 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_rd5860.conf/20,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_rd5860.conf/20,-1.ir
index 2e390495..3580cdab 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_rd5860.conf/20,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_rd5860.conf/20,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/P/Philips/Unknown_uDigital/0,-1.ir b/_CSV-IRDB_/P/Philips/Unknown_uDigital/0,-1.ir
index 02e08328..d8be6e1c 100644
--- a/_CSV-IRDB_/P/Philips/Unknown_uDigital/0,-1.ir
+++ b/_CSV-IRDB_/P/Philips/Unknown_uDigital/0,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Phonotrend/Unknown_Prestige/4,-1.ir b/_CSV-IRDB_/P/Phonotrend/Unknown_Prestige/4,-1.ir
index def88dd0..5e174d9e 100644
--- a/_CSV-IRDB_/P/Phonotrend/Unknown_Prestige/4,-1.ir
+++ b/_CSV-IRDB_/P/Phonotrend/Unknown_Prestige/4,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -49,49 +49,49 @@ protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -103,61 +103,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -241,19 +241,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_300i/17,20.ir b/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_300i/17,20.ir
index 24de2a14..f44f67a3 100644
--- a/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_300i/17,20.ir
+++ b/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_300i/17,20.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 11 14 00 00
 command: 07 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 11 14 00 00
@@ -19,115 +19,115 @@ protocol: NECext
 address: 11 14 00 00
 command: 0A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 1E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 26 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 29 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 2D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 2E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 3D 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 88 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 8C 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 99 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 9E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: 9F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: A8 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: A9 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: AA 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: AB 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: B7 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 11 14 00 00
@@ -139,115 +139,115 @@ protocol: NECext
 address: 11 14 00 00
 command: D1 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: D2 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: D3 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: D4 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: D5 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: D6 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: DB 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: DC 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: E1 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F1 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F2 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F3 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F4 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F5 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F6 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F7 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F8 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: F9 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 14 00 00
 command: FA 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 11 14 00 00
diff --git a/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_800i/7,-1.ir b/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_800i/7,-1.ir
index 092fe60f..7df68b6d 100644
--- a/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_800i/7,-1.ir
+++ b/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_800i/7,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: key_mute
+name: mute
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: key_menu
+name: menu
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: key_volumeup
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 03 00 00 00
 #
-name: key_channelup
+name: channelup
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: key_volumedown
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: key_channeldown
+name: channeldown
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 21 00 00 00
 #
-name: key_screen
+name: screen
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -103,49 +103,49 @@ protocol: NECext
 address: 07 00 00 00
 command: 27 00 00 00
 #
-name: key_t
+name: t
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: key_rewind
+name: rewind
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2D 00 00 00
 #
-name: key_playpause
+name: playpause
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 30 00 00 00
 #
-name: key_fastforward
+name: fastforward
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 33 00 00 00
 #
-name: key_record
+name: record
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 36 00 00 00
 #
-name: key_power
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 39 00 00 00
 #
-name: key_stop
+name: stop
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 3C 00 00 00
 #
-name: key_question
+name: question
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_PCTV/7,-1.ir b/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_PCTV/7,-1.ir
index 1eb34461..7b8fb9a8 100644
--- a/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_PCTV/7,-1.ir
+++ b/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_PCTV/7,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -19,103 +19,103 @@ protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 03 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 07 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_RC-42D/7,-1.ir b/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_RC-42D/7,-1.ir
index e2099edf..df2a4c26 100644
--- a/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_RC-42D/7,-1.ir
+++ b/_CSV-IRDB_/P/Pinnacle_Systems/Unknown_RC-42D/7,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -49,79 +49,79 @@ protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 23 00 00 00
 #
-name: KEY_END
+name: END
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 07 00 00 00
 command: 25 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 26 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 27 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 28 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -229,19 +229,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 33 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 36 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 39 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Amplifier/165,-1.ir b/_CSV-IRDB_/P/Pioneer/Amplifier/165,-1.ir
index d814f1e7..0b868f74 100644
--- a/_CSV-IRDB_/P/Pioneer/Amplifier/165,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Amplifier/165,-1.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: A5 00 00 00
 command: 08 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A5 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A5 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Cable_Box/172,-1.ir b/_CSV-IRDB_/P/Pioneer/Cable_Box/172,-1.ir
index 082797e3..81ec5ace 100644
--- a/_CSV-IRDB_/P/Pioneer/Cable_Box/172,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Cable_Box/172,-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: AC 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: AC 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: AC 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Receiver/164,-1.ir b/_CSV-IRDB_/P/Pioneer/Receiver/164,-1.ir
index 4bad286c..fb9f5f31 100644
--- a/_CSV-IRDB_/P/Pioneer/Receiver/164,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Receiver/164,-1.ir
@@ -85,7 +85,7 @@ protocol: NECext
 address: A4 00 00 00
 command: 4D 00 00 00
 #
-name: FREQ/CH_UP
+name: FREQ/CH+
 type: parsed
 protocol: NECext
 address: A4 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Receiver/165,-1.ir b/_CSV-IRDB_/P/Pioneer/Receiver/165,-1.ir
index 129dc015..a2a4fb9c 100644
--- a/_CSV-IRDB_/P/Pioneer/Receiver/165,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Receiver/165,-1.ir
@@ -31,13 +31,13 @@ protocol: NECext
 address: A5 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: A5 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: A5 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/TV/170,-1.ir b/_CSV-IRDB_/P/Pioneer/TV/170,-1.ir
index 4386ec56..f949c951 100644
--- a/_CSV-IRDB_/P/Pioneer/TV/170,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/TV/170,-1.ir
@@ -61,7 +61,7 @@ protocol: NECext
 address: AA 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: AA 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: AA 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: AA 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_AXD-1531/170,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_AXD-1531/170,-1.ir
index 9cdf0438..c1253118 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_AXD-1531/170,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_AXD-1531/170,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: AA 00 00 00
@@ -85,43 +85,43 @@ protocol: NECext
 address: AA 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 24 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 25 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 26 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 27 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 28 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: AA 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: AA 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: AA 00 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: AA 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: AA 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: AA 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: AA 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: AA 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_AXD-7306/166,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_AXD-7306/166,-1.ir
index 9833bee1..393afdfd 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_AXD-7306/166,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_AXD-7306/166,-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 44 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 72 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: A6 00 00 00
@@ -55,31 +55,31 @@ protocol: NECext
 address: A6 00 00 00
 command: 74 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 90 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 91 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 92 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 93 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A6 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: A6 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: A6 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: A6 00 00 00
 command: A0 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: A0 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: A6 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CD/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CD/162,-1.ir
index d086e13d..fdb706a1 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CD/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CD/162,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: A2 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -151,67 +151,67 @@ protocol: NECext
 address: A2 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 89 00 00 00
 #
-name: KEY_0_Prefix
+name: 0_Prefix
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CU-CLD067/168,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CU-CLD067/168,-1.ir
index 94145ed5..50607d52 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CU-CLD067/168,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CU-CLD067/168,-1.ir
@@ -13,31 +13,31 @@ protocol: NECext
 address: A8 00 00 00
 command: 11 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: A8 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: A8 00 00 00
 command: 44 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 45 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: A8 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: A8 00 00 00
 command: 47 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: A8 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: A8 00 00 00
 command: 50 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 52 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A8 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CU-CLD106/168,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CU-CLD106/168,-1.ir
index 615e3a6f..d3c8893e 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CU-CLD106/168,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CU-CLD106/168,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 09 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 10 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A8 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: A8 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A8 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: A8 00 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: A8 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: A8 00 00 00
 command: 43 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 44 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A8 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD008/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD008/162,-1.ir
index fae2d817..db278df4 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD008/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD008/162,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: A2 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -109,31 +109,31 @@ protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 43 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: A2 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 51 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD038/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD038/162,-1.ir
index 0f93eaeb..dda0c9eb 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD038/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD038/162,-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: A2 00 00 00
 command: 09 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: A2 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: A2 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD046/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD046/162,-1.ir
index 08f2dc49..d86103de 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD046/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD046/162,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD069/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD069/162,-1.ir
index 13ee292c..92c3d95b 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD069/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD069/162,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 09 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -73,37 +73,37 @@ protocol: NECext
 address: A2 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: A2 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD085/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD085/162,-1.ir
index 46a39c7b..52559486 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD085/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD085/162,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -91,37 +91,37 @@ protocol: NECext
 address: A2 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 10 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD089/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD089/162,-1.ir
index 3fda99e6..403b8458 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD089/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_CU-PD089/162,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 09 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -73,49 +73,49 @@ protocol: NECext
 address: A2 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: A2 00 00 00
 command: 43 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: A2 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: A2 00 00 00
 command: C2 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_DEH-D8850/0,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_DEH-D8850/0,-1.ir
index f5b4230a..caeb8caa 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_DEH-D8850/0,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_DEH-D8850/0,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,61 +61,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,43 +127,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_PD-M650/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_PD-M650/162,-1.ir
index 89b74610..20d920a7 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_PD-M650/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_PD-M650/162,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 09 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: A2 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: A2 00 00 00
 command: 50 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: A2 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_Pioneer-CU-XR014/2,1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_Pioneer-CU-XR014/2,1.ir
index 5d856b13..c121a21e 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_Pioneer-CU-XR014/2,1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_Pioneer-CU-XR014/2,1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 01 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 02 01 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 01 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 02 01 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 19 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 1C 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 02 01 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 02 01 00 00
 command: 1F 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 02 01 00 00
 command: 20 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 02 01 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 02 01 00 00
 command: 2B 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 02 01 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_VXX2801/163,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_VXX2801/163,-1.ir
index 40d063dc..910b2240 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_VXX2801/163,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_VXX2801/163,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 98 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -115,49 +115,49 @@ protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: A3 00 00 00
@@ -199,25 +199,25 @@ protocol: NECext
 address: A3 00 00 00
 command: 99 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A3 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A3 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_cu-pd096/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_cu-pd096/162,-1.ir
index 24d19f15..b9c4b180 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_cu-pd096/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_cu-pd096/162,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 09 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: A2 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_pioneer/162,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_pioneer/162,-1.ir
index 81a222dc..3d6436a4 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_pioneer/162,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_pioneer/162,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 09 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -73,55 +73,55 @@ protocol: NECext
 address: A2 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 11 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: A2 00 00 00
 command: 41 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 43 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: A2 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 93 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: A2 00 00 00
 command: 95 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 95 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: A2 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: A2 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: A2 00 00 00
diff --git a/_CSV-IRDB_/P/Pioneer/Unknown_pioneer/168,-1.ir b/_CSV-IRDB_/P/Pioneer/Unknown_pioneer/168,-1.ir
index eaa59430..036a914f 100644
--- a/_CSV-IRDB_/P/Pioneer/Unknown_pioneer/168,-1.ir
+++ b/_CSV-IRDB_/P/Pioneer/Unknown_pioneer/168,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A8 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: A8 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 18 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: A8 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: A8 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: A8 00 00 00
 command: 44 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A8 00 00 00
diff --git a/_CSV-IRDB_/P/PixelView/Unknown_2000/63,-1.ir b/_CSV-IRDB_/P/PixelView/Unknown_2000/63,-1.ir
index 067dd21c..2d7abf65 100644
--- a/_CSV-IRDB_/P/PixelView/Unknown_2000/63,-1.ir
+++ b/_CSV-IRDB_/P/PixelView/Unknown_2000/63,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_TAB
+name: TAB
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
@@ -139,157 +139,157 @@ protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_TAB
+name: TAB
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
@@ -307,7 +307,7 @@ protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
@@ -325,7 +325,7 @@ protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
@@ -337,61 +337,61 @@ protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 3F 00 00 00
diff --git a/_CSV-IRDB_/P/PixelView/Unknown_PlayTV/134,107.ir b/_CSV-IRDB_/P/PixelView/Unknown_PlayTV/134,107.ir
index b86a7e91..6bbfce85 100644
--- a/_CSV-IRDB_/P/PixelView/Unknown_PlayTV/134,107.ir
+++ b/_CSV-IRDB_/P/PixelView/Unknown_PlayTV/134,107.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -61,25 +61,25 @@ protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -91,49 +91,49 @@ protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -223,61 +223,61 @@ protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -295,55 +295,55 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/P/Polaroid/Unknown_DVDP-1000/32,-1.ir b/_CSV-IRDB_/P/Polaroid/Unknown_DVDP-1000/32,-1.ir
index 2076d635..547217d0 100644
--- a/_CSV-IRDB_/P/Polaroid/Unknown_DVDP-1000/32,-1.ir
+++ b/_CSV-IRDB_/P/Polaroid/Unknown_DVDP-1000/32,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -13,73 +13,73 @@ protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -97,85 +97,85 @@ protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 18 00 00 00
 #
-name: KEY_1/all
+name: 1/all
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 42 00 00 00
 #
-name: KEY_3d
+name: 3d
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -211,31 +211,31 @@ protocol: NECext
 address: 20 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/P/ProPlay/Unknown_PS2/0,246.ir b/_CSV-IRDB_/P/ProPlay/Unknown_PS2/0,246.ir
index c62bebe2..024e93f6 100644
--- a/_CSV-IRDB_/P/ProPlay/Unknown_PS2/0,246.ir
+++ b/_CSV-IRDB_/P/ProPlay/Unknown_PS2/0,246.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 00 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 00 F6 00 00
 command: 03 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 04 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -43,19 +43,19 @@ protocol: NECext
 address: 00 F6 00 00
 command: 06 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 07 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 08 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 00 F6 00 00
 command: 0A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
 command: 0D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 F6 00 00
diff --git a/_CSV-IRDB_/P/Proceed/Surround_Processor/5,-1.ir b/_CSV-IRDB_/P/Proceed/Surround_Processor/5,-1.ir
index 52dcffd1..90cd374c 100644
--- a/_CSV-IRDB_/P/Proceed/Surround_Processor/5,-1.ir
+++ b/_CSV-IRDB_/P/Proceed/Surround_Processor/5,-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/P/Proscan/TV/15,-1.ir b/_CSV-IRDB_/P/Proscan/TV/15,-1.ir
index ecd1464c..f2588bbc 100644
--- a/_CSV-IRDB_/P/Proscan/TV/15,-1.ir
+++ b/_CSV-IRDB_/P/Proscan/TV/15,-1.ir
@@ -109,25 +109,25 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/P/Proscan/Unknown_proscan-vcr/14,-1.ir b/_CSV-IRDB_/P/Proscan/Unknown_proscan-vcr/14,-1.ir
index 02fc53f9..fda5dd5a 100644
--- a/_CSV-IRDB_/P/Proscan/Unknown_proscan-vcr/14,-1.ir
+++ b/_CSV-IRDB_/P/Proscan/Unknown_proscan-vcr/14,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 0E 00 00 00
 command: 05 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -31,31 +31,31 @@ protocol: NECext
 address: 0E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 0E 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -91,85 +91,85 @@ protocol: NECext
 address: 0E 00 00 00
 command: 27 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 39 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 0E 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
@@ -199,37 +199,37 @@ protocol: NECext
 address: 0E 00 00 00
 command: 47 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 57 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
 command: 59 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0E 00 00 00
diff --git a/_CSV-IRDB_/P/Protek/Unknown_Protek/1,-1.ir b/_CSV-IRDB_/P/Protek/Unknown_Protek/1,-1.ir
index cbde0787..e0951c7e 100644
--- a/_CSV-IRDB_/P/Protek/Unknown_Protek/1,-1.ir
+++ b/_CSV-IRDB_/P/Protek/Unknown_Protek/1,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -19,79 +19,79 @@ protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/P/Proton/TV/17,-1.ir b/_CSV-IRDB_/P/Proton/TV/17,-1.ir
index 8b170286..fbf0bc50 100644
--- a/_CSV-IRDB_/P/Proton/TV/17,-1.ir
+++ b/_CSV-IRDB_/P/Proton/TV/17,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/P/Proton/TV/3,-1.ir b/_CSV-IRDB_/P/Proton/TV/3,-1.ir
index 6b6c19e5..67c385f1 100644
--- a/_CSV-IRDB_/P/Proton/TV/3,-1.ir
+++ b/_CSV-IRDB_/P/Proton/TV/3,-1.ir
@@ -37,13 +37,13 @@ protocol: NECext
 address: 03 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/P/Proton/TV/4,-1.ir b/_CSV-IRDB_/P/Proton/TV/4,-1.ir
index 63a2d845..947584aa 100644
--- a/_CSV-IRDB_/P/Proton/TV/4,-1.ir
+++ b/_CSV-IRDB_/P/Proton/TV/4,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/P/Provideo/Unknown_PV951/134,107.ir b/_CSV-IRDB_/P/Provideo/Unknown_PV951/134,107.ir
index af6a4d90..3e9ede8d 100644
--- a/_CSV-IRDB_/P/Provideo/Unknown_PV951/134,107.ir
+++ b/_CSV-IRDB_/P/Provideo/Unknown_PV951/134,107.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/P/Provision/Unknown_PR-DVD2.0/1,-1.ir b/_CSV-IRDB_/P/Provision/Unknown_PR-DVD2.0/1,-1.ir
index f121d135..388e8ca8 100644
--- a/_CSV-IRDB_/P/Provision/Unknown_PR-DVD2.0/1,-1.ir
+++ b/_CSV-IRDB_/P/Provision/Unknown_PR-DVD2.0/1,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 44 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 46 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 47 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -175,43 +175,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 51 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/P/Provision/Unknown_PRDVD2166/0,153.ir b/_CSV-IRDB_/P/Provision/Unknown_PRDVD2166/0,153.ir
index 1879a9e4..4bc7423b 100644
--- a/_CSV-IRDB_/P/Provision/Unknown_PRDVD2166/0,153.ir
+++ b/_CSV-IRDB_/P/Provision/Unknown_PRDVD2166/0,153.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 03 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -25,127 +25,127 @@ protocol: NECext
 address: 00 99 00 00
 command: 06 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 09 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0E 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 10 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 13 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 17 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 1F 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 41 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 42 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 44 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 46 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 00 99 00 00
 command: 48 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 49 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 4A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 00 99 00 00
 command: 4D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 4F 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 50 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 51 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 52 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 53 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -229,25 +229,25 @@ protocol: NECext
 address: 00 99 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 56 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 5A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 5C 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 99 00 00
diff --git a/_CSV-IRDB_/P/palmbutler/Unknown_palmbutler/7,-1.ir b/_CSV-IRDB_/P/palmbutler/Unknown_palmbutler/7,-1.ir
index 56332737..33986b07 100644
--- a/_CSV-IRDB_/P/palmbutler/Unknown_palmbutler/7,-1.ir
+++ b/_CSV-IRDB_/P/palmbutler/Unknown_palmbutler/7,-1.ir
@@ -67,19 +67,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/Q/QUADRAL/Unknown_RC-804/19,1.ir b/_CSV-IRDB_/Q/QUADRAL/Unknown_RC-804/19,1.ir
index c283c009..e2a0e2bf 100644
--- a/_CSV-IRDB_/Q/QUADRAL/Unknown_RC-804/19,1.ir
+++ b/_CSV-IRDB_/Q/QUADRAL/Unknown_RC-804/19,1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 09 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 10 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 15 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 16 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 19 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 13 01 00 00
diff --git a/_CSV-IRDB_/Q/Quasar/TV/128,0.ir b/_CSV-IRDB_/Q/Quasar/TV/128,0.ir
index bb21d8d5..b9c435c6 100644
--- a/_CSV-IRDB_/Q/Quasar/TV/128,0.ir
+++ b/_CSV-IRDB_/Q/Quasar/TV/128,0.ir
@@ -67,13 +67,13 @@ protocol: NECext
 address: 80 00 00 00
 command: 19 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 20 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/DSS/15,-1.ir b/_CSV-IRDB_/R/RCA/DSS/15,-1.ir
index a914c1c5..edcff497 100644
--- a/_CSV-IRDB_/R/RCA/DSS/15,-1.ir
+++ b/_CSV-IRDB_/R/RCA/DSS/15,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/DSS/7,-1.ir b/_CSV-IRDB_/R/RCA/DSS/7,-1.ir
index 6e4c9d68..61f76fba 100644
--- a/_CSV-IRDB_/R/RCA/DSS/7,-1.ir
+++ b/_CSV-IRDB_/R/RCA/DSS/7,-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 27 00 00 00
 #
-name: ON/OFF
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/TV/15,-1.ir b/_CSV-IRDB_/R/RCA/TV/15,-1.ir
index 6c2ea94e..93f6087a 100644
--- a/_CSV-IRDB_/R/RCA/TV/15,-1.ir
+++ b/_CSV-IRDB_/R/RCA/TV/15,-1.ir
@@ -127,25 +127,25 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -313,7 +313,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 3C 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/Unknown_BR-RCA/39,-1.ir b/_CSV-IRDB_/R/RCA/Unknown_BR-RCA/39,-1.ir
index 053d1639..0df02867 100644
--- a/_CSV-IRDB_/R/RCA/Unknown_BR-RCA/39,-1.ir
+++ b/_CSV-IRDB_/R/RCA/Unknown_BR-RCA/39,-1.ir
@@ -61,31 +61,31 @@ protocol: NECext
 address: 27 00 00 00
 command: 09 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 0C 00 00 00
 #
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 0D 00 00 00
 #
-name: Vol_Up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 10 00 00 00
 #
-name: Vol_Down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 11 00 00 00
 #
-name: Ch_Up
+name: CH+
 type: parsed
 protocol: NECext
 address: 27 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/Unknown_DTA800b/7,-1.ir b/_CSV-IRDB_/R/RCA/Unknown_DTA800b/7,-1.ir
index cbeb68df..79b1bf6c 100644
--- a/_CSV-IRDB_/R/RCA/Unknown_DTA800b/7,-1.ir
+++ b/_CSV-IRDB_/R/RCA/Unknown_DTA800b/7,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 39 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 57 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 59 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 61 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/Unknown_R130A1/15,-1.ir b/_CSV-IRDB_/R/RCA/Unknown_R130A1/15,-1.ir
index a2977f3b..7726f68b 100644
--- a/_CSV-IRDB_/R/RCA/Unknown_R130A1/15,-1.ir
+++ b/_CSV-IRDB_/R/RCA/Unknown_R130A1/15,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -13,19 +13,19 @@ protocol: NECext
 address: 0F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 07 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -43,133 +43,133 @@ protocol: NECext
 address: 0F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 39 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 57 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: A3 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/Unknown_RCA-F20507CP/15,-1.ir b/_CSV-IRDB_/R/RCA/Unknown_RCA-F20507CP/15,-1.ir
index a04b8e8d..952fd903 100644
--- a/_CSV-IRDB_/R/RCA/Unknown_RCA-F20507CP/15,-1.ir
+++ b/_CSV-IRDB_/R/RCA/Unknown_RCA-F20507CP/15,-1.ir
@@ -13,97 +13,97 @@ protocol: NECext
 address: 0F 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 39 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/Unknown_RCZ/135,94.ir b/_CSV-IRDB_/R/RCA/Unknown_RCZ/135,94.ir
index b51f802e..63b9655d 100644
--- a/_CSV-IRDB_/R/RCA/Unknown_RCZ/135,94.ir
+++ b/_CSV-IRDB_/R/RCA/Unknown_RCZ/135,94.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 87 5E 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 87 5E 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 87 5E 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 12 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 87 5E 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 15 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 87 5E 00 00
 command: 16 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 17 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 18 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 87 5E 00 00
 command: 1C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1D 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 87 5E 00 00
 command: 21 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
diff --git a/_CSV-IRDB_/R/RCA/Unknown_TV/15,-1.ir b/_CSV-IRDB_/R/RCA/Unknown_TV/15,-1.ir
index 8223e4ff..82338f55 100644
--- a/_CSV-IRDB_/R/RCA/Unknown_TV/15,-1.ir
+++ b/_CSV-IRDB_/R/RCA/Unknown_TV/15,-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 0F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/R/RCA/VCR/15,-1.ir b/_CSV-IRDB_/R/RCA/VCR/15,-1.ir
index bcc32015..55b21853 100644
--- a/_CSV-IRDB_/R/RCA/VCR/15,-1.ir
+++ b/_CSV-IRDB_/R/RCA/VCR/15,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/R/Radio_Shack/Unknown_RS2142/5,-1.ir b/_CSV-IRDB_/R/Radio_Shack/Unknown_RS2142/5,-1.ir
index f4c7088a..4d30e84f 100644
--- a/_CSV-IRDB_/R/Radio_Shack/Unknown_RS2142/5,-1.ir
+++ b/_CSV-IRDB_/R/Radio_Shack/Unknown_RS2142/5,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -121,67 +121,67 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/R/Radio_Shack/Unknown_RadioShack/3,1.ir b/_CSV-IRDB_/R/Radio_Shack/Unknown_RadioShack/3,1.ir
index 5e4df253..2332e209 100644
--- a/_CSV-IRDB_/R/Radio_Shack/Unknown_RadioShack/3,1.ir
+++ b/_CSV-IRDB_/R/Radio_Shack/Unknown_RadioShack/3,1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 03 01 00 00
 command: 20 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 03 01 00 00
diff --git a/_CSV-IRDB_/R/Radio_Shack/Unknown_Radioshack2115/5,-1.ir b/_CSV-IRDB_/R/Radio_Shack/Unknown_Radioshack2115/5,-1.ir
index c886552d..11de86f4 100644
--- a/_CSV-IRDB_/R/Radio_Shack/Unknown_Radioshack2115/5,-1.ir
+++ b/_CSV-IRDB_/R/Radio_Shack/Unknown_Radioshack2115/5,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -121,67 +121,67 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/R/Radix/Unknown_Alpha/138,245.ir b/_CSV-IRDB_/R/Radix/Unknown_Alpha/138,245.ir
index d72f299c..f5b41804 100644
--- a/_CSV-IRDB_/R/Radix/Unknown_Alpha/138,245.ir
+++ b/_CSV-IRDB_/R/Radix/Unknown_Alpha/138,245.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 03 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 8A F5 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 8A F5 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 8A F5 00 00
 command: 1D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
diff --git a/_CSV-IRDB_/R/Radix/Unknown_DT-X1/0,127.ir b/_CSV-IRDB_/R/Radix/Unknown_DT-X1/0,127.ir
index fe43ff02..fe76138e 100644
--- a/_CSV-IRDB_/R/Radix/Unknown_DT-X1/0,127.ir
+++ b/_CSV-IRDB_/R/Radix/Unknown_DT-X1/0,127.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 03 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 07 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 11 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -115,85 +115,85 @@ protocol: NECext
 address: 00 7F 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 14 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 15 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 16 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1B 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 42 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 44 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/_CSV-IRDB_/R/Radix/Unknown_DTR-9000-Twin/0,127.ir b/_CSV-IRDB_/R/Radix/Unknown_DTR-9000-Twin/0,127.ir
index 8f62f136..efc0be02 100644
--- a/_CSV-IRDB_/R/Radix/Unknown_DTR-9000-Twin/0,127.ir
+++ b/_CSV-IRDB_/R/Radix/Unknown_DTR-9000-Twin/0,127.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 03 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 07 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 00 7F 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 11 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 12 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 14 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 00 7F 00 00
 command: 17 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 7F 00 00
 command: 1E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 00 7F 00 00
 command: 40 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 41 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 42 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 43 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 00 7F 00 00
 command: 45 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 46 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/_CSV-IRDB_/R/Radix/Unknown_SAT/138,245.ir b/_CSV-IRDB_/R/Radix/Unknown_SAT/138,245.ir
index 112595be..be80fb0b 100644
--- a/_CSV-IRDB_/R/Radix/Unknown_SAT/138,245.ir
+++ b/_CSV-IRDB_/R/Radix/Unknown_SAT/138,245.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -31,61 +31,61 @@ protocol: NECext
 address: 8A F5 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 07 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 8A F5 00 00
 command: 16 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 8A F5 00 00
 command: 18 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 1A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
diff --git a/_CSV-IRDB_/R/Radix/Unknown_lircd.conf/0,127.ir b/_CSV-IRDB_/R/Radix/Unknown_lircd.conf/0,127.ir
index 1e6c8c95..03277d13 100644
--- a/_CSV-IRDB_/R/Radix/Unknown_lircd.conf/0,127.ir
+++ b/_CSV-IRDB_/R/Radix/Unknown_lircd.conf/0,127.ir
@@ -1,133 +1,133 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 03 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 07 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 0F 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 11 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 12 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 14 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 15 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 00 7F 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 1A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 00 7F 00 00
 command: 42 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 44 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 7F 00 00
diff --git a/_CSV-IRDB_/R/Radix/Unknown_radix/138,245.ir b/_CSV-IRDB_/R/Radix/Unknown_radix/138,245.ir
index ddce0e32..ce9d236a 100644
--- a/_CSV-IRDB_/R/Radix/Unknown_radix/138,245.ir
+++ b/_CSV-IRDB_/R/Radix/Unknown_radix/138,245.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -31,55 +31,55 @@ protocol: NECext
 address: 8A F5 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 07 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 8A F5 00 00
 command: 0F 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 8A F5 00 00
 command: 16 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 17 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 18 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 8A F5 00 00
diff --git a/_CSV-IRDB_/R/Raite/Unknown_RaiteDVD-7xx/32,-1.ir b/_CSV-IRDB_/R/Raite/Unknown_RaiteDVD-7xx/32,-1.ir
index 00c845a7..835de478 100644
--- a/_CSV-IRDB_/R/Raite/Unknown_RaiteDVD-7xx/32,-1.ir
+++ b/_CSV-IRDB_/R/Raite/Unknown_RaiteDVD-7xx/32,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -43,55 +43,55 @@ protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/R/Ranex/Unknown_RGB/64,-1.ir b/_CSV-IRDB_/R/Ranex/Unknown_RGB/64,-1.ir
index 5f4026a9..c685a0ba 100644
--- a/_CSV-IRDB_/R/Ranex/Unknown_RGB/64,-1.ir
+++ b/_CSV-IRDB_/R/Ranex/Unknown_RGB/64,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 18 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/R/Re.x/Unknown_SDVD/0,-1.ir b/_CSV-IRDB_/R/Re.x/Unknown_SDVD/0,-1.ir
index d68fabb9..98acfcf5 100644
--- a/_CSV-IRDB_/R/Re.x/Unknown_SDVD/0,-1.ir
+++ b/_CSV-IRDB_/R/Re.x/Unknown_SDVD/0,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,49 +25,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,31 +79,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,115 +121,115 @@ protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_3d
+name: 3d
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -289,13 +289,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/R/Recor/Unknown_IRC-1304/7,-1.ir b/_CSV-IRDB_/R/Recor/Unknown_IRC-1304/7,-1.ir
index 1df4e4e5..30bf6af9 100644
--- a/_CSV-IRDB_/R/Recor/Unknown_IRC-1304/7,-1.ir
+++ b/_CSV-IRDB_/R/Recor/Unknown_IRC-1304/7,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -79,67 +79,67 @@ protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 19 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 25 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 28 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 31 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 33 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 36 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/R/Rega/Receiver/16,-1.ir b/_CSV-IRDB_/R/Rega/Receiver/16,-1.ir
index 480a5763..26966ab3 100644
--- a/_CSV-IRDB_/R/Rega/Receiver/16,-1.ir
+++ b/_CSV-IRDB_/R/Rega/Receiver/16,-1.ir
@@ -49,13 +49,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/R/ReplayTV/Unknown_5000/1,0.ir b/_CSV-IRDB_/R/ReplayTV/Unknown_5000/1,0.ir
index 455cfe9c..f7d6adf1 100644
--- a/_CSV-IRDB_/R/ReplayTV/Unknown_5000/1,0.ir
+++ b/_CSV-IRDB_/R/ReplayTV/Unknown_5000/1,0.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -73,61 +73,61 @@ protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 22 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 23 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 26 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/R/Revo/Unknown_Blik/0,-1.ir b/_CSV-IRDB_/R/Revo/Unknown_Blik/0,-1.ir
index ca05c9a5..d0893d30 100644
--- a/_CSV-IRDB_/R/Revo/Unknown_Blik/0,-1.ir
+++ b/_CSV-IRDB_/R/Revo/Unknown_Blik/0,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,73 +91,73 @@ protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/R/Revoy/Unknown_Revoy2200/0,153.ir b/_CSV-IRDB_/R/Revoy/Unknown_Revoy2200/0,153.ir
index 2feec904..97b8816d 100644
--- a/_CSV-IRDB_/R/Revoy/Unknown_Revoy2200/0,153.ir
+++ b/_CSV-IRDB_/R/Revoy/Unknown_Revoy2200/0,153.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -13,61 +13,61 @@ protocol: NECext
 address: 00 99 00 00
 command: 04 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 05 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 06 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 09 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -79,31 +79,31 @@ protocol: NECext
 address: 00 99 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 10 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 13 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 00 99 00 00
 command: 1F 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 41 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 00 99 00 00
 command: 44 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 46 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 00 99 00 00
 command: 48 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 49 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 4A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 4B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -199,37 +199,37 @@ protocol: NECext
 address: 00 99 00 00
 command: 4E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 4F 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 50 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 51 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 52 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 53 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 00 99 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 56 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 00 99 00 00
 command: 5C 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 5D 00 00 00
 #
-name: X_KEY_3d
+name: X_3d
 type: parsed
 protocol: NECext
 address: 00 99 00 00
diff --git a/_CSV-IRDB_/R/Rio/Unknown_Audio/130,19.ir b/_CSV-IRDB_/R/Rio/Unknown_Audio/130,19.ir
index a1b1966c..23b898a0 100644
--- a/_CSV-IRDB_/R/Rio/Unknown_Audio/130,19.ir
+++ b/_CSV-IRDB_/R/Rio/Unknown_Audio/130,19.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 80 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 81 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 82 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 83 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 84 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 82 13 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 82 13 00 00
 command: 86 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 87 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 82 13 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 82 13 00 00
 command: 89 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 82 13 00 00
@@ -73,91 +73,91 @@ protocol: NECext
 address: 82 13 00 00
 command: 8C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 8D 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 8E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 90 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 91 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 92 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 93 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 94 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 95 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 99 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 9A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 9C 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 9D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 82 13 00 00
 command: 9E 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 82 13 00 00
diff --git a/_CSV-IRDB_/R/Roku/Unknown_Netflix/190,239.ir b/_CSV-IRDB_/R/Roku/Unknown_Netflix/190,239.ir
index 25b4cbb4..c1fe1512 100644
--- a/_CSV-IRDB_/R/Roku/Unknown_Netflix/190,239.ir
+++ b/_CSV-IRDB_/R/Roku/Unknown_Netflix/190,239.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: BE EF 00 00
 command: 00 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: BE EF 00 00
 command: 01 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: BE EF 00 00
 command: 02 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: BE EF 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: BE EF 00 00
 command: 04 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: BE EF 00 00
 command: 05 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: BE EF 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: BE EF 00 00
 command: 07 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: BE EF 00 00
diff --git a/_CSV-IRDB_/R/Roku/Unknown_Soundbridge/111,-1.ir b/_CSV-IRDB_/R/Roku/Unknown_Soundbridge/111,-1.ir
index 7ec97dc1..6849f4a8 100644
--- a/_CSV-IRDB_/R/Roku/Unknown_Soundbridge/111,-1.ir
+++ b/_CSV-IRDB_/R/Roku/Unknown_Soundbridge/111,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 14 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 6F 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 40 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 6F 00 00 00
 command: 42 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
 command: 43 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6F 00 00 00
diff --git a/_CSV-IRDB_/R/Rolsen/Unknown_DK5A/1,-1.ir b/_CSV-IRDB_/R/Rolsen/Unknown_DK5A/1,-1.ir
index 0d6f3e58..59496b91 100644
--- a/_CSV-IRDB_/R/Rolsen/Unknown_DK5A/1,-1.ir
+++ b/_CSV-IRDB_/R/Rolsen/Unknown_DK5A/1,-1.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -157,97 +157,97 @@ protocol: NECext
 address: 01 00 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 43 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 44 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 45 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 56 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/R/Rolsen/Unknown_K10B-C1/14,14.ir b/_CSV-IRDB_/R/Rolsen/Unknown_K10B-C1/14,14.ir
index a08b11bb..7c6e1fb1 100644
--- a/_CSV-IRDB_/R/Rolsen/Unknown_K10B-C1/14,14.ir
+++ b/_CSV-IRDB_/R/Rolsen/Unknown_K10B-C1/14,14.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 0B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 0C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 0E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 0E 0E 00 00
 command: 16 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
 command: 18 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0E 0E 00 00
diff --git a/_CSV-IRDB_/R/Rotel/Unknown_RR-925/131,18.ir b/_CSV-IRDB_/R/Rotel/Unknown_RR-925/131,18.ir
index 8d8487a7..710cb6d0 100644
--- a/_CSV-IRDB_/R/Rotel/Unknown_RR-925/131,18.ir
+++ b/_CSV-IRDB_/R/Rotel/Unknown_RR-925/131,18.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 83 12 00 00
 command: 00 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 01 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 83 12 00 00
@@ -37,115 +37,115 @@ protocol: NECext
 address: 83 12 00 00
 command: 06 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 09 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 0A 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 0F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 15 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 17 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 1D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 83 12 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 12 00 00
diff --git a/_CSV-IRDB_/R/Rowa/Unknown_RDVD104/0,-1.ir b/_CSV-IRDB_/R/Rowa/Unknown_RDVD104/0,-1.ir
index c5b4ee96..5896af19 100644
--- a/_CSV-IRDB_/R/Rowa/Unknown_RDVD104/0,-1.ir
+++ b/_CSV-IRDB_/R/Rowa/Unknown_RDVD104/0,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,25 +25,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,43 +61,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,37 +223,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -265,7 +265,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/R/remotec/Unknown_TV/0,-1.ir b/_CSV-IRDB_/R/remotec/Unknown_TV/0,-1.ir
index 0aecdb68..f2e6f799 100644
--- a/_CSV-IRDB_/R/remotec/Unknown_TV/0,-1.ir
+++ b/_CSV-IRDB_/R/remotec/Unknown_TV/0,-1.ir
@@ -79,19 +79,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: tv-mute
+name: tv-MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: tv-vol-up
+name: tv-VOL-up
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: tv-vol-down
+name: tv-VOL-down
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/R/remotec/Unknown_remotec/0,-1.ir b/_CSV-IRDB_/R/remotec/Unknown_remotec/0,-1.ir
index 3a4f1fa8..1c43669a 100644
--- a/_CSV-IRDB_/R/remotec/Unknown_remotec/0,-1.ir
+++ b/_CSV-IRDB_/R/remotec/Unknown_remotec/0,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,37 +115,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/R/remotec/Unknown_remotec1072/5,-1.ir b/_CSV-IRDB_/R/remotec/Unknown_remotec1072/5,-1.ir
index 0ae90b9f..8050dcc7 100644
--- a/_CSV-IRDB_/R/remotec/Unknown_remotec1072/5,-1.ir
+++ b/_CSV-IRDB_/R/remotec/Unknown_remotec1072/5,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/R/remotec/Unknown_rm200/1,-1.ir b/_CSV-IRDB_/R/remotec/Unknown_rm200/1,-1.ir
index 38b63dcc..1557c51b 100644
--- a/_CSV-IRDB_/R/remotec/Unknown_rm200/1,-1.ir
+++ b/_CSV-IRDB_/R/remotec/Unknown_rm200/1,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 27 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -97,43 +97,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 30 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 39 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/R/roadstar/Unknown_dvd/136,-1.ir b/_CSV-IRDB_/R/roadstar/Unknown_dvd/136,-1.ir
index 25ec6161..ce572dce 100644
--- a/_CSV-IRDB_/R/roadstar/Unknown_dvd/136,-1.ir
+++ b/_CSV-IRDB_/R/roadstar/Unknown_dvd/136,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 09 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 10 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 11 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 13 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -127,37 +127,37 @@ protocol: NECext
 address: 88 00 00 00
 command: 15 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 88 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 88 00 00 00
@@ -199,43 +199,43 @@ protocol: NECext
 address: 88 00 00 00
 command: 41 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 42 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 44 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 46 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 88 00 00 00
 command: 47 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 88 00 00 00
diff --git a/_CSV-IRDB_/R/rubin/Unknown_rubin/0,-1.ir b/_CSV-IRDB_/R/rubin/Unknown_rubin/0,-1.ir
index 62ed367d..01609b3b 100644
--- a/_CSV-IRDB_/R/rubin/Unknown_rubin/0,-1.ir
+++ b/_CSV-IRDB_/R/rubin/Unknown_rubin/0,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/SAB/Unknown_Explorer/1,-1.ir b/_CSV-IRDB_/S/SAB/Unknown_Explorer/1,-1.ir
index ee4b95b0..764e9446 100644
--- a/_CSV-IRDB_/S/SAB/Unknown_Explorer/1,-1.ir
+++ b/_CSV-IRDB_/S/SAB/Unknown_Explorer/1,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 56 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/SABA/Unknown_SabaTC460/7,-1.ir b/_CSV-IRDB_/S/SABA/Unknown_SabaTC460/7,-1.ir
index e0ab8b2b..09ffa7df 100644
--- a/_CSV-IRDB_/S/SABA/Unknown_SabaTC460/7,-1.ir
+++ b/_CSV-IRDB_/S/SABA/Unknown_SabaTC460/7,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -31,31 +31,31 @@ protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 25 00 00 00
 #
-name: KEY_S
+name: S
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 28 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 29 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 35 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/S/SABA/Unknown_TC3003/7,-1.ir b/_CSV-IRDB_/S/SABA/Unknown_TC3003/7,-1.ir
index 7423f25c..409c6506 100644
--- a/_CSV-IRDB_/S/SABA/Unknown_TC3003/7,-1.ir
+++ b/_CSV-IRDB_/S/SABA/Unknown_TC3003/7,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 29 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/S/SEG/Unknown_E6900-X020A/2,-1.ir b/_CSV-IRDB_/S/SEG/Unknown_E6900-X020A/2,-1.ir
index 1eacd125..2b5a4314 100644
--- a/_CSV-IRDB_/S/SEG/Unknown_E6900-X020A/2,-1.ir
+++ b/_CSV-IRDB_/S/SEG/Unknown_E6900-X020A/2,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 02 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 02 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -229,49 +229,49 @@ protocol: NECext
 address: 02 00 00 00
 command: 46 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 47 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 48 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -283,13 +283,13 @@ protocol: NECext
 address: 02 00 00 00
 command: 50 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/S/SEG/Unknown_SEG-DVD-430/32,-1.ir b/_CSV-IRDB_/S/SEG/Unknown_SEG-DVD-430/32,-1.ir
index 4efaf853..ddfbbd83 100644
--- a/_CSV-IRDB_/S/SEG/Unknown_SEG-DVD-430/32,-1.ir
+++ b/_CSV-IRDB_/S/SEG/Unknown_SEG-DVD-430/32,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -13,73 +13,73 @@ protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: X_KEY_1-all
+name: X_1-all
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -121,49 +121,49 @@ protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -205,31 +205,31 @@ protocol: NECext
 address: 20 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/S/SEG/Unknown_SR-040/133,115.ir b/_CSV-IRDB_/S/SEG/Unknown_SR-040/133,115.ir
index a3deb647..c3a0b4e5 100644
--- a/_CSV-IRDB_/S/SEG/Unknown_SR-040/133,115.ir
+++ b/_CSV-IRDB_/S/SEG/Unknown_SR-040/133,115.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 80 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 81 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 82 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 83 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 84 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 85 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 87 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 88 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 85 73 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 85 73 00 00
 command: 8F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 85 73 00 00
 command: 90 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 85 73 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 85 73 00 00
 command: 92 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 85 73 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 85 73 00 00
 command: 96 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 85 73 00 00
diff --git a/_CSV-IRDB_/S/SEG/Unknown_SR-201/66,253.ir b/_CSV-IRDB_/S/SEG/Unknown_SR-201/66,253.ir
index 775df679..96081967 100644
--- a/_CSV-IRDB_/S/SEG/Unknown_SR-201/66,253.ir
+++ b/_CSV-IRDB_/S/SEG/Unknown_SR-201/66,253.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 03 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 07 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 42 FD 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 42 FD 00 00
 command: 14 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 16 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 42 FD 00 00
 command: 1D 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 42 FD 00 00
diff --git a/_CSV-IRDB_/S/SEG/Unknown_SR800/4,-1.ir b/_CSV-IRDB_/S/SEG/Unknown_SR800/4,-1.ir
index ad7bc9dc..5cc71c0f 100644
--- a/_CSV-IRDB_/S/SEG/Unknown_SR800/4,-1.ir
+++ b/_CSV-IRDB_/S/SEG/Unknown_SR800/4,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/S/SEG/Unknown_VCR/21,-1.ir b/_CSV-IRDB_/S/SEG/Unknown_VCR/21,-1.ir
index 2883222c..d70b6abb 100644
--- a/_CSV-IRDB_/S/SEG/Unknown_VCR/21,-1.ir
+++ b/_CSV-IRDB_/S/SEG/Unknown_VCR/21,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 11 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 15 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 15 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 15 00 00 00
 command: 27 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/S/SEG/Unknown_VCR2000/134,124.ir b/_CSV-IRDB_/S/SEG/Unknown_VCR2000/134,124.ir
index ff61d38a..a8baacff 100644
--- a/_CSV-IRDB_/S/SEG/Unknown_VCR2000/134,124.ir
+++ b/_CSV-IRDB_/S/SEG/Unknown_VCR2000/134,124.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 02 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 86 7C 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 07 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 86 7C 00 00
 command: 09 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
@@ -79,73 +79,73 @@ protocol: NECext
 address: 86 7C 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 19 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 1E 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
diff --git a/_CSV-IRDB_/S/ST/Unknown_DTTRC-4/1,-1.ir b/_CSV-IRDB_/S/ST/Unknown_DTTRC-4/1,-1.ir
index 7a945e8b..4250b7cc 100644
--- a/_CSV-IRDB_/S/ST/Unknown_DTTRC-4/1,-1.ir
+++ b/_CSV-IRDB_/S/ST/Unknown_DTTRC-4/1,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -19,55 +19,55 @@ protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -85,37 +85,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -193,43 +193,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 43 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 44 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 45 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 46 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/ST/Unknown_HMP/8,-1.ir b/_CSV-IRDB_/S/ST/Unknown_HMP/8,-1.ir
index 02cbf1bf..ca6f9c65 100644
--- a/_CSV-IRDB_/S/ST/Unknown_HMP/8,-1.ir
+++ b/_CSV-IRDB_/S/ST/Unknown_HMP/8,-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -121,49 +121,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 21 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 22 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 23 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 24 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 25 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -181,31 +181,31 @@ protocol: NECext
 address: 08 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 54 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 60 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/S/STRONG/Unknown_STRONG/128,119.ir b/_CSV-IRDB_/S/STRONG/Unknown_STRONG/128,119.ir
index a4e0005e..e953834e 100644
--- a/_CSV-IRDB_/S/STRONG/Unknown_STRONG/128,119.ir
+++ b/_CSV-IRDB_/S/STRONG/Unknown_STRONG/128,119.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 02 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 0A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 0B 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 0D 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 0E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 10 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 13 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 16 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 77 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 80 77 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 80 77 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 80 77 00 00
 command: 1E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 80 77 00 00
 command: 40 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 80 77 00 00
diff --git a/_CSV-IRDB_/S/SUPERSQNY/Unknown_KM-168/0,-1.ir b/_CSV-IRDB_/S/SUPERSQNY/Unknown_KM-168/0,-1.ir
index cdcd8278..0e61b2b3 100644
--- a/_CSV-IRDB_/S/SUPERSQNY/Unknown_KM-168/0,-1.ir
+++ b/_CSV-IRDB_/S/SUPERSQNY/Unknown_KM-168/0,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,133 +31,133 @@ protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_3D
+name: 3D
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -265,13 +265,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/SVEN/Unknown_HT-475/24,-1.ir b/_CSV-IRDB_/S/SVEN/Unknown_HT-475/24,-1.ir
index 7d17fd1f..2fdda188 100644
--- a/_CSV-IRDB_/S/SVEN/Unknown_HT-475/24,-1.ir
+++ b/_CSV-IRDB_/S/SVEN/Unknown_HT-475/24,-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 18 00 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/S/SVEN/Unknown_IHOO/24,-1.ir b/_CSV-IRDB_/S/SVEN/Unknown_IHOO/24,-1.ir
index 78ccaf3a..68744a6c 100644
--- a/_CSV-IRDB_/S/SVEN/Unknown_IHOO/24,-1.ir
+++ b/_CSV-IRDB_/S/SVEN/Unknown_IHOO/24,-1.ir
@@ -55,7 +55,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 19 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/S/Sagem/Unknown_DVB-T-Receiver/135,94.ir b/_CSV-IRDB_/S/Sagem/Unknown_DVB-T-Receiver/135,94.ir
index cfcb5b03..c380243e 100644
--- a/_CSV-IRDB_/S/Sagem/Unknown_DVB-T-Receiver/135,94.ir
+++ b/_CSV-IRDB_/S/Sagem/Unknown_DVB-T-Receiver/135,94.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 09 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -103,73 +103,73 @@ protocol: NECext
 address: 87 5E 00 00
 command: 13 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 15 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 16 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 17 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 18 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 19 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1C 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 87 5E 00 00
 command: 24 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 25 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
diff --git a/_CSV-IRDB_/S/Sagem/Unknown_HD103-C/135,94.ir b/_CSV-IRDB_/S/Sagem/Unknown_HD103-C/135,94.ir
index 1e0dfd78..05584fbe 100644
--- a/_CSV-IRDB_/S/Sagem/Unknown_HD103-C/135,94.ir
+++ b/_CSV-IRDB_/S/Sagem/Unknown_HD103-C/135,94.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 09 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 87 5E 00 00
 command: 0F 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -103,61 +103,61 @@ protocol: NECext
 address: 87 5E 00 00
 command: 13 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 19 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 87 5E 00 00
 command: 24 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
diff --git a/_CSV-IRDB_/S/Sagem/Unknown_Sagem/135,94.ir b/_CSV-IRDB_/S/Sagem/Unknown_Sagem/135,94.ir
index f26537d2..6838cbe4 100644
--- a/_CSV-IRDB_/S/Sagem/Unknown_Sagem/135,94.ir
+++ b/_CSV-IRDB_/S/Sagem/Unknown_Sagem/135,94.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -67,49 +67,49 @@ protocol: NECext
 address: 87 5E 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 10 00 00 00
 #
-name: KEY_Q
+name: Q
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 87 5E 00 00
 command: 13 00 00 00
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -157,31 +157,31 @@ protocol: NECext
 address: 87 5E 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1C 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
 command: 1D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 87 5E 00 00
 command: 21 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 87 5E 00 00
diff --git a/_CSV-IRDB_/S/Salora/Unknown_SV6700/49,-1.ir b/_CSV-IRDB_/S/Salora/Unknown_SV6700/49,-1.ir
index f548129c..7df6477f 100644
--- a/_CSV-IRDB_/S/Salora/Unknown_SV6700/49,-1.ir
+++ b/_CSV-IRDB_/S/Salora/Unknown_SV6700/49,-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 00 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -49,67 +49,67 @@ protocol: NECext
 address: 31 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 15 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/TV/7,7.ir b/_CSV-IRDB_/S/Samsung/TV/7,7.ir
index 89aa4a35..22354642 100644
--- a/_CSV-IRDB_/S/Samsung/TV/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/TV/7,7.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00011k/102,0.ir b/_CSV-IRDB_/S/Samsung/Unknown_00011k/102,0.ir
index fd656d9c..c88f5900 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00011k/102,0.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00011k/102,0.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 89 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 91 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -109,79 +109,79 @@ protocol: NECext
 address: 66 00 00 00
 command: 94 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 95 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 97 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 98 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 99 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A0 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A1 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A2 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 66 00 00 00
 command: A7 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A8 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: AA 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00021c/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_00021c/5,5.ir
index 044967d2..31c5851d 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00021c/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00021c/5,5.ir
@@ -7,127 +7,127 @@ protocol: NECext
 address: 05 05 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 22 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 2B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 2C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 2D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 3A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 3D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 45 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 48 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 66 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00054d/102,0.ir b/_CSV-IRDB_/S/Samsung/Unknown_00054d/102,0.ir
index 46332e4f..dcd28423 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00054d/102,0.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00054d/102,0.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 22 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 89 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -109,85 +109,85 @@ protocol: NECext
 address: 66 00 00 00
 command: 94 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 95 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 97 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 98 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 99 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A0 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A1 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A2 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 66 00 00 00
 command: AA 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 66 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00056A/102,0.ir b/_CSV-IRDB_/S/Samsung/Unknown_00056A/102,0.ir
index ea2c0da5..b1b0b0f7 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00056A/102,0.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00056A/102,0.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 89 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 66 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 91 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 66 00 00 00
 command: 93 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 94 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 95 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 97 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 98 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 99 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -157,43 +157,43 @@ protocol: NECext
 address: 66 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A0 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A1 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A2 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 66 00 00 00
 command: A6 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 66 00 00 00
 command: A9 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: AA 00 00 00
 #
-name: KEY_3D
+name: 3D
 type: parsed
 protocol: NECext
 address: 66 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00077A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_00077A/7,7.ir
index 682aaeda..76475ab4 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00077A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00077A/7,7.ir
@@ -7,103 +7,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00092M/102,0.ir b/_CSV-IRDB_/S/Samsung/Unknown_00092M/102,0.ir
index 0edaeb61..b3dceddd 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00092M/102,0.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00092M/102,0.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 89 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 66 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 91 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 66 00 00 00
 command: 93 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 94 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 95 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 97 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 98 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 99 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 66 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 66 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 66 00 00 00
 command: A1 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A2 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 66 00 00 00
 command: A6 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 66 00 00 00
 command: A9 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: AA 00 00 00
 #
-name: KEY_3D
+name: 3D
 type: parsed
 protocol: NECext
 address: 66 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00092b/102,0.ir b/_CSV-IRDB_/S/Samsung/Unknown_00092b/102,0.ir
index e8042070..a0f9752e 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00092b/102,0.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00092b/102,0.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 89 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 66 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 91 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 66 00 00 00
 command: 93 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 94 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 95 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 97 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 98 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 99 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 66 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 66 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 66 00 00 00
 command: A1 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A2 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 66 00 00 00
 command: A6 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 66 00 00 00
 command: A9 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: AA 00 00 00
 #
-name: KEY_3d
+name: 3d
 type: parsed
 protocol: NECext
 address: 66 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00104J/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_00104J/7,7.ir
index 55ba883d..679bde8b 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00104J/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00104J/7,7.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00104K/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_00104K/7,7.ir
index 02e22f57..f0806f92 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00104K/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00104K/7,7.ir
@@ -7,109 +7,109 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00198f/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_00198f/7,7.ir
index e11e684d..e3eccaf2 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00198f/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00198f/7,7.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_00225A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_00225A/7,7.ir
index ef9d1373..56a45d1f 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_00225A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_00225A/7,7.ir
@@ -7,79 +7,79 @@ protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 07 07 00 00
 command: 12 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 21 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 66 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_01043A/102,0.ir b/_CSV-IRDB_/S/Samsung/Unknown_01043A/102,0.ir
index 4d991a23..733bb3f3 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_01043A/102,0.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_01043A/102,0.ir
@@ -7,43 +7,43 @@ protocol: NECext
 address: 66 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 91 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 94 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 97 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 98 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 99 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 66 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 66 00 00 00
 command: A1 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_10107N/0,-1.ir b/_CSV-IRDB_/S/Samsung/Unknown_10107N/0,-1.ir
index 9164ab56..38a4cec5 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_10107N/0,-1.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_10107N/0,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,49 +97,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_10420A/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_10420A/5,5.ir
index aa783a9f..1aac508e 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_10420A/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_10420A/5,5.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: 05 05 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -43,37 +43,37 @@ protocol: NECext
 address: 05 05 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_528Z/2,-1.ir b/_CSV-IRDB_/S/Samsung/Unknown_528Z/2,-1.ir
index 1424c19c..2296e3e9 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_528Z/2,-1.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_528Z/2,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: vol+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: vol-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00316b/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00316b/7,7.ir
index 1189e6fb..82243821 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00316b/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00316b/7,7.ir
@@ -13,103 +13,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 23 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 07 07 00 00
 command: 3D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 64 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00332D/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00332D/7,7.ir
index 47ba0799..81987510 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00332D/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00332D/7,7.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 3E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00370A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00370A/7,7.ir
index df636cd9..ad3d5fd6 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00370A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00370A/7,7.ir
@@ -13,103 +13,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 21 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -199,37 +199,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 42 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 68 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00382A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00382A/7,7.ir
index 438d7d04..87684260 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00382A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00382A/7,7.ir
@@ -7,109 +7,109 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 07 07 00 00
 command: 22 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 23 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 24 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 07 07 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 64 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00600A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00600A/7,7.ir
index 7ecba7dc..4fb538d5 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AA59-00600A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AA59-00600A/7,7.ir
@@ -1,265 +1,265 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 23 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 25 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 2D 00 00 00
 #
-name: KEY_SWITCHVIDEOMODE
+name: SWITCHVIDEOMODE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 3E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4A 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 68 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 6C 00 00 00
 #
-name: KEY_MEDIA
+name: MEDIA
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AA59-10026E/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_AA59-10026E/5,5.ir
index 90969ba8..9be97338 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AA59-10026E/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AA59-10026E/5,5.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 12 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 05 05 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 30 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 32 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AA64-50236A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_AA64-50236A/7,7.ir
index 93b7e9d8..f9c6cee8 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AA64-50236A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AA64-50236A/7,7.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AH59-01527F/67,83.ir b/_CSV-IRDB_/S/Samsung/Unknown_AH59-01527F/67,83.ir
index d9a9ae16..7e0ccbf1 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AH59-01527F/67,83.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AH59-01527F/67,83.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 43 53 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 43 53 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 05 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 43 53 00 00
 command: 07 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 09 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -55,31 +55,31 @@ protocol: NECext
 address: 43 53 00 00
 command: 0C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 0D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 0E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 0F 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 11 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 43 53 00 00
 command: 14 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 15 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 17 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -115,61 +115,61 @@ protocol: NECext
 address: 43 53 00 00
 command: 18 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 19 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 1B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 1C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 1D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 21 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 23 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 24 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 26 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 43 53 00 00
 command: 2D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 2F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 43 53 00 00
 command: 34 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 35 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 36 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 43 53 00 00
 command: 38 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 39 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -241,49 +241,49 @@ protocol: NECext
 address: 43 53 00 00
 command: 3D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 3F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 41 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 43 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 43 53 00 00
 command: 46 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 43 53 00 00
@@ -295,7 +295,7 @@ protocol: NECext
 address: 43 53 00 00
 command: 59 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 43 53 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_AH59-02345A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_AH59-02345A/7,7.ir
index 3d1d4e88..5a05f420 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_AH59-02345A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_AH59-02345A/7,7.ir
@@ -1,211 +1,211 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 12 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 2D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4A 00 00 00
 #
-name: KEY_CONTEXT_MENU
+name: CONTEXT_MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 68 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_ARH-700/1,8.ir b/_CSV-IRDB_/S/Samsung/Unknown_ARH-700/1,8.ir
index 912f78c2..151ec9e9 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_ARH-700/1,8.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_ARH-700/1,8.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 01 08 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 08 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 01 08 00 00
 command: 3C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 08 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00507A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00507A/7,7.ir
index 75eac769..18ea445c 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00507A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00507A/7,7.ir
@@ -7,151 +7,151 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 22 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 24 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -205,49 +205,49 @@ protocol: NECext
 address: 07 07 00 00
 command: 2F 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 32 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 33 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 68 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00538A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00538A/7,7.ir
index ceab5691..5d34a4c5 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00538A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00538A/7,7.ir
@@ -7,103 +7,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -115,31 +115,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 20 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 23 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -205,31 +205,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 43 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -241,25 +241,25 @@ protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6E 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -295,13 +295,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 7B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 7D 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00603A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00603A/7,7.ir
index f6f466a9..940073ff 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00603A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00603A/7,7.ir
@@ -7,109 +7,109 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 23 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -205,67 +205,67 @@ protocol: NECext
 address: 07 07 00 00
 command: 43 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 49 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -295,13 +295,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 7B 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 7D 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00609A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00609A/7,7.ir
index 6b38240d..3610e2c2 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00609A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00609A/7,7.ir
@@ -7,109 +7,109 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 22 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -205,37 +205,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 33 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00634A/9,9.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00634A/9,9.ir
index 0f65b829..5cef01a6 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00634A/9,9.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00634A/9,9.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 09 09 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 09 09 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 1F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 09 09 00 00
@@ -115,67 +115,67 @@ protocol: NECext
 address: 09 09 00 00
 command: 3E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 47 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 49 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 65 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 09 09 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00678A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00678A/7,7.ir
index 5bb777d8..f18c6a63 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00678A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00678A/7,7.ir
@@ -7,103 +7,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -115,37 +115,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 25 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 3E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 68 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00683A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00683A/7,7.ir
index fb8f7561..ac28ae4d 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00683A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00683A/7,7.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -109,31 +109,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 23 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -175,37 +175,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 43 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 49 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -217,31 +217,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 63 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00685A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00685A/7,7.ir
index acc225aa..2077cad8 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00685A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00685A/7,7.ir
@@ -1,139 +1,139 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 12 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 49 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -205,25 +205,25 @@ protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 63 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00856A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00856A/7,7.ir
index bc69519e..42f69e5f 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00856A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00856A/7,7.ir
@@ -7,103 +7,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -115,37 +115,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -187,43 +187,43 @@ protocol: NECext
 address: 07 07 00 00
 command: 3E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 44 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 49 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -235,37 +235,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00861A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00861A/7,7.ir
index 6b58ad05..4dfc8cec 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00861A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00861A/7,7.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -157,49 +157,49 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 2D 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 44 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 49 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -211,49 +211,49 @@ protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 68 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -265,7 +265,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00865A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00865A/7,7.ir
index c9d5ef8e..65bada34 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00865A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00865A/7,7.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 2D 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -175,37 +175,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00869A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00869A/7,7.ir
index ce81b956..e973c877 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00869A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00869A/7,7.ir
@@ -31,7 +31,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 25 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00940A/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00940A/7,7.ir
index e7898542..1b664062 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BN59-00940A/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BN59-00940A/7,7.ir
@@ -7,103 +7,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 00 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -115,43 +115,43 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -181,43 +181,43 @@ protocol: NECext
 address: 07 07 00 00
 command: 3E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 44 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 49 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -229,43 +229,43 @@ protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 4F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_BRM-E1E/33,33.ir b/_CSV-IRDB_/S/Samsung/Unknown_BRM-E1E/33,33.ir
index 661e01af..8dbaf80b 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_BRM-E1E/33,33.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_BRM-E1E/33,33.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 21 21 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: 21 21 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 21 21 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 21 21 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 21 21 00 00
 command: 1A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 21 21 00 00
@@ -49,19 +49,19 @@ protocol: NECext
 address: 21 21 00 00
 command: 1E 00 00 00
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: 21 21 00 00
 command: 21 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 21 21 00 00
 command: 22 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 21 21 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_HLN507W/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_HLN507W/7,7.ir
index a1ca6403..406dce9b 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_HLN507W/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_HLN507W/7,7.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 43 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 98 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 99 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 07 07 00 00
 command: C3 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: F8 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_MF59-00242B/9,9.ir b/_CSV-IRDB_/S/Samsung/Unknown_MF59-00242B/9,9.ir
index d552087a..56b46ffa 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_MF59-00242B/9,9.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_MF59-00242B/9,9.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 13 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 09 09 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 09 09 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 09 09 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 09 09 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 2D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 09 09 00 00
@@ -157,49 +157,49 @@ protocol: NECext
 address: 09 09 00 00
 command: 39 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 3E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 62 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 64 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 09 09 00 00
 command: 65 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 09 09 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_MF59-00291a/32,0.ir b/_CSV-IRDB_/S/Samsung/Unknown_MF59-00291a/32,0.ir
index 5687724f..4ce60187 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_MF59-00291a/32,0.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_MF59-00291a/32,0.ir
@@ -139,13 +139,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_MF59/0,-1.ir b/_CSV-IRDB_/S/Samsung/Unknown_MF59/0,-1.ir
index 0762c9a6..14d0779d 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_MF59/0,-1.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_MF59/0,-1.ir
@@ -1,133 +1,133 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,49 +157,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 62 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 64 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 65 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_PR3914/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_PR3914/5,5.ir
index da533881..2d11e302 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_PR3914/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_PR3914/5,5.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -37,25 +37,25 @@ protocol: NECext
 address: 05 05 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1A 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_RCD-M70/0,4.ir b/_CSV-IRDB_/S/Samsung/Unknown_RCD-M70/0,4.ir
index 6b842dfa..dbc0de3d 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_RCD-M70/0,4.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_RCD-M70/0,4.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 04 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 00 04 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 04 00 00
@@ -25,19 +25,19 @@ protocol: NECext
 address: 00 04 00 00
 command: 12 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 20 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 04 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 00 04 00 00
 command: 22 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 00 04 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 04 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 00 04 00 00
 command: 53 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 04 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/102,0.ir b/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/102,0.ir
index 6f3608ba..cd0dbc54 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/102,0.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/102,0.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 89 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 66 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 91 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -109,91 +109,91 @@ protocol: NECext
 address: 66 00 00 00
 command: 93 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 94 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 95 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 97 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 98 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 99 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A0 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A1 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: A2 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 66 00 00 00
 command: A6 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 66 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 66 00 00 00
 command: A9 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 66 00 00 00
 command: AA 00 00 00
 #
-name: KEY_3d
+name: 3d
 type: parsed
 protocol: NECext
 address: 66 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/5,5.ir
index a5ed9115..73013e9f 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/5,5.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 30 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/7,7.ir
index 08f532ee..a5cbea67 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SAMSUNG/7,7.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 07 07 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -181,37 +181,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 3F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 47 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 48 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 49 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -223,37 +223,37 @@ protocol: NECext
 address: 07 07 00 00
 command: 4B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 58 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 60 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 61 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 62 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 65 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -265,7 +265,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 6B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SAT/21,-1.ir b/_CSV-IRDB_/S/Samsung/Unknown_SAT/21,-1.ir
index 8c8136ae..563d086f 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SAT/21,-1.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SAT/21,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -97,61 +97,61 @@ protocol: NECext
 address: 15 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 16 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 17 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 19 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 15 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SFT-702E/64,-1.ir b/_CSV-IRDB_/S/Samsung/Unknown_SFT-702E/64,-1.ir
index 80f8a0a7..d9f1dcfe 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SFT-702E/64,-1.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SFT-702E/64,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -13,19 +13,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -55,25 +55,25 @@ protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -85,85 +85,85 @@ protocol: NECext
 address: 40 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 18 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 41 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -199,25 +199,25 @@ protocol: NECext
 address: 40 00 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 45 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 46 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SMT-1000T/64,64.ir b/_CSV-IRDB_/S/Samsung/Unknown_SMT-1000T/64,64.ir
index aeb3b6aa..ab0b9408 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SMT-1000T/64,64.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SMT-1000T/64,64.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -97,109 +97,109 @@ protocol: NECext
 address: 40 40 00 00
 command: 0F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 11 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 15 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 16 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 17 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 18 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 19 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1C 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 40 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 41 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 42 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 43 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 46 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SMT-H3050/27,-1.ir b/_CSV-IRDB_/S/Samsung/Unknown_SMT-H3050/27,-1.ir
index 95cc9236..3872ed79 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SMT-H3050/27,-1.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SMT-H3050/27,-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 08 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 1B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SV-411X/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_SV-411X/5,5.ir
index 42b1e29a..2f6b7424 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SV-411X/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SV-411X/5,5.ir
@@ -7,115 +7,115 @@ protocol: NECext
 address: 05 05 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 12 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 21 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 3D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 50 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 52 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SV-610X/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_SV-610X/5,5.ir
index d9c7792e..f6c2818a 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SV-610X/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SV-610X/5,5.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: vcr_power
+name: vcr_POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -193,25 +193,25 @@ protocol: NECext
 address: 05 05 00 00
 command: 3D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 50 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 52 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 5C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 75 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SV-651B/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_SV-651B/5,5.ir
index 5df062f2..71a20840 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SV-651B/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SV-651B/5,5.ir
@@ -7,151 +7,151 @@ protocol: NECext
 address: 05 05 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_1_slow-
+name: 1_slow-
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_3_slow+
+name: 3_slow+
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_4_shuttle-
+name: 4_shuttle-
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_6_shuttle+
+name: 6_shuttle+
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_7_V_LOCK-
+name: 7_V_LOCK-
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_9_V_LOCK+
+name: 9_V_LOCK+
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_0_frame_advance
+name: 0_frame_advance
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 12 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 21 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 24 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 2E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 3A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 75 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 7D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_SV-DVD3E/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_SV-DVD3E/5,5.ir
index a2c05201..73f6863b 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_SV-DVD3E/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_SV-DVD3E/5,5.ir
@@ -13,103 +13,103 @@ protocol: NECext
 address: 05 05 00 00
 command: 01 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 1A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 1F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 22 00 00 00
 #
-name: KEY_3D_SOUND
+name: 3D_SOUND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 26 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 2B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 2C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 31 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 32 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 3A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 43 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 54 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 59 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 66 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_TV/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_TV/7,7.ir
index a2d2c488..1bcb1e4c 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_TV/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_TV/7,7.ir
@@ -13,103 +13,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 07 07 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_VCR/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_VCR/5,5.ir
index 6ea48d89..09347d66 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_VCR/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_VCR/5,5.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 2E 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_VXK-336/5,5.ir b/_CSV-IRDB_/S/Samsung/Unknown_VXK-336/5,5.ir
index 432a63ae..454b919d 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_VXK-336/5,5.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_VXK-336/5,5.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 1C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 2D 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 31 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_hifi/0,1.ir b/_CSV-IRDB_/S/Samsung/Unknown_hifi/0,1.ir
index 163f057d..ab94d2ff 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_hifi/0,1.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_hifi/0,1.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 00 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 01 00 00
 command: 14 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 01 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 01 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 00 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 00 01 00 00
 command: 1D 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 1E 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 00 01 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_samsung-10095T/7,7.ir b/_CSV-IRDB_/S/Samsung/Unknown_samsung-10095T/7,7.ir
index 26462413..34d9cf33 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_samsung-10095T/7,7.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_samsung-10095T/7,7.ir
@@ -7,103 +7,103 @@ protocol: NECext
 address: 07 07 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 02 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 06 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 0F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 07 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 07 00 00
diff --git a/_CSV-IRDB_/S/Samsung/Unknown_test/0,-1.ir b/_CSV-IRDB_/S/Samsung/Unknown_test/0,-1.ir
index c470f1d7..5a4ba934 100644
--- a/_CSV-IRDB_/S/Samsung/Unknown_test/0,-1.ir
+++ b/_CSV-IRDB_/S/Samsung/Unknown_test/0,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,37 +133,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Samy/Unknown_SDX1100/8,230.ir b/_CSV-IRDB_/S/Samy/Unknown_SDX1100/8,230.ir
index db870485..a607927a 100644
--- a/_CSV-IRDB_/S/Samy/Unknown_SDX1100/8,230.ir
+++ b/_CSV-IRDB_/S/Samy/Unknown_SDX1100/8,230.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: 08 E6 00 00
 command: 01 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 03 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 04 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 08 E6 00 00
 command: 06 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 07 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 09 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 0A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -79,91 +79,91 @@ protocol: NECext
 address: 08 E6 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 0D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 0E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 18 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 19 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1C 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 08 E6 00 00
 command: 50 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 51 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 52 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 56 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 58 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -241,19 +241,19 @@ protocol: NECext
 address: 08 E6 00 00
 command: 5B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
diff --git a/_CSV-IRDB_/S/Sansonic/Unknown_FT-300A/0,-1.ir b/_CSV-IRDB_/S/Sansonic/Unknown_FT-300A/0,-1.ir
index f66d0112..76ef20c1 100644
--- a/_CSV-IRDB_/S/Sansonic/Unknown_FT-300A/0,-1.ir
+++ b/_CSV-IRDB_/S/Sansonic/Unknown_FT-300A/0,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,73 +67,73 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Sansui/Unknown_SANSUI-RS-S103/132,77.ir b/_CSV-IRDB_/S/Sansui/Unknown_SANSUI-RS-S103/132,77.ir
index 8587a828..3c838b00 100644
--- a/_CSV-IRDB_/S/Sansui/Unknown_SANSUI-RS-S103/132,77.ir
+++ b/_CSV-IRDB_/S/Sansui/Unknown_SANSUI-RS-S103/132,77.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 84 4D 00 00
 command: 01 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 84 4D 00 00
 command: 06 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 84 4D 00 00
 command: 0A 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 0B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
@@ -73,55 +73,55 @@ protocol: NECext
 address: 84 4D 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 0F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 15 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 17 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 84 4D 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 84 4D 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 84 4D 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/TV/56,-1.ir b/_CSV-IRDB_/S/Sanyo/TV/56,-1.ir
index 4deb4323..a54c1a64 100644
--- a/_CSV-IRDB_/S/Sanyo/TV/56,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/TV/56,-1.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 38 00 00 00
 command: 0D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_A05800/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_A05800/49,-1.ir
index 5eee6a9f..6f1adead 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_A05800/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_A05800/49,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0_AV
+name: 0_AV
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 51 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 56 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_B01004/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_B01004/49,-1.ir
index 46d8e2cb..b39d0f37 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_B01004/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_B01004/49,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -43,73 +43,73 @@ protocol: NECext
 address: 31 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 44 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -157,31 +157,31 @@ protocol: NECext
 address: 31 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 94 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 95 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 96 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 97 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_B01007/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_B01007/49,-1.ir
index 2aa049ca..d24a9938 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_B01007/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_B01007/49,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 31 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 15 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0/AV
+name: 0/AV
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 44 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_B12628/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_B12628/49,-1.ir
index 388d4633..2d1210ab 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_B12628/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_B12628/49,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 19 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 9E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_B13540/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_B13540/49,-1.ir
index a3a2d8eb..8553ddc5 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_B13540/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_B13540/49,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 56 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_RB-DA300/60,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_RB-DA300/60,-1.ir
index ba5ad784..8cea8c18 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_RB-DA300/60,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_RB-DA300/60,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 3C 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 3C 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 40 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 3C 00 00 00
 command: 44 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 46 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 3C 00 00 00
 command: 52 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 54 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 55 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
@@ -139,61 +139,61 @@ protocol: NECext
 address: 3C 00 00 00
 command: 57 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 80 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 81 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 82 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 83 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 84 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 85 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 86 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 87 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
 command: 88 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 3C 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_RB-SL22/60,196.ir b/_CSV-IRDB_/S/Sanyo/Unknown_RB-SL22/60,196.ir
index 5d5b998b..047f30ff 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_RB-SL22/60,196.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_RB-SL22/60,196.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 01 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 03 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 3C C4 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 07 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
@@ -55,121 +55,121 @@ protocol: NECext
 address: 3C C4 00 00
 command: 09 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 0D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 0E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 1A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 3C C4 00 00
 command: 20 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 21 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 22 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 3C C4 00 00
 command: 2F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 3C C4 00 00
 command: 3A 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
 command: 3B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 3C C4 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_RC-105C/54,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_RC-105C/54,-1.ir
index 5f7e9c45..d021566c 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_RC-105C/54,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_RC-105C/54,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Ch_Up
+name: CH+
 type: parsed
 protocol: NECext
 address: 36 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 36 00 00 00
 command: 08 00 00 00
 #
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 36 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 36 00 00 00
 command: 0D 00 00 00
 #
-name: Power
+name: POWER
 type: parsed
 protocol: NECext
 address: 36 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_RC700/56,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_RC700/56,-1.ir
index c555d682..d9c9aca6 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_RC700/56,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_RC700/56,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 03 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 04 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 07 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 38 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 17 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 38 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo-B13509/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo-B13509/49,-1.ir
index ddd307ba..67b59ecd 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo-B13509/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo-B13509/49,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 56 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo-JXZB/56,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo-JXZB/56,-1.ir
index 26340040..29c5d9ca 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo-JXZB/56,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo-JXZB/56,-1.ir
@@ -67,13 +67,13 @@ protocol: NECext
 address: 38 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -97,19 +97,19 @@ protocol: NECext
 address: 38 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 38 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 38 00 00 00
 command: 46 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 49 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo/49,-1.ir
index 7abfc146..e202fde7 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo/49,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 56 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo/56,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo/56,-1.ir
index 8d9648c7..59215a8a 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo/56,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_Sanyo/56,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 38 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 38 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_TV/56,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_TV/56,-1.ir
index 50d94955..c4426edd 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_TV/56,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_TV/56,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 38 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 38 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_VCR/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_VCR/49,-1.ir
index 71c027aa..3d25d1e9 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_VCR/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_VCR/49,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 31 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 15 00 00 00
 #
-name: KEY_1--
+name: 1--
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_sanyo-tv01/56,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_sanyo-tv01/56,-1.ir
index 8c7ebc67..a7689ea6 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_sanyo-tv01/56,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_sanyo-tv01/56,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 38 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Unknown_sanyoB13537/49,-1.ir b/_CSV-IRDB_/S/Sanyo/Unknown_sanyoB13537/49,-1.ir
index c3c07833..4ba4919f 100644
--- a/_CSV-IRDB_/S/Sanyo/Unknown_sanyoB13537/49,-1.ir
+++ b/_CSV-IRDB_/S/Sanyo/Unknown_sanyoB13537/49,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sanyo/Video Projector/48,-1.ir b/_CSV-IRDB_/S/Sanyo/Video Projector/48,-1.ir
index cb718e12..23e183fc 100644
--- a/_CSV-IRDB_/S/Sanyo/Video Projector/48,-1.ir	
+++ b/_CSV-IRDB_/S/Sanyo/Video Projector/48,-1.ir	
@@ -19,7 +19,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 09 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/S/Satelco/Sat/24,-1.ir b/_CSV-IRDB_/S/Satelco/Sat/24,-1.ir
index baf7a89b..0b021db2 100644
--- a/_CSV-IRDB_/S/Satelco/Sat/24,-1.ir
+++ b/_CSV-IRDB_/S/Satelco/Sat/24,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 10 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 12 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 13 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 18 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 18 00 00 00
@@ -127,169 +127,169 @@ protocol: NECext
 address: 18 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 20 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 21 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 22 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 23 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 24 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 25 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 26 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 27 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 28 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 31 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 32 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 33 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 34 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 35 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 36 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 37 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 38 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 39 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/S/Schneider/Unknown_FB2000/5,-1.ir b/_CSV-IRDB_/S/Schneider/Unknown_FB2000/5,-1.ir
index ad9fbdfa..bed83b14 100644
--- a/_CSV-IRDB_/S/Schneider/Unknown_FB2000/5,-1.ir
+++ b/_CSV-IRDB_/S/Schneider/Unknown_FB2000/5,-1.ir
@@ -1,187 +1,187 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Schneider/Unknown_RC-193/154,-1.ir b/_CSV-IRDB_/S/Schneider/Unknown_RC-193/154,-1.ir
index 6e338ff3..8582985a 100644
--- a/_CSV-IRDB_/S/Schneider/Unknown_RC-193/154,-1.ir
+++ b/_CSV-IRDB_/S/Schneider/Unknown_RC-193/154,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 9A 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 9A 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 9A 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 9A 00 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
@@ -103,73 +103,73 @@ protocol: NECext
 address: 9A 00 00 00
 command: 45 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 47 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 48 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 49 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
@@ -187,73 +187,73 @@ protocol: NECext
 address: 9A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 54 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 58 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 59 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 9A 00 00 00
diff --git a/_CSV-IRDB_/S/Schneider/Unknown_RC202/11,11.ir b/_CSV-IRDB_/S/Schneider/Unknown_RC202/11,11.ir
index 274546c9..1dc6419f 100644
--- a/_CSV-IRDB_/S/Schneider/Unknown_RC202/11,11.ir
+++ b/_CSV-IRDB_/S/Schneider/Unknown_RC202/11,11.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 0C 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 10 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 18 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
diff --git a/_CSV-IRDB_/S/Schneider/Unknown_RC901/28,-1.ir b/_CSV-IRDB_/S/Schneider/Unknown_RC901/28,-1.ir
index a45573e9..5ae523ea 100644
--- a/_CSV-IRDB_/S/Schneider/Unknown_RC901/28,-1.ir
+++ b/_CSV-IRDB_/S/Schneider/Unknown_RC901/28,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -79,31 +79,31 @@ protocol: NECext
 address: 1C 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -115,79 +115,79 @@ protocol: NECext
 address: 1C 00 00 00
 command: 22 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 37 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 48 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 1C 00 00 00
 command: 74 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
diff --git a/_CSV-IRDB_/S/Schneider/Unknown_RC902/0,-1.ir b/_CSV-IRDB_/S/Schneider/Unknown_RC902/0,-1.ir
index 2171db17..55ea683b 100644
--- a/_CSV-IRDB_/S/Schneider/Unknown_RC902/0,-1.ir
+++ b/_CSV-IRDB_/S/Schneider/Unknown_RC902/0,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,31 +79,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,85 +115,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 72 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 74 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Schwaiger/Unknown_DSR/0,-1.ir b/_CSV-IRDB_/S/Schwaiger/Unknown_DSR/0,-1.ir
index 60d5af7c..214bbfd0 100644
--- a/_CSV-IRDB_/S/Schwaiger/Unknown_DSR/0,-1.ir
+++ b/_CSV-IRDB_/S/Schwaiger/Unknown_DSR/0,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,49 +25,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,31 +85,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,43 +121,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,37 +169,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Scientific_Atlanta/Cable_Box/71,-1.ir b/_CSV-IRDB_/S/Scientific_Atlanta/Cable_Box/71,-1.ir
index 6a55a68a..8e35938f 100644
--- a/_CSV-IRDB_/S/Scientific_Atlanta/Cable_Box/71,-1.ir
+++ b/_CSV-IRDB_/S/Scientific_Atlanta/Cable_Box/71,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 47 00 00 00
 command: 22 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 47 00 00 00
diff --git a/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_Atlanta-1840/27,-1.ir b/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_Atlanta-1840/27,-1.ir
index b7c40a7b..b5dee2d2 100644
--- a/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_Atlanta-1840/27,-1.ir
+++ b/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_Atlanta-1840/27,-1.ir
@@ -19,25 +19,25 @@ protocol: NECext
 address: 1B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 05 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 1B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 1B 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -139,115 +139,115 @@ protocol: NECext
 address: 1B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 22 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 30 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 33 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 35 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 36 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 37 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 39 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_IV/27,-1.ir b/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_IV/27,-1.ir
index 15cdc657..4efdea49 100644
--- a/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_IV/27,-1.ir
+++ b/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_IV/27,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 05 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 08 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -61,61 +61,61 @@ protocol: NECext
 address: 1B 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -127,61 +127,61 @@ protocol: NECext
 address: 1B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 22 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -205,37 +205,37 @@ protocol: NECext
 address: 1B 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 33 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 35 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 36 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 37 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_RM9834/27,-1.ir b/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_RM9834/27,-1.ir
index b8f53d5e..3c1d9ea5 100644
--- a/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_RM9834/27,-1.ir
+++ b/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_RM9834/27,-1.ir
@@ -1,163 +1,163 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 08 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_SAE8000/27,-1.ir b/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_SAE8000/27,-1.ir
index 5076079c..a0e2a485 100644
--- a/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_SAE8000/27,-1.ir
+++ b/_CSV-IRDB_/S/Scientific_Atlanta/Unknown_SAE8000/27,-1.ir
@@ -19,25 +19,25 @@ protocol: NECext
 address: 1B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 05 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -49,85 +49,85 @@ protocol: NECext
 address: 1B 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_KPASTERISK
+name: KPASTERISK
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -139,67 +139,67 @@ protocol: NECext
 address: 1B 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 22 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 26 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 27 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -211,37 +211,37 @@ protocol: NECext
 address: 1B 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 30 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 33 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
 command: 34 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 1B 00 00 00
 command: 37 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 1B 00 00 00
 command: 3A 00 00 00
 #
-name: pip_power
+name: pip_POWER
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 1B 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1B 00 00 00
diff --git a/_CSV-IRDB_/S/Scott/Unknown_DVD-838/8,-1.ir b/_CSV-IRDB_/S/Scott/Unknown_DVD-838/8,-1.ir
index a4695675..5ab997d2 100644
--- a/_CSV-IRDB_/S/Scott/Unknown_DVD-838/8,-1.ir
+++ b/_CSV-IRDB_/S/Scott/Unknown_DVD-838/8,-1.ir
@@ -7,49 +7,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -73,49 +73,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -139,97 +139,97 @@ protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 47 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 50 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/S/Scott/Unknown_scott-dvd/4,-1.ir b/_CSV-IRDB_/S/Scott/Unknown_scott-dvd/4,-1.ir
index 12ded004..93052e42 100644
--- a/_CSV-IRDB_/S/Scott/Unknown_scott-dvd/4,-1.ir
+++ b/_CSV-IRDB_/S/Scott/Unknown_scott-dvd/4,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -61,37 +61,37 @@ protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -103,43 +103,43 @@ protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 50 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -265,25 +265,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/S/Sencor/Unknown_SFN9011SL/0,252.ir b/_CSV-IRDB_/S/Sencor/Unknown_SFN9011SL/0,252.ir
index f648ab25..1c981104 100644
--- a/_CSV-IRDB_/S/Sencor/Unknown_SFN9011SL/0,252.ir
+++ b/_CSV-IRDB_/S/Sencor/Unknown_SFN9011SL/0,252.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER2
+name: POWER2
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 80 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 82 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 84 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 85 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 86 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
diff --git a/_CSV-IRDB_/S/Sharp/DTV_Decoder/1,-1.ir b/_CSV-IRDB_/S/Sharp/DTV_Decoder/1,-1.ir
index 859d16cc..5530ee5f 100644
--- a/_CSV-IRDB_/S/Sharp/DTV_Decoder/1,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/DTV_Decoder/1,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/TV/1,-1.ir b/_CSV-IRDB_/S/Sharp/TV/1,-1.ir
index ad60adef..fd671daf 100644
--- a/_CSV-IRDB_/S/Sharp/TV/1,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/TV/1,-1.ir
@@ -97,13 +97,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_CV-2131CK1/1,-1.ir b/_CSV-IRDB_/S/Sharp/Unknown_CV-2131CK1/1,-1.ir
index 1a1de1a8..7a83c089 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_CV-2131CK1/1,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_CV-2131CK1/1,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 27 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 30 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_G0048TA/19,-1.ir b/_CSV-IRDB_/S/Sharp/Unknown_G0048TA/19,-1.ir
index f2c9811b..a8ff224e 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_G0048TA/19,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_G0048TA/19,-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 13 00 00 00
 command: 10 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 22 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 13 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 25 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 13 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 93 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: 94 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 13 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 13 00 00 00
 command: 98 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 13 00 00 00
 command: A4 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 13 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_G0412GE/3,-1.ir b/_CSV-IRDB_/S/Sharp/Unknown_G0412GE/3,-1.ir
index 12cbb6f6..22215460 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_G0412GE/3,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_G0412GE/3,-1.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 03 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 20 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 21 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -85,31 +85,31 @@ protocol: NECext
 address: 03 00 00 00
 command: 25 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 27 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 28 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 33 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_G0938CESA/1,-1.ir b/_CSV-IRDB_/S/Sharp/Unknown_G0938CESA/1,-1.ir
index 80ad83c4..2e923a6e 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_G0938CESA/1,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_G0938CESA/1,-1.ir
@@ -1,169 +1,169 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1_abc
+name: 1_abc
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2_def
+name: 2_def
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3_ghi
+name: 3_ghi
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4_jkl
+name: 4_jkl
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5_mno
+name: 5_mno
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6_pqr
+name: 6_pqr
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7_stu
+name: 7_stu
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8_vwxyz
+name: 8_vwxyz
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9_mark
+name: 9_mark
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0_spanish
+name: 0_spanish
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0_space
+name: 0_space
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 76 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_G1014BMSA/1,-1.ir b/_CSV-IRDB_/S/Sharp/Unknown_G1014BMSA/1,-1.ir
index 201b466b..43931856 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_G1014BMSA/1,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_G1014BMSA/1,-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_P
+name: P
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_S
+name: S
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_G1044BMSA/1,-1.ir b/_CSV-IRDB_/S/Sharp/Unknown_G1044BMSA/1,-1.ir
index 00bb0b4c..ad843a5b 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_G1044BMSA/1,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_G1044BMSA/1,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,31 +79,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 38 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -187,25 +187,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_GJ210/0,189.ir b/_CSV-IRDB_/S/Sharp/Unknown_GJ210/0,189.ir
index 685a8e46..af0705ab 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_GJ210/0,189.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_GJ210/0,189.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 01 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 02 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 04 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 00 BD 00 00
 command: 08 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 0C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 BD 00 00
 command: 0E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 00 BD 00 00
 command: 12 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -109,67 +109,67 @@ protocol: NECext
 address: 00 BD 00 00
 command: 14 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 15 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 16 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 18 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 1E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 BD 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 00 BD 00 00
 command: 44 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -205,49 +205,49 @@ protocol: NECext
 address: 00 BD 00 00
 command: 47 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 49 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 4A 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 4B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 4C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 4D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 4E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
 command: 4F 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 00 BD 00 00
 command: 54 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 00 BD 00 00
 command: 57 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 BD 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_RRMCGA030WJSA/8,48.ir b/_CSV-IRDB_/S/Sharp/Unknown_RRMCGA030WJSA/8,48.ir
index 44bcce46..9aa99973 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_RRMCGA030WJSA/8,48.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_RRMCGA030WJSA/8,48.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 41 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 43 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 30 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 08 30 00 00
 command: 77 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 08 30 00 00
@@ -49,151 +49,151 @@ protocol: NECext
 address: 08 30 00 00
 command: 3A 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 78 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 3B 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 39 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 3C 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 38 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 1B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 1D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 1C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 21 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 22 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 23 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 0A 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 1F 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 7E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 30 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 08 30 00 00
 command: 36 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 2E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 2D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 30 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 08 30 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 30 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 08 30 00 00
 command: 7C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 30 00 00
 command: 27 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 30 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_SHARP/1,-1.ir b/_CSV-IRDB_/S/Sharp/Unknown_SHARP/1,-1.ir
index 3f8beed4..4a6b6c9d 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_SHARP/1,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_SHARP/1,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 34 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Unknown_sharp1781/1,-1.ir b/_CSV-IRDB_/S/Sharp/Unknown_sharp1781/1,-1.ir
index 318c0ee1..a3291324 100644
--- a/_CSV-IRDB_/S/Sharp/Unknown_sharp1781/1,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Unknown_sharp1781/1,-1.ir
@@ -61,13 +61,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sharp/Video_Projector/13,-1.ir b/_CSV-IRDB_/S/Sharp/Video_Projector/13,-1.ir
index cf28b790..b583fa42 100644
--- a/_CSV-IRDB_/S/Sharp/Video_Projector/13,-1.ir
+++ b/_CSV-IRDB_/S/Sharp/Video_Projector/13,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 0D 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0D 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0D 00 00 00
diff --git a/_CSV-IRDB_/S/Sharpsat/Unknown_T28/128,38.ir b/_CSV-IRDB_/S/Sharpsat/Unknown_T28/128,38.ir
index 983f01d2..44a1dac6 100644
--- a/_CSV-IRDB_/S/Sharpsat/Unknown_T28/128,38.ir
+++ b/_CSV-IRDB_/S/Sharpsat/Unknown_T28/128,38.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 80 26 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -49,43 +49,43 @@ protocol: NECext
 address: 80 26 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 11 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 14 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 15 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 16 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 80 26 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -109,25 +109,25 @@ protocol: NECext
 address: 80 26 00 00
 command: 1A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 26 00 00
diff --git a/_CSV-IRDB_/S/Sherwood/Unknown_GC-1285/129,114.ir b/_CSV-IRDB_/S/Sherwood/Unknown_GC-1285/129,114.ir
index 8f5ab28f..18dd93ab 100644
--- a/_CSV-IRDB_/S/Sherwood/Unknown_GC-1285/129,114.ir
+++ b/_CSV-IRDB_/S/Sherwood/Unknown_GC-1285/129,114.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 0D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 10 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 12 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 81 72 00 00
@@ -109,25 +109,25 @@ protocol: NECext
 address: 81 72 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 1C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 1D 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 81 72 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 81 72 00 00
 command: 44 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 81 72 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 81 72 00 00
 command: 47 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 48 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 81 72 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 81 72 00 00
 command: 57 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 5A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 81 72 00 00
 command: 5E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 81 72 00 00
diff --git a/_CSV-IRDB_/S/Sherwood/Unknown_RM-101/69,131.ir b/_CSV-IRDB_/S/Sherwood/Unknown_RM-101/69,131.ir
index e965cd88..718dd56b 100644
--- a/_CSV-IRDB_/S/Sherwood/Unknown_RM-101/69,131.ir
+++ b/_CSV-IRDB_/S/Sherwood/Unknown_RM-101/69,131.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 81 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 83 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 45 83 00 00
@@ -31,49 +31,49 @@ protocol: NECext
 address: 45 83 00 00
 command: 88 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 89 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 8A 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 8B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 8C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 8D 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 8F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 90 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 83 00 00
@@ -85,37 +85,37 @@ protocol: NECext
 address: 45 83 00 00
 command: 97 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 98 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: 99 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: C0 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: C1 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: C2 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 45 83 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 45 83 00 00
 command: C6 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: C7 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 45 83 00 00
 command: CB 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 45 83 00 00
diff --git a/_CSV-IRDB_/S/Sherwood/Unknown_RM-636/131,68.ir b/_CSV-IRDB_/S/Sherwood/Unknown_RM-636/131,68.ir
index b93e5b15..a9d08fd9 100644
--- a/_CSV-IRDB_/S/Sherwood/Unknown_RM-636/131,68.ir
+++ b/_CSV-IRDB_/S/Sherwood/Unknown_RM-636/131,68.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 44 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 83 44 00 00
 command: 32 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 34 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 35 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 83 44 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 83 44 00 00
 command: 37 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 44 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 83 44 00 00
 command: 3C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 44 00 00
@@ -283,25 +283,25 @@ protocol: NECext
 address: 83 44 00 00
 command: 4A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 55 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 56 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 83 44 00 00
diff --git a/_CSV-IRDB_/S/Sherwood/Unknown_RM-RV-N25/131,68.ir b/_CSV-IRDB_/S/Sherwood/Unknown_RM-RV-N25/131,68.ir
index f12ca91b..2d039825 100644
--- a/_CSV-IRDB_/S/Sherwood/Unknown_RM-RV-N25/131,68.ir
+++ b/_CSV-IRDB_/S/Sherwood/Unknown_RM-RV-N25/131,68.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 44 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 83 44 00 00
 command: 46 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 44 00 00
@@ -301,7 +301,7 @@ protocol: NECext
 address: 83 44 00 00
 command: 4C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 44 00 00
@@ -337,13 +337,13 @@ protocol: NECext
 address: 83 44 00 00
 command: 52 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 83 44 00 00
 command: 53 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 83 44 00 00
diff --git a/_CSV-IRDB_/S/Sherwood/Unknown_Sherwood-S2770R-CP-II/129,123.ir b/_CSV-IRDB_/S/Sherwood/Unknown_Sherwood-S2770R-CP-II/129,123.ir
index a437d58e..2debecb8 100644
--- a/_CSV-IRDB_/S/Sherwood/Unknown_Sherwood-S2770R-CP-II/129,123.ir
+++ b/_CSV-IRDB_/S/Sherwood/Unknown_Sherwood-S2770R-CP-II/129,123.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 81 7B 00 00
@@ -235,19 +235,19 @@ protocol: NECext
 address: 81 7B 00 00
 command: 5B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 81 7B 00 00
 command: 5D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 81 7B 00 00
 command: 5E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 81 7B 00 00
diff --git a/_CSV-IRDB_/S/Sherwood/Unknown_sherwood/129,122.ir b/_CSV-IRDB_/S/Sherwood/Unknown_sherwood/129,122.ir
index d929bd3a..5f8f9c05 100644
--- a/_CSV-IRDB_/S/Sherwood/Unknown_sherwood/129,122.ir
+++ b/_CSV-IRDB_/S/Sherwood/Unknown_sherwood/129,122.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 81 7A 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
@@ -85,49 +85,49 @@ protocol: NECext
 address: 81 7A 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 0F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 14 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 15 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 16 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 18 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
 command: 1A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 81 7A 00 00
diff --git a/_CSV-IRDB_/S/Sherwood/Unknown_sherwood/131,69.ir b/_CSV-IRDB_/S/Sherwood/Unknown_sherwood/131,69.ir
index 1c0459c9..e325f75f 100644
--- a/_CSV-IRDB_/S/Sherwood/Unknown_sherwood/131,69.ir
+++ b/_CSV-IRDB_/S/Sherwood/Unknown_sherwood/131,69.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 83 45 00 00
 command: 00 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 83 45 00 00
 command: 02 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 83 45 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 83 45 00 00
 command: 0A 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 0B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 83 45 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 83 45 00 00
 command: 16 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 17 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 18 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -187,25 +187,25 @@ protocol: NECext
 address: 83 45 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 42 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 83 45 00 00
 command: 46 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 83 45 00 00
 command: 4A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 83 45 00 00
 command: 4E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 45 00 00
diff --git a/_CSV-IRDB_/S/Shinco/Unknown_RC-1730/0,153.ir b/_CSV-IRDB_/S/Shinco/Unknown_RC-1730/0,153.ir
index 427e283f..0a81bb96 100644
--- a/_CSV-IRDB_/S/Shinco/Unknown_RC-1730/0,153.ir
+++ b/_CSV-IRDB_/S/Shinco/Unknown_RC-1730/0,153.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 00 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -31,25 +31,25 @@ protocol: NECext
 address: 00 99 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 06 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 07 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -61,67 +61,67 @@ protocol: NECext
 address: 00 99 00 00
 command: 0B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 12 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 15 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -133,55 +133,55 @@ protocol: NECext
 address: 00 99 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 19 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 1F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 40 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 4D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 00 99 00 00
 command: 54 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 99 00 00
 command: 55 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 99 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 00 99 00 00
 command: 57 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 99 00 00
diff --git a/_CSV-IRDB_/S/Shuttle/Unknown_mceusb/4,15.ir b/_CSV-IRDB_/S/Shuttle/Unknown_mceusb/4,15.ir
index 6a715053..2d5b7934 100644
--- a/_CSV-IRDB_/S/Shuttle/Unknown_mceusb/4,15.ir
+++ b/_CSV-IRDB_/S/Shuttle/Unknown_mceusb/4,15.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -97,169 +97,169 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 46 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 47 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 49 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -271,37 +271,37 @@ protocol: NECext
 address: 04 0F 00 00
 command: 4E 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 50 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/S/Siemens/Unknown_fb405/134,84.ir b/_CSV-IRDB_/S/Siemens/Unknown_fb405/134,84.ir
index a5c9b6b5..f9387135 100644
--- a/_CSV-IRDB_/S/Siemens/Unknown_fb405/134,84.ir
+++ b/_CSV-IRDB_/S/Siemens/Unknown_fb405/134,84.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 01 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 04 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 05 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 0C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 0D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 14 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 17 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 18 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 86 54 00 00
 command: 19 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 54 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 86 54 00 00
 command: 40 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 86 54 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 86 54 00 00
 command: 44 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 54 00 00
diff --git a/_CSV-IRDB_/S/Siemens/Unknown_siemens-fb400/131,89.ir b/_CSV-IRDB_/S/Siemens/Unknown_siemens-fb400/131,89.ir
index a2aae0c7..ab0de566 100644
--- a/_CSV-IRDB_/S/Siemens/Unknown_siemens-fb400/131,89.ir
+++ b/_CSV-IRDB_/S/Siemens/Unknown_siemens-fb400/131,89.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 83 59 00 00
 command: 00 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 83 59 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 83 59 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -55,55 +55,55 @@ protocol: NECext
 address: 83 59 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 15 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 17 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 83 59 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 83 59 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 83 59 00 00
 command: 46 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 83 59 00 00
 command: 4A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 4C 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 83 59 00 00
 command: 4E 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 50 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 83 59 00 00
 command: 51 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 83 59 00 00
 command: 54 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 83 59 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 83 59 00 00
 command: 59 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 59 00 00
diff --git a/_CSV-IRDB_/S/Siemens/Unknown_siemens1/49,-1.ir b/_CSV-IRDB_/S/Siemens/Unknown_siemens1/49,-1.ir
index d97c539d..814dd12c 100644
--- a/_CSV-IRDB_/S/Siemens/Unknown_siemens1/49,-1.ir
+++ b/_CSV-IRDB_/S/Siemens/Unknown_siemens1/49,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 31 00 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0/av
+name: 0/av
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 31 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 44 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 47 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 31 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 31 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 94 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 95 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 96 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 31 00 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 31 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 31 00 00 00
 command: CA 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 31 00 00 00
diff --git a/_CSV-IRDB_/S/Sigma_Designs/Unknown_SIR/128,-1.ir b/_CSV-IRDB_/S/Sigma_Designs/Unknown_SIR/128,-1.ir
index 174e7e7d..5b5c5432 100644
--- a/_CSV-IRDB_/S/Sigma_Designs/Unknown_SIR/128,-1.ir
+++ b/_CSV-IRDB_/S/Sigma_Designs/Unknown_SIR/128,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_QUIT
+name: QUIT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -13,91 +13,91 @@ protocol: NECext
 address: 80 00 00 00
 command: 01 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 02 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 03 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 04 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 05 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 07 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 09 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -109,91 +109,91 @@ protocol: NECext
 address: 80 00 00 00
 command: 11 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 13 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 15 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 17 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 19 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 40 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 80 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/S/Sigmatek/Unknown_X100/8,-1.ir b/_CSV-IRDB_/S/Sigmatek/Unknown_X100/8,-1.ir
index e0e85378..48071117 100644
--- a/_CSV-IRDB_/S/Sigmatek/Unknown_X100/8,-1.ir
+++ b/_CSV-IRDB_/S/Sigmatek/Unknown_X100/8,-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -49,79 +49,79 @@ protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 40 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -163,67 +163,67 @@ protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 52 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 54 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 56 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 57 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 59 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -235,13 +235,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/S/Sigmatek/Unknown_XMB-510-PRO/8,-1.ir b/_CSV-IRDB_/S/Sigmatek/Unknown_XMB-510-PRO/8,-1.ir
index e902f2da..d8c16c72 100644
--- a/_CSV-IRDB_/S/Sigmatek/Unknown_XMB-510-PRO/8,-1.ir
+++ b/_CSV-IRDB_/S/Sigmatek/Unknown_XMB-510-PRO/8,-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -73,67 +73,67 @@ protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -145,61 +145,61 @@ protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 45 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 46 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 48 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 49 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 55 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -265,13 +265,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/S/Silvercrest/Unknown_RCH7S52/32,-1.ir b/_CSV-IRDB_/S/Silvercrest/Unknown_RCH7S52/32,-1.ir
index b6a69bff..30fff728 100644
--- a/_CSV-IRDB_/S/Silvercrest/Unknown_RCH7S52/32,-1.ir
+++ b/_CSV-IRDB_/S/Silvercrest/Unknown_RCH7S52/32,-1.ir
@@ -7,91 +7,91 @@ protocol: NECext
 address: 20 00 00 00
 command: 02 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -121,97 +121,97 @@ protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 42 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 44 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 49 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 51 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 54 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/S/Silvercrest/Unknown_URC-801/4,15.ir b/_CSV-IRDB_/S/Silvercrest/Unknown_URC-801/4,15.ir
index d7ff6e41..3e89af4d 100644
--- a/_CSV-IRDB_/S/Silvercrest/Unknown_URC-801/4,15.ir
+++ b/_CSV-IRDB_/S/Silvercrest/Unknown_URC-801/4,15.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -85,37 +85,37 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -127,37 +127,37 @@ protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -181,43 +181,43 @@ protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -229,49 +229,49 @@ protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/S/Sirius/Unknown_SBKB-3201KR/128,-1.ir b/_CSV-IRDB_/S/Sirius/Unknown_SBKB-3201KR/128,-1.ir
index cc48f77e..907f152f 100644
--- a/_CSV-IRDB_/S/Sirius/Unknown_SBKB-3201KR/128,-1.ir
+++ b/_CSV-IRDB_/S/Sirius/Unknown_SBKB-3201KR/128,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -25,79 +25,79 @@ protocol: NECext
 address: 80 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 80 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/S/Sirius/Unknown_ST2/0,-1.ir b/_CSV-IRDB_/S/Sirius/Unknown_ST2/0,-1.ir
index 37e45f2f..94f9c9e7 100644
--- a/_CSV-IRDB_/S/Sirius/Unknown_ST2/0,-1.ir
+++ b/_CSV-IRDB_/S/Sirius/Unknown_ST2/0,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 84 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 85 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 87 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 89 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 9D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Sirius/Unknown_Sportster/1,-1.ir b/_CSV-IRDB_/S/Sirius/Unknown_Sportster/1,-1.ir
index 0e6296fc..b9701501 100644
--- a/_CSV-IRDB_/S/Sirius/Unknown_Sportster/1,-1.ir
+++ b/_CSV-IRDB_/S/Sirius/Unknown_Sportster/1,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -73,73 +73,73 @@ protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sitronics/Unknown_RC-D010E/0,251.ir b/_CSV-IRDB_/S/Sitronics/Unknown_RC-D010E/0,251.ir
index a0bfcb75..5c367a82 100644
--- a/_CSV-IRDB_/S/Sitronics/Unknown_RC-D010E/0,251.ir
+++ b/_CSV-IRDB_/S/Sitronics/Unknown_RC-D010E/0,251.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 00 FB 00 00
 command: 09 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 13 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 15 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 16 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 17 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 19 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 FB 00 00
 command: 1C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -199,37 +199,37 @@ protocol: NECext
 address: 00 FB 00 00
 command: 41 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 42 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 44 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 45 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 48 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
@@ -241,37 +241,37 @@ protocol: NECext
 address: 00 FB 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4C 00 00 00
 #
-name: KEY_MINUS
+name: MINUS
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4D 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
 command: 4F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FB 00 00
diff --git a/_CSV-IRDB_/S/Sky/Unknown_DVB-S/0,12.ir b/_CSV-IRDB_/S/Sky/Unknown_DVB-S/0,12.ir
index bf9f4eae..856803b7 100644
--- a/_CSV-IRDB_/S/Sky/Unknown_DVB-S/0,12.ir
+++ b/_CSV-IRDB_/S/Sky/Unknown_DVB-S/0,12.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 24 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 28 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
@@ -103,73 +103,73 @@ protocol: NECext
 address: 00 0C 00 00
 command: 3D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 3E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 3F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 40 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 5B 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 5C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 00 0C 00 00
 command: 80 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
@@ -205,13 +205,13 @@ protocol: NECext
 address: 00 0C 00 00
 command: 83 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
 command: 84 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 0C 00 00
diff --git a/_CSV-IRDB_/S/Skymaster/Unknown_2421/2,-1.ir b/_CSV-IRDB_/S/Skymaster/Unknown_2421/2,-1.ir
index f381d49e..de2bb726 100644
--- a/_CSV-IRDB_/S/Skymaster/Unknown_2421/2,-1.ir
+++ b/_CSV-IRDB_/S/Skymaster/Unknown_2421/2,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,241 +19,241 @@ protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -283,43 +283,43 @@ protocol: NECext
 address: 02 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 37 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -331,55 +331,55 @@ protocol: NECext
 address: 02 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Skymaster/Unknown_2424/37,250.ir b/_CSV-IRDB_/S/Skymaster/Unknown_2424/37,250.ir
index 36c540ea..fe00f673 100644
--- a/_CSV-IRDB_/S/Skymaster/Unknown_2424/37,250.ir
+++ b/_CSV-IRDB_/S/Skymaster/Unknown_2424/37,250.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
@@ -19,73 +19,73 @@ protocol: NECext
 address: 25 FA 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 06 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 0A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 25 FA 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
@@ -109,55 +109,55 @@ protocol: NECext
 address: 25 FA 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 1A 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 1B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 1C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
 command: 1D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 25 FA 00 00
diff --git a/_CSV-IRDB_/S/Skymaster/Unknown_DCI/5,-1.ir b/_CSV-IRDB_/S/Skymaster/Unknown_DCI/5,-1.ir
index 8b942249..fd97ae1e 100644
--- a/_CSV-IRDB_/S/Skymaster/Unknown_DCI/5,-1.ir
+++ b/_CSV-IRDB_/S/Skymaster/Unknown_DCI/5,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -73,79 +73,79 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -169,43 +169,43 @@ protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/S/Skymaster/Unknown_SkymasterXLS99/19,1.ir b/_CSV-IRDB_/S/Skymaster/Unknown_SkymasterXLS99/19,1.ir
index b3074fc8..40d7bf05 100644
--- a/_CSV-IRDB_/S/Skymaster/Unknown_SkymasterXLS99/19,1.ir
+++ b/_CSV-IRDB_/S/Skymaster/Unknown_SkymasterXLS99/19,1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 02 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 05 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 13 01 00 00
diff --git a/_CSV-IRDB_/S/Skymaster/Unknown_XL10/6,-1.ir b/_CSV-IRDB_/S/Skymaster/Unknown_XL10/6,-1.ir
index cc4df1fb..8221d816 100644
--- a/_CSV-IRDB_/S/Skymaster/Unknown_XL10/6,-1.ir
+++ b/_CSV-IRDB_/S/Skymaster/Unknown_XL10/6,-1.ir
@@ -91,13 +91,13 @@ protocol: NECext
 address: 06 00 00 00
 command: 11 00 00 00
 #
-name: vol_down
+name: VOL-
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 12 00 00 00
 #
-name: vol_up
+name: VOL+
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 06 00 00 00
 command: 16 00 00 00
 #
-name: mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 17 00 00 00
 #
-name: power
+name: POWER
 type: parsed
 protocol: NECext
 address: 06 00 00 00
diff --git a/_CSV-IRDB_/S/Skymaster/Unknown_skymaster/19,1.ir b/_CSV-IRDB_/S/Skymaster/Unknown_skymaster/19,1.ir
index 1093cd24..0388f47c 100644
--- a/_CSV-IRDB_/S/Skymaster/Unknown_skymaster/19,1.ir
+++ b/_CSV-IRDB_/S/Skymaster/Unknown_skymaster/19,1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 13 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 10 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 16 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 19 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 13 01 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 13 01 00 00
 command: 1F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 13 01 00 00
diff --git a/_CSV-IRDB_/S/Slim_Art/Unknown_SA-100/0,-1.ir b/_CSV-IRDB_/S/Slim_Art/Unknown_SA-100/0,-1.ir
index 57aeba4d..4e604186 100644
--- a/_CSV-IRDB_/S/Slim_Art/Unknown_SA-100/0,-1.ir
+++ b/_CSV-IRDB_/S/Slim_Art/Unknown_SA-100/0,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,31 +25,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,49 +61,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -277,19 +277,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Slim_Devices/Unknown_Devices/110,-1.ir b/_CSV-IRDB_/S/Slim_Devices/Unknown_Devices/110,-1.ir
index fa511d19..0ee2866c 100644
--- a/_CSV-IRDB_/S/Slim_Devices/Unknown_Devices/110,-1.ir
+++ b/_CSV-IRDB_/S/Slim_Devices/Unknown_Devices/110,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 02 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 6E 00 00 00
 command: 06 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 08 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 09 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -79,73 +79,73 @@ protocol: NECext
 address: 6E 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 11 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 12 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 13 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 14 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 6E 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 6E 00 00 00
diff --git a/_CSV-IRDB_/S/SnapStream/Unknown_Firefly-Mini/0,-1.ir b/_CSV-IRDB_/S/SnapStream/Unknown_Firefly-Mini/0,-1.ir
index 27b94080..79c1b063 100644
--- a/_CSV-IRDB_/S/SnapStream/Unknown_Firefly-Mini/0,-1.ir
+++ b/_CSV-IRDB_/S/SnapStream/Unknown_Firefly-Mini/0,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,199 +13,199 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Snazio/Unknown_Net/8,230.ir b/_CSV-IRDB_/S/Snazio/Unknown_Net/8,230.ir
index 05e32670..55093961 100644
--- a/_CSV-IRDB_/S/Snazio/Unknown_Net/8,230.ir
+++ b/_CSV-IRDB_/S/Snazio/Unknown_Net/8,230.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 08 E6 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 12 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 14 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -43,31 +43,31 @@ protocol: NECext
 address: 08 E6 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 18 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 19 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 1D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -91,67 +91,67 @@ protocol: NECext
 address: 08 E6 00 00
 command: 1F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 40 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 42 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 43 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 45 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 46 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 47 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 08 E6 00 00
 command: 4B 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: 08 E6 00 00
 command: 51 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 52 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 53 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 08 E6 00 00
 command: 55 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 56 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 59 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -253,19 +253,19 @@ protocol: NECext
 address: 08 E6 00 00
 command: 5B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5D 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
diff --git a/_CSV-IRDB_/S/Sonance/Distributed_Audio/0,90.ir b/_CSV-IRDB_/S/Sonance/Distributed_Audio/0,90.ir
index 13887255..76d917bf 100644
--- a/_CSV-IRDB_/S/Sonance/Distributed_Audio/0,90.ir
+++ b/_CSV-IRDB_/S/Sonance/Distributed_Audio/0,90.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 5A 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 5A 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 5A 00 00
diff --git a/_CSV-IRDB_/S/Sonance/System_Controller/132,132.ir b/_CSV-IRDB_/S/Sonance/System_Controller/132,132.ir
index 6eec5bab..4a0cf9d6 100644
--- a/_CSV-IRDB_/S/Sonance/System_Controller/132,132.ir
+++ b/_CSV-IRDB_/S/Sonance/System_Controller/132,132.ir
@@ -37,13 +37,13 @@ protocol: NECext
 address: 84 84 00 00
 command: 0B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 84 00 00
 command: 11 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 84 00 00
diff --git a/_CSV-IRDB_/S/Sonicview/Unknown_SV-360/15,-1.ir b/_CSV-IRDB_/S/Sonicview/Unknown_SV-360/15,-1.ir
index 3423a284..f65c57bf 100644
--- a/_CSV-IRDB_/S/Sonicview/Unknown_SV-360/15,-1.ir
+++ b/_CSV-IRDB_/S/Sonicview/Unknown_SV-360/15,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -25,79 +25,79 @@ protocol: NECext
 address: 0F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -109,91 +109,91 @@ protocol: NECext
 address: 0F 00 00 00
 command: 17 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 18 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 20 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 23 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 24 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 25 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 26 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -205,31 +205,31 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 31 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 0F 00 00 00
 command: 34 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -259,25 +259,25 @@ protocol: NECext
 address: 0F 00 00 00
 command: 37 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 38 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 39 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Boombox/68,-1.ir b/_CSV-IRDB_/S/Sony/Boombox/68,-1.ir
index c1ef62eb..ce8b19d6 100644
--- a/_CSV-IRDB_/S/Sony/Boombox/68,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Boombox/68,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 44 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/CD_Player/17,-1.ir b/_CSV-IRDB_/S/Sony/CD_Player/17,-1.ir
index 42ac7c29..075b7edf 100644
--- a/_CSV-IRDB_/S/Sony/CD_Player/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/CD_Player/17,-1.ir
@@ -223,7 +223,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/DSS/1,-1.ir b/_CSV-IRDB_/S/Sony/DSS/1,-1.ir
index 62f1dc71..d8109a4f 100644
--- a/_CSV-IRDB_/S/Sony/DSS/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/DSS/1,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/DSS/64,-1.ir b/_CSV-IRDB_/S/Sony/DSS/64,-1.ir
index 736f96d2..6209641b 100644
--- a/_CSV-IRDB_/S/Sony/DSS/64,-1.ir
+++ b/_CSV-IRDB_/S/Sony/DSS/64,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/DVD_Player/1,-1.ir b/_CSV-IRDB_/S/Sony/DVD_Player/1,-1.ir
index cb019d20..e9c5af95 100644
--- a/_CSV-IRDB_/S/Sony/DVD_Player/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/DVD_Player/1,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/DVD_Player/26,83.ir b/_CSV-IRDB_/S/Sony/DVD_Player/26,83.ir
index a0e48c3a..2750f1fe 100644
--- a/_CSV-IRDB_/S/Sony/DVD_Player/26,83.ir
+++ b/_CSV-IRDB_/S/Sony/DVD_Player/26,83.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 1A 53 00 00
 command: 0B 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
diff --git a/_CSV-IRDB_/S/Sony/Digital_Recorder/1,-1.ir b/_CSV-IRDB_/S/Sony/Digital_Recorder/1,-1.ir
index c022259b..3bd0ee73 100644
--- a/_CSV-IRDB_/S/Sony/Digital_Recorder/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Digital_Recorder/1,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Pre-Amplifier/16,-1.ir b/_CSV-IRDB_/S/Sony/Pre-Amplifier/16,-1.ir
index 9704d99a..4181627c 100644
--- a/_CSV-IRDB_/S/Sony/Pre-Amplifier/16,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Pre-Amplifier/16,-1.ir
@@ -73,7 +73,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Pre-Amplifier/26,66.ir b/_CSV-IRDB_/S/Sony/Pre-Amplifier/26,66.ir
index d261eeb5..54996365 100644
--- a/_CSV-IRDB_/S/Sony/Pre-Amplifier/26,66.ir
+++ b/_CSV-IRDB_/S/Sony/Pre-Amplifier/26,66.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A 42 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 1A 42 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A 42 00 00
diff --git a/_CSV-IRDB_/S/Sony/Receiver/16,-1.ir b/_CSV-IRDB_/S/Sony/Receiver/16,-1.ir
index bd408a13..27921fcb 100644
--- a/_CSV-IRDB_/S/Sony/Receiver/16,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Receiver/16,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 10 00 00 00
 command: 12 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 13 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Receiver/26,66.ir b/_CSV-IRDB_/S/Sony/Receiver/26,66.ir
index fc34d893..1945c85a 100644
--- a/_CSV-IRDB_/S/Sony/Receiver/26,66.ir
+++ b/_CSV-IRDB_/S/Sony/Receiver/26,66.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1A 42 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1A 42 00 00
diff --git a/_CSV-IRDB_/S/Sony/Receiver/48,-1.ir b/_CSV-IRDB_/S/Sony/Receiver/48,-1.ir
index 759ec31e..4766f598 100644
--- a/_CSV-IRDB_/S/Sony/Receiver/48,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Receiver/48,-1.ir
@@ -91,7 +91,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/TV/1,-1.ir b/_CSV-IRDB_/S/Sony/TV/1,-1.ir
index a0d6b257..708f0031 100644
--- a/_CSV-IRDB_/S/Sony/TV/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/TV/1,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_870/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_870/1,-1.ir
index fda5e930..5ae9a3be 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_870/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_870/1,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 61 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 75 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_CD/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_CD/17,-1.ir
index e0af80fa..7346c996 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_CD/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_CD/17,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -67,109 +67,109 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_QUIT
+name: QUIT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 17 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 29 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -211,19 +211,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -235,43 +235,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 39 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_CDIR/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_CDIR/17,-1.ir
index 25e0bd25..c39ea4c4 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_CDIR/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_CDIR/17,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -115,49 +115,49 @@ protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -169,25 +169,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 39 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_CDP-790/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_CDP-790/17,-1.ir
index 3f4cc772..a0285229 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_CDP-790/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_CDP-790/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -67,19 +67,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 37 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_D1000/89,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_D1000/89,-1.ir
index 4f06a066..bc82d2ad 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_D1000/89,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_D1000/89,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 59 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 59 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 59 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 59 00 00 00
 command: 24 00 00 00
 #
-name: KEY_LIGHTS_TOGGLE
+name: LIGHTS_TOGGLE
 type: parsed
 protocol: NECext
 address: 59 00 00 00
@@ -211,25 +211,25 @@ protocol: NECext
 address: 59 00 00 00
 command: 35 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 38 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 39 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 59 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 59 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_DAT/28,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_DAT/28,-1.ir
index e18c9095..33ed4216 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_DAT/28,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_DAT/28,-1.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 08 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 13 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 39 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 68 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
 command: 69 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1C 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_DVD/26,18.ir b/_CSV-IRDB_/S/Sony/Unknown_DVD/26,18.ir
index 6ec213be..88c9411c 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_DVD/26,18.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_DVD/26,18.ir
@@ -61,37 +61,37 @@ protocol: NECext
 address: 1A 12 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
 command: 0E 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
 command: 15 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 1A 12 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 1A 12 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 1A 12 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 1A 12 00 00
 command: 54 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
 command: 63 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
 command: 64 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A 12 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_DVD/26,73.ir b/_CSV-IRDB_/S/Sony/Unknown_DVD/26,73.ir
index 456dfd8e..7147514e 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_DVD/26,73.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_DVD/26,73.ir
@@ -61,43 +61,43 @@ protocol: NECext
 address: 1A 49 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0E 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 16 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 1A 49 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 1A 49 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 1A 49 00 00
 command: 58 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 63 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 64 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-687C/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-687C/1,-1.ir
index a79d0480..4ff555bc 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-687C/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-687C/1,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 75 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-860/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-860/1,-1.ir
index f494f8ff..8526faf2 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-860/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-860/1,-1.ir
@@ -7,25 +7,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 31 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-861/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-861/1,-1.ir
index fa41e4f5..a17ab898 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-861/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-861/1,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 29 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-873/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-873/1,-1.ir
index ecb19664..9f658e38 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-873/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-873/1,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 75 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D190/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D190/17,-1.ir
index a4c18a67..cc155c81 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D190/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D190/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -79,37 +79,37 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D295/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D295/17,-1.ir
index ba9168c0..138e6dc9 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D295/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D295/17,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -85,43 +85,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D320/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D320/17,-1.ir
index 46dd8486..86a44c4b 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D320/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D320/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D325/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D325/17,-1.ir
index 0b53f467..31119d24 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D325/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D325/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D391/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D391/17,-1.ir
index cfc3da03..cbecaaa2 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D391/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D391/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D520/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D520/17,-1.ir
index 9a9ad643..da194362 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D520/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D520/17,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D55/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D55/17,-1.ir
index 46559646..5940ca87 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D55/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D55/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D690/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D690/17,-1.ir
index c64dd3eb..4b8e3081 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D690/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D690/17,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 16 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -103,43 +103,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 22 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 24 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 26 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -193,25 +193,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 34 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D706/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D706/17,-1.ir
index 4e7f304b..0ec8e273 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D706/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D706/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -121,43 +121,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 29 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D797/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D797/17,-1.ir
index 0fe8a163..d1eb3360 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D797/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D797/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,25 +61,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -115,97 +115,97 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 26 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 29 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 37 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D7M/15,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D7M/15,-1.ir
index 54e6f9ea..ff892cfd 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D7M/15,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D7M/15,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 0F 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 0F 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 0F 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 20 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -223,49 +223,49 @@ protocol: NECext
 address: 0F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -277,19 +277,19 @@ protocol: NECext
 address: 0F 00 00 00
 command: 30 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -301,7 +301,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 33 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -313,7 +313,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 34 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -331,13 +331,13 @@ protocol: NECext
 address: 0F 00 00 00
 command: 37 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -349,19 +349,19 @@ protocol: NECext
 address: 0F 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -379,91 +379,91 @@ protocol: NECext
 address: 0F 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 40 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 41 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 42 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 43 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 44 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 45 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 46 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 47 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 49 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D820/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D820/17,-1.ir
index 32a89418..b7020d94 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D820/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D820/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D90/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D90/17,-1.ir
index ab8c8e16..61b04239 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D90/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D90/17,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D921/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D921/17,-1.ir
index a69b8832..bfdfd7d6 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D921/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D921/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,43 +61,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -211,37 +211,37 @@ protocol: NECext
 address: 11 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -265,13 +265,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 37 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-D991/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-D991/17,-1.ir
index e320bc73..b974a5d4 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-D991/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-D991/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 10 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -205,37 +205,37 @@ protocol: NECext
 address: 11 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 37 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-DM7/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-DM7/17,-1.ir
index 543c2ea1..53b9f3c4 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-DM7/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-DM7/17,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 39 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-DX740/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-DX740/17,-1.ir
index 8c06812e..33af6a68 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-DX740/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-DX740/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -115,37 +115,37 @@ protocol: NECext
 address: 11 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-ED019/26,73.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-ED019/26,73.ir
index ef154614..f7522709 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-ED019/26,73.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-ED019/26,73.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 09 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 13 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -103,55 +103,55 @@ protocol: NECext
 address: 1A 49 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 1B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 39 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -163,37 +163,37 @@ protocol: NECext
 address: 1A 49 00 00
 command: 54 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 63 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 64 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 79 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-PJP1/26,42.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-PJP1/26,42.ir
index b7e2a09b..b513a417 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-PJP1/26,42.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-PJP1/26,42.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 2A 00 00
 command: 7B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 2A 00 00
 command: 7C 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 1A 2A 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-SG20/131,0.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-SG20/131,0.ir
index a133dc28..e4bf3fee 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-SG20/131,0.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-SG20/131,0.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 03 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 83 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 83 00 00 00
 command: 55 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -91,43 +91,43 @@ protocol: NECext
 address: 83 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 92 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 93 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 94 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 95 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 9A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 9B 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 83 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-SG5/131,0.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-SG5/131,0.ir
index ff63d4ea..330c79c4 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-SG5/131,0.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-SG5/131,0.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 03 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 83 00 00 00
 command: 52 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -55,43 +55,43 @@ protocol: NECext
 address: 83 00 00 00
 command: 55 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 90 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 91 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 93 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 94 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 95 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 96 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 83 00 00 00
 command: 99 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 83 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-SG7/131,0.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-SG7/131,0.ir
index 60108660..a28a29f0 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-SG7/131,0.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-SG7/131,0.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 83 00 00 00
 command: 52 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 83 00 00 00
 command: 90 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 83 00 00 00
 command: 91 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 83 00 00 00
 command: 95 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 83 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 83 00 00 00
 command: 99 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 83 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-V211T/2,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-V211T/2,-1.ir
index a98aefe1..ef156b93 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-V211T/2,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-V211T/2,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 12 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 20 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 21 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 22 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 25 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 02 00 00 00
 command: 27 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_QUIT
+name: QUIT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 02 00 00 00
 command: 36 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 39 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-W101/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-W101/1,-1.ir
index 90f25262..f70e6f0a 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-W101/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-W101/1,-1.ir
@@ -61,37 +61,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 29 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 33 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_MAX
+name: MAX
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 38 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 65 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-X30/132,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-X30/132,-1.ir
index 9f765f3c..700507cf 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-X30/132,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-X30/132,-1.ir
@@ -19,19 +19,19 @@ protocol: NECext
 address: 84 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -55,25 +55,25 @@ protocol: NECext
 address: 84 00 00 00
 command: 28 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 31 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 37 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-X40/132,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-X40/132,-1.ir
index 112f1e07..490b7e84 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-X40/132,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-X40/132,-1.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: 84 00 00 00
 command: 11 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 12 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -49,25 +49,25 @@ protocol: NECext
 address: 84 00 00 00
 command: 28 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 46 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-X42/132,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-X42/132,-1.ir
index 2bd76b80..b3bb7f19 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-X42/132,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-X42/132,-1.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: 84 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 84 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-X47/132,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-X47/132,-1.ir
index 01a39810..194d4b32 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-X47/132,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-X47/132,-1.ir
@@ -49,25 +49,25 @@ protocol: NECext
 address: 84 00 00 00
 command: 28 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 46 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-Y155B/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-Y155B/1,-1.ir
index 1f11ba78..134b9e40 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-Y155B/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-Y155B/1,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 64 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 65 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-Y173/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-Y173/1,-1.ir
index 1206a4b7..4794e2dd 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-Y173/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-Y173/1,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 33 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 34 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 65 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-Y180/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-Y180/1,-1.ir
index 407599f3..3c2d508e 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-Y180/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-Y180/1,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 33 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 34 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 64 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 65 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-Y800/183,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-Y800/183,-1.ir
index 265e6d37..89e03a26 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-Y800/183,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-Y800/183,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: B7 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: B7 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B7 00 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: B7 00 00 00
 command: 25 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B7 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: B7 00 00 00
 command: 44 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: B7 00 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: B7 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 60 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 61 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: B7 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: B7 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: B7 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: B7 00 00 00
 command: 75 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: B7 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RM-Y812/183,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RM-Y812/183,-1.ir
index 29f656f3..e8a48de9 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RM-Y812/183,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RM-Y812/183,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B7 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: B7 00 00 00
 command: 38 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: B7 00 00 00
 command: 63 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: B7 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-136/2,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-136/2,-1.ir
index ce775ff1..f8fc2459 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-136/2,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-136/2,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-506/7,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-506/7,-1.ir
index 80babaac..a22d2c92 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-506/7,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-506/7,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-B101A/26,226.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-B101A/26,226.ir
index bea22d6e..542c5254 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-B101A/26,226.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-B101A/26,226.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 09 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 0B 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 1A E2 00 00
 command: 2C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 2F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 1A E2 00 00
 command: 3C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 1A E2 00 00
 command: 42 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 43 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 4B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
@@ -211,31 +211,31 @@ protocol: NECext
 address: 1A E2 00 00
 command: 54 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 56 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 57 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 63 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
 command: 64 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 1A E2 00 00
 command: 71 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 1A E2 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-CF1A/26,19.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-CF1A/26,19.ir
index 4fd76fe1..14ba4525 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-CF1A/26,19.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-CF1A/26,19.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
 command: 15 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 1A 13 00 00
 command: 3E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 1A 13 00 00
 command: 4B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 1A 13 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-D115P/26,73.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-D115P/26,73.ir
index 7972b244..fc1395f9 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-D115P/26,73.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-D115P/26,73.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0E 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 16 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 1A 49 00 00
 command: 28 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 32 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -163,43 +163,43 @@ protocol: NECext
 address: 1A 49 00 00
 command: 54 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 63 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 64 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 65 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 79 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-D126A/26,73.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-D126A/26,73.ir
index f5ebff6d..a4c77ac6 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-D126A/26,73.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-D126A/26,73.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0E 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 16 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 1A 49 00 00
 command: 1F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 22 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 1A 49 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 1A 49 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 1A 49 00 00
 command: 48 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 4B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -151,43 +151,43 @@ protocol: NECext
 address: 1A 49 00 00
 command: 5C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 63 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 64 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 65 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 79 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-D126E/26,73.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-D126E/26,73.ir
index de5f931b..1fcd7c9d 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-D126E/26,73.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-D126E/26,73.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0E 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 16 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 1A 49 00 00
 command: 22 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 23 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -73,25 +73,25 @@ protocol: NECext
 address: 1A 49 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 1A 49 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 1A 49 00 00
 command: 48 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -145,43 +145,43 @@ protocol: NECext
 address: 1A 49 00 00
 command: 5C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 63 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 64 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 65 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 79 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-D129A/26,73.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-D129A/26,73.ir
index 038e0683..67f58d7e 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-D129A/26,73.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-D129A/26,73.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0E 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 1A 49 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 16 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 1A 49 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 1A 49 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -211,43 +211,43 @@ protocol: NECext
 address: 1A 49 00 00
 command: 5C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 63 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 64 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 65 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 79 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-DSC2/26,241.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-DSC2/26,241.ir
index 6ef3e692..8d04c25f 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-DSC2/26,241.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-DSC2/26,241.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 1A F1 00 00
@@ -13,7 +13,7 @@ protocol: NECext
 address: 1A F1 00 00
 command: 2D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A F1 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 1A F1 00 00
 command: 39 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A F1 00 00
 command: 3A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A F1 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 1A F1 00 00
 command: 47 00 00 00
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: 1A F1 00 00
 command: 4A 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 1A F1 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-V107/11,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-V107/11,-1.ir
index 4f9aed1a..d928c930 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-V107/11,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-V107/11,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 0B 00 00 00
 command: 52 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-V270/11,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-V270/11,-1.ir
index d47bb86f..0fdff675 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-V270/11,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-V270/11,-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_RMT-V501A/26,83.ir b/_CSV-IRDB_/S/Sony/Unknown_RMT-V501A/26,83.ir
index 1915e389..40229ceb 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_RMT-V501A/26,83.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_RMT-V501A/26,83.ir
@@ -1,139 +1,139 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 0B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 15 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 16 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 1A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 1B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 1A 53 00 00
 command: 22 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 23 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 1A 53 00 00
 command: 30 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 42 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 43 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 1A 53 00 00
 command: 4F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 56 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
@@ -229,37 +229,37 @@ protocol: NECext
 address: 1A 53 00 00
 command: 5B 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 5D 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 60 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 61 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 62 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
 command: 63 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 1A 53 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_SONY/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_SONY/17,-1.ir
index 5c23e6e0..28de92c2 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_SONY/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_SONY/17,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -61,19 +61,19 @@ protocol: NECext
 address: 11 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -103,43 +103,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_VPL-W400/84,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_VPL-W400/84,-1.ir
index 5e3f4e55..dd83cf05 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_VPL-W400/84,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_VPL-W400/84,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 54 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 54 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 54 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 54 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 54 00 00 00
 command: 26 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 54 00 00 00
 command: 29 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 54 00 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: 54 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 54 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 54 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 54 00 00 00
 command: 57 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 54 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_VaioRemote/4,15.ir b/_CSV-IRDB_/S/Sony/Unknown_VaioRemote/4,15.ir
index e7643977..4b9d5317 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_VaioRemote/4,15.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_VaioRemote/4,15.ir
@@ -1,247 +1,247 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 80 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_lircd.conf/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_lircd.conf/17,-1.ir
index dc38f016..169133fb 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_lircd.conf/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_lircd.conf/17,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 13 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_rm-d10p/26,97.ir b/_CSV-IRDB_/S/Sony/Unknown_rm-d10p/26,97.ir
index 825320c3..e7bb8049 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_rm-d10p/26,97.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_rm-d10p/26,97.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SPACE
+name: SPACE
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 1A 61 00 00
 command: 22 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 1A 61 00 00
 command: 28 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 1A 61 00 00
 command: 2A 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
@@ -97,61 +97,61 @@ protocol: NECext
 address: 1A 61 00 00
 command: 2F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 30 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 31 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 32 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 33 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 34 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 35 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 36 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 37 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 38 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
@@ -343,157 +343,157 @@ protocol: NECext
 address: 1A 61 00 00
 command: 5A 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 61 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 62 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 63 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 64 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 65 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 66 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 67 00 00 00
 #
-name: KEY_H
+name: H
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 68 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 69 00 00 00
 #
-name: KEY_J
+name: J
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 6A 00 00 00
 #
-name: KEY_K
+name: K
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 6B 00 00 00
 #
-name: KEY_L
+name: L
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 6C 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 6D 00 00 00
 #
-name: KEY_N
+name: N
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 6E 00 00 00
 #
-name: KEY_O
+name: O
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 6F 00 00 00
 #
-name: KEY_P
+name: P
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 70 00 00 00
 #
-name: KEY_Q
+name: Q
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 71 00 00 00
 #
-name: KEY_R
+name: R
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 72 00 00 00
 #
-name: KEY_S
+name: S
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 73 00 00 00
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 74 00 00 00
 #
-name: KEY_U
+name: U
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 75 00 00 00
 #
-name: KEY_V
+name: V
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 76 00 00 00
 #
-name: KEY_W
+name: W
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 77 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 78 00 00 00
 #
-name: KEY_Y
+name: Y
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
 command: 79 00 00 00
 #
-name: KEY_Z
+name: Z
 type: parsed
 protocol: NECext
 address: 1A 61 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_rm-d29m/15,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_rm-d29m/15,-1.ir
index d381a1d7..cae1f458 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_rm-d29m/15,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_rm-d29m/15,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 0F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 21 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 0F 00 00 00
 command: 27 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 28 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 0F 00 00 00
 command: 69 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_rm-d5/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_rm-d5/17,-1.ir
index d8270824..61225c3d 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_rm-d5/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_rm-d5/17,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 28 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -25,25 +25,25 @@ protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 39 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -55,31 +55,31 @@ protocol: NECext
 address: 11 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 40 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 41 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 42 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 43 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_rm-dm9/223,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_rm-dm9/223,-1.ir
index fa3c848b..afd332f3 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_rm-dm9/223,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_rm-dm9/223,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 13 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 27 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: DF 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: DF 00 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: DF 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: DF 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_rm-x95/132,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_rm-x95/132,-1.ir
index a03fd4ec..0470c8bb 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_rm-x95/132,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_rm-x95/132,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 84 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 84 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 84 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 84 00 00 00
 command: 35 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 84 00 00 00
 command: 46 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 84 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 84 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 84 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_sony-cd/17,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_sony-cd/17,-1.ir
index 4330daee..f70c8b4f 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_sony-cd/17,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_sony-cd/17,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 08 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -73,43 +73,43 @@ protocol: NECext
 address: 11 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 20 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 11 00 00 00
 command: 27 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 11 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 30 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 11 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 11 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 11 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 11 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_sonyRM-sep303/4,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_sonyRM-sep303/4,-1.ir
index 4416e842..02a908c3 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_sonyRM-sep303/4,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_sonyRM-sep303/4,-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -49,19 +49,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 33 00 00 00
 #
-name: Timer(on/off)
+name: Timer(POWER)
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_sonytv/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_sonytv/1,-1.ir
index 6aef8de2..8529c079 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_sonytv/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_sonytv/1,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1_
+name: 1_
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_2_
+name: 2_
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -157,25 +157,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 75 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_tv/1,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_tv/1,-1.ir
index 2d46687d..eafa5d68 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_tv/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_tv/1,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 23 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -217,31 +217,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 30 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -307,25 +307,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 60 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 61 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 62 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Unknown_tv/2,-1.ir b/_CSV-IRDB_/S/Sony/Unknown_tv/2,-1.ir
index 455bca4a..d2c4cc10 100644
--- a/_CSV-IRDB_/S/Sony/Unknown_tv/2,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Unknown_tv/2,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 02 00 00 00
 command: 17 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 23 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 02 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 02 00 00 00
 command: 33 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -343,7 +343,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 49 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -373,7 +373,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 53 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -385,13 +385,13 @@ protocol: NECext
 address: 02 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/VCR/1,-1.ir b/_CSV-IRDB_/S/Sony/VCR/1,-1.ir
index 4dccae87..051cdded 100644
--- a/_CSV-IRDB_/S/Sony/VCR/1,-1.ir
+++ b/_CSV-IRDB_/S/Sony/VCR/1,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/VCR/11,-1.ir b/_CSV-IRDB_/S/Sony/VCR/11,-1.ir
index 41fac7ea..1b5790b9 100644
--- a/_CSV-IRDB_/S/Sony/VCR/11,-1.ir
+++ b/_CSV-IRDB_/S/Sony/VCR/11,-1.ir
@@ -103,7 +103,7 @@ protocol: NECext
 address: 0B 00 00 00
 command: 10 00 00 00
 #
-name: CH_UP
+name: CH+
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
@@ -439,7 +439,7 @@ protocol: NECext
 address: 0B 00 00 00
 command: 2E 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 0B 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/VCR/2,-1.ir b/_CSV-IRDB_/S/Sony/VCR/2,-1.ir
index 3867f6c3..3f202655 100644
--- a/_CSV-IRDB_/S/Sony/VCR/2,-1.ir
+++ b/_CSV-IRDB_/S/Sony/VCR/2,-1.ir
@@ -307,7 +307,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 2E 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/VCR/7,-1.ir b/_CSV-IRDB_/S/Sony/VCR/7,-1.ir
index a1f910ff..3bf3e852 100644
--- a/_CSV-IRDB_/S/Sony/VCR/7,-1.ir
+++ b/_CSV-IRDB_/S/Sony/VCR/7,-1.ir
@@ -283,7 +283,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 2E 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/S/Sony/Video_Projector/84,-1.ir b/_CSV-IRDB_/S/Sony/Video_Projector/84,-1.ir
index 04ec7fe8..4f90f902 100644
--- a/_CSV-IRDB_/S/Sony/Video_Projector/84,-1.ir
+++ b/_CSV-IRDB_/S/Sony/Video_Projector/84,-1.ir
@@ -145,7 +145,7 @@ protocol: NECext
 address: 54 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 54 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 54 00 00 00
 command: 12 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 54 00 00 00
@@ -403,7 +403,7 @@ protocol: NECext
 address: 54 00 00 00
 command: 2E 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 54 00 00 00
diff --git a/_CSV-IRDB_/S/Speed-link/Unknown_SL-6399/0,-1.ir b/_CSV-IRDB_/S/Speed-link/Unknown_SL-6399/0,-1.ir
index 0234ebfe..8040d8d0 100644
--- a/_CSV-IRDB_/S/Speed-link/Unknown_SL-6399/0,-1.ir
+++ b/_CSV-IRDB_/S/Speed-link/Unknown_SL-6399/0,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,73 +19,73 @@ protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,73 +127,73 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,49 +229,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -289,7 +289,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Starsat/Unknown_120/64,64.ir b/_CSV-IRDB_/S/Starsat/Unknown_120/64,64.ir
index cf6f6399..89120098 100644
--- a/_CSV-IRDB_/S/Starsat/Unknown_120/64,64.ir
+++ b/_CSV-IRDB_/S/Starsat/Unknown_120/64,64.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 40 40 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 0F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 40 40 00 00
 command: 11 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 13 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 19 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -187,37 +187,37 @@ protocol: NECext
 address: 40 40 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 1F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 40 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 41 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 40 40 00 00
 command: 42 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 44 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 40 40 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 40 40 00 00
 command: 46 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 40 00 00
diff --git a/_CSV-IRDB_/S/Starview/Unknown_Starview/0,249.ir b/_CSV-IRDB_/S/Starview/Unknown_Starview/0,249.ir
index 880119c2..dc432d07 100644
--- a/_CSV-IRDB_/S/Starview/Unknown_Starview/0,249.ir
+++ b/_CSV-IRDB_/S/Starview/Unknown_Starview/0,249.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 00 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 01 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 02 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 03 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 05 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
@@ -55,109 +55,109 @@ protocol: NECext
 address: 00 F9 00 00
 command: 08 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 0A 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 0C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 0D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 19 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 1C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 00 F9 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 00 F9 00 00
 command: 41 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
 command: 43 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 F9 00 00
diff --git a/_CSV-IRDB_/S/Streamzap/Unknown_PC/35,-1.ir b/_CSV-IRDB_/S/Streamzap/Unknown_PC/35,-1.ir
index 1b5c8823..bdd2b165 100644
--- a/_CSV-IRDB_/S/Streamzap/Unknown_PC/35,-1.ir
+++ b/_CSV-IRDB_/S/Streamzap/Unknown_PC/35,-1.ir
@@ -1,211 +1,211 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 11 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 20 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 21 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 22 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 23 00 00 00
diff --git a/_CSV-IRDB_/S/Sumvision/Unknown_Sumvision/0,-1.ir b/_CSV-IRDB_/S/Sumvision/Unknown_Sumvision/0,-1.ir
index ac6cda89..4888ef79 100644
--- a/_CSV-IRDB_/S/Sumvision/Unknown_Sumvision/0,-1.ir
+++ b/_CSV-IRDB_/S/Sumvision/Unknown_Sumvision/0,-1.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,25 +25,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,91 +67,91 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,19 +193,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,31 +217,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Sunfire/Surround_Processor/184,0.ir b/_CSV-IRDB_/S/Sunfire/Surround_Processor/184,0.ir
index a7523bd4..f56d9d0c 100644
--- a/_CSV-IRDB_/S/Sunfire/Surround_Processor/184,0.ir
+++ b/_CSV-IRDB_/S/Sunfire/Surround_Processor/184,0.ir
@@ -109,13 +109,13 @@ protocol: NECext
 address: B8 00 00 00
 command: 96 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: B8 00 00 00
 command: 9A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: B8 00 00 00
diff --git a/_CSV-IRDB_/S/Sungale/Unknown_JX-2002/0,-1.ir b/_CSV-IRDB_/S/Sungale/Unknown_JX-2002/0,-1.ir
index 4c77909a..77e16f09 100644
--- a/_CSV-IRDB_/S/Sungale/Unknown_JX-2002/0,-1.ir
+++ b/_CSV-IRDB_/S/Sungale/Unknown_JX-2002/0,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,187 +19,187 @@ protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/S/Supermax/Unknown_Supermax/128,38.ir b/_CSV-IRDB_/S/Supermax/Unknown_Supermax/128,38.ir
index cec6b9d4..e995a7a9 100644
--- a/_CSV-IRDB_/S/Supermax/Unknown_Supermax/128,38.ir
+++ b/_CSV-IRDB_/S/Supermax/Unknown_Supermax/128,38.ir
@@ -13,43 +13,43 @@ protocol: NECext
 address: 80 26 00 00
 command: 81 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 82 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 84 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 85 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 86 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 87 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 88 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -61,31 +61,31 @@ protocol: NECext
 address: 80 26 00 00
 command: 8A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 8B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 8C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 8D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 8E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 80 26 00 00
 command: 92 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 80 26 00 00
 command: 96 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 80 26 00 00
 command: 98 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 80 26 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: 80 26 00 00
 command: 9B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 9C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 9D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 26 00 00
 command: 9E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 26 00 00
diff --git a/_CSV-IRDB_/S/Supportplus/Unknown_SP-URC-LCD-F15/10,-1.ir b/_CSV-IRDB_/S/Supportplus/Unknown_SP-URC-LCD-F15/10,-1.ir
index 33b08cf2..47221025 100644
--- a/_CSV-IRDB_/S/Supportplus/Unknown_SP-URC-LCD-F15/10,-1.ir
+++ b/_CSV-IRDB_/S/Supportplus/Unknown_SP-URC-LCD-F15/10,-1.ir
@@ -1,199 +1,199 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 61 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/S/Syabas/Unknown_A-100/4,203.ir b/_CSV-IRDB_/S/Syabas/Unknown_A-100/4,203.ir
index fd874ac5..aeb88946 100644
--- a/_CSV-IRDB_/S/Syabas/Unknown_A-100/4,203.ir
+++ b/_CSV-IRDB_/S/Syabas/Unknown_A-100/4,203.ir
@@ -1,301 +1,301 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 01 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 03 00 00 00
 #
-name: KEY_ARCHIVE
+name: ARCHIVE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 05 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 07 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 09 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 0A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 0D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 0E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 11 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 12 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 13 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 15 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 17 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 1A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 1B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 1D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 41 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 42 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 43 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 44 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 46 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 47 00 00 00
 #
-name: KEY_FILE
+name: FILE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 48 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4C 00 00 00
 #
-name: KEY_SUSPEND
+name: SUSPEND
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4D 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4E 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 4F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 51 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 52 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 53 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 54 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 55 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 56 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 57 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 58 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 59 00 00 00
 #
-name: KEY_CAPSLOCK
+name: CAPSLOCK
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 5A 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 5B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
 command: 5C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 CB 00 00
diff --git a/_CSV-IRDB_/S/Symphonic/TV/41,-1.ir b/_CSV-IRDB_/S/Symphonic/TV/41,-1.ir
index 74b186cf..1b032833 100644
--- a/_CSV-IRDB_/S/Symphonic/TV/41,-1.ir
+++ b/_CSV-IRDB_/S/Symphonic/TV/41,-1.ir
@@ -115,13 +115,13 @@ protocol: NECext
 address: 29 00 00 00
 command: 2F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 29 00 00 00
 command: 30 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 29 00 00 00
diff --git a/_CSV-IRDB_/S/starhub/Unknown_starhub/33,144.ir b/_CSV-IRDB_/S/starhub/Unknown_starhub/33,144.ir
index 6f180997..5ee2c64c 100644
--- a/_CSV-IRDB_/S/starhub/Unknown_starhub/33,144.ir
+++ b/_CSV-IRDB_/S/starhub/Unknown_starhub/33,144.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 21 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 43 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 21 90 00 00
@@ -157,61 +157,61 @@ protocol: NECext
 address: 21 90 00 00
 command: 66 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 6D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 6E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 6F 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 70 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 81 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 83 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: 84 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: CC 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 21 90 00 00
 command: DB 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 21 90 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 21 90 00 00
 command: F5 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 21 90 00 00
diff --git a/_CSV-IRDB_/T/TCM/Unknown_212845-CD/5,-1.ir b/_CSV-IRDB_/T/TCM/Unknown_212845-CD/5,-1.ir
index e239631c..fee2d1af 100644
--- a/_CSV-IRDB_/T/TCM/Unknown_212845-CD/5,-1.ir
+++ b/_CSV-IRDB_/T/TCM/Unknown_212845-CD/5,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -97,61 +97,61 @@ protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -169,49 +169,49 @@ protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/T/TCM/Unknown_218681/5,5.ir b/_CSV-IRDB_/T/TCM/Unknown_218681/5,5.ir
index 4e1436dd..9f1b6ce9 100644
--- a/_CSV-IRDB_/T/TCM/Unknown_218681/5,5.ir
+++ b/_CSV-IRDB_/T/TCM/Unknown_218681/5,5.ir
@@ -7,79 +7,79 @@ protocol: NECext
 address: 05 05 00 00
 command: 01 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 05 05 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 1D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 1F 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 24 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 05 05 00 00
 command: 2B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 2C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 2D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 7D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/T/TCM/Unknown_225925/24,233.ir b/_CSV-IRDB_/T/TCM/Unknown_225925/24,233.ir
index 6d40785c..2a94433a 100644
--- a/_CSV-IRDB_/T/TCM/Unknown_225925/24,233.ir
+++ b/_CSV-IRDB_/T/TCM/Unknown_225925/24,233.ir
@@ -1,169 +1,169 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 0D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 17 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 17 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 20 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 25 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 27 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 46 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 49 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 4B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 5C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 5D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 5E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 5F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 89 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 8B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: 8C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: C6 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
 command: F1 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 E9 00 00
diff --git a/_CSV-IRDB_/T/TCM/Unknown_225926/35,-1.ir b/_CSV-IRDB_/T/TCM/Unknown_225926/35,-1.ir
index 32d52579..d5b4a3c6 100644
--- a/_CSV-IRDB_/T/TCM/Unknown_225926/35,-1.ir
+++ b/_CSV-IRDB_/T/TCM/Unknown_225926/35,-1.ir
@@ -1,169 +1,169 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 17 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 17 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 18 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 23 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 23 00 00 00
diff --git a/_CSV-IRDB_/T/TCM/Unknown_96518/0,-1.ir b/_CSV-IRDB_/T/TCM/Unknown_96518/0,-1.ir
index 293ff94e..b278af01 100644
--- a/_CSV-IRDB_/T/TCM/Unknown_96518/0,-1.ir
+++ b/_CSV-IRDB_/T/TCM/Unknown_96518/0,-1.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/TCM/Unknown_TCM/176,0.ir b/_CSV-IRDB_/T/TCM/Unknown_TCM/176,0.ir
index 151e401d..1b98856d 100644
--- a/_CSV-IRDB_/T/TCM/Unknown_TCM/176,0.ir
+++ b/_CSV-IRDB_/T/TCM/Unknown_TCM/176,0.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -13,91 +13,91 @@ protocol: NECext
 address: B0 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 19 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 33 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -109,73 +109,73 @@ protocol: NECext
 address: B0 00 00 00
 command: 48 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 49 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 80 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 82 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 83 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 85 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 86 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 87 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 88 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: B0 00 00 00
 command: 90 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: B0 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: B0 00 00 00
 command: 94 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: B0 00 00 00
diff --git a/_CSV-IRDB_/T/TCUAG/Unknown_TVBOX/6,-1.ir b/_CSV-IRDB_/T/TCUAG/Unknown_TVBOX/6,-1.ir
index 8338a467..210d41c5 100644
--- a/_CSV-IRDB_/T/TCUAG/Unknown_TVBOX/6,-1.ir
+++ b/_CSV-IRDB_/T/TCUAG/Unknown_TVBOX/6,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Mute
+name: MUTE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
diff --git a/_CSV-IRDB_/T/TEAC/Unknown_CD/134,97.ir b/_CSV-IRDB_/T/TEAC/Unknown_CD/134,97.ir
index 456eca2a..8614a5d3 100644
--- a/_CSV-IRDB_/T/TEAC/Unknown_CD/134,97.ir
+++ b/_CSV-IRDB_/T/TEAC/Unknown_CD/134,97.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 61 00 00
@@ -13,13 +13,13 @@ protocol: NECext
 address: 86 61 00 00
 command: 02 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 04 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 61 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 86 61 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 09 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 86 61 00 00
@@ -61,85 +61,85 @@ protocol: NECext
 address: 86 61 00 00
 command: 0B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 0C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 0E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 0F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 12 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 14 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 17 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 61 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 86 61 00 00
diff --git a/_CSV-IRDB_/T/TEAC/Unknown_RC-547/3,1.ir b/_CSV-IRDB_/T/TEAC/Unknown_RC-547/3,1.ir
index f6355f99..1b510820 100644
--- a/_CSV-IRDB_/T/TEAC/Unknown_RC-547/3,1.ir
+++ b/_CSV-IRDB_/T/TEAC/Unknown_RC-547/3,1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 03 01 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 03 01 00 00
diff --git a/_CSV-IRDB_/T/TEAC/Unknown_RC-548/128,114.ir b/_CSV-IRDB_/T/TEAC/Unknown_RC-548/128,114.ir
index 3a2440a6..97ecf093 100644
--- a/_CSV-IRDB_/T/TEAC/Unknown_RC-548/128,114.ir
+++ b/_CSV-IRDB_/T/TEAC/Unknown_RC-548/128,114.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 00 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 04 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 06 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 09 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 0A 00 00 00
 #
-name: X_KEY_1/all
+name: X_1/all
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 0C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 80 72 00 00
@@ -61,67 +61,67 @@ protocol: NECext
 address: 80 72 00 00
 command: 0E 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 0F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 11 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 12 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 14 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 17 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 72 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 80 72 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 80 72 00 00
 command: 1A 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 80 72 00 00
diff --git a/_CSV-IRDB_/T/TEAC/Unknown_RC-558/130,120.ir b/_CSV-IRDB_/T/TEAC/Unknown_RC-558/130,120.ir
index 36bcb578..05d8d883 100644
--- a/_CSV-IRDB_/T/TEAC/Unknown_RC-558/130,120.ir
+++ b/_CSV-IRDB_/T/TEAC/Unknown_RC-558/130,120.ir
@@ -13,43 +13,43 @@ protocol: NECext
 address: 82 78 00 00
 command: 0C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 82 78 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 82 78 00 00
 command: 11 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 82 78 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 82 78 00 00
 command: 13 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 82 78 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 82 78 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 82 78 00 00
diff --git a/_CSV-IRDB_/T/TEAC/Unknown_RC-614/0,-1.ir b/_CSV-IRDB_/T/TEAC/Unknown_RC-614/0,-1.ir
index 6b22620c..19d88365 100644
--- a/_CSV-IRDB_/T/TEAC/Unknown_RC-614/0,-1.ir
+++ b/_CSV-IRDB_/T/TEAC/Unknown_RC-614/0,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/TEAC/Unknown_RC-909/34,1.ir b/_CSV-IRDB_/T/TEAC/Unknown_RC-909/34,1.ir
index 1b5a0f05..88c5ec2d 100644
--- a/_CSV-IRDB_/T/TEAC/Unknown_RC-909/34,1.ir
+++ b/_CSV-IRDB_/T/TEAC/Unknown_RC-909/34,1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 00 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 01 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 22 01 00 00
@@ -25,37 +25,37 @@ protocol: NECext
 address: 22 01 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 09 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 22 01 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 22 01 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 22 01 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 22 01 00 00
 command: 12 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 22 01 00 00
@@ -115,67 +115,67 @@ protocol: NECext
 address: 22 01 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 15 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 16 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 17 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 18 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 1C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 1D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 22 01 00 00
 command: 1E 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 22 01 00 00
diff --git a/_CSV-IRDB_/T/TECHNICS/Unknown_EUR643880/160,10.ir b/_CSV-IRDB_/T/TECHNICS/Unknown_EUR643880/160,10.ir
index 9a4d8038..0219d451 100644
--- a/_CSV-IRDB_/T/TECHNICS/Unknown_EUR643880/160,10.ir
+++ b/_CSV-IRDB_/T/TECHNICS/Unknown_EUR643880/160,10.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -25,73 +25,73 @@ protocol: NECext
 address: A0 0A 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: A0 0A 00 00
 command: 21 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: A0 0A 00 00
 command: 55 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 81 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 84 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
diff --git a/_CSV-IRDB_/T/TECHNICS/Unknown_EUR64798/160,10.ir b/_CSV-IRDB_/T/TECHNICS/Unknown_EUR64798/160,10.ir
index 5fe4c50a..e7f36871 100644
--- a/_CSV-IRDB_/T/TECHNICS/Unknown_EUR64798/160,10.ir
+++ b/_CSV-IRDB_/T/TECHNICS/Unknown_EUR64798/160,10.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -25,73 +25,73 @@ protocol: NECext
 address: A0 0A 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: A0 0A 00 00
 command: 21 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 55 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: A0 0A 00 00
 command: 84 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
diff --git a/_CSV-IRDB_/T/TECHNICS/Unknown_EUR64799/160,10.ir b/_CSV-IRDB_/T/TECHNICS/Unknown_EUR64799/160,10.ir
index 1e52f585..f0925886 100644
--- a/_CSV-IRDB_/T/TECHNICS/Unknown_EUR64799/160,10.ir
+++ b/_CSV-IRDB_/T/TECHNICS/Unknown_EUR64799/160,10.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: A0 0A 00 00
 command: 21 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -121,13 +121,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 48 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 49 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 55 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
diff --git a/_CSV-IRDB_/T/TECHNICS/Unknown_EURXP300/160,10.ir b/_CSV-IRDB_/T/TECHNICS/Unknown_EURXP300/160,10.ir
index c2936478..7a828211 100644
--- a/_CSV-IRDB_/T/TECHNICS/Unknown_EURXP300/160,10.ir
+++ b/_CSV-IRDB_/T/TECHNICS/Unknown_EURXP300/160,10.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: A0 0A 00 00
 command: 46 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: A0 0A 00 00
 command: 48 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 49 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 4A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: A0 0A 00 00
 command: 84 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
diff --git a/_CSV-IRDB_/T/TECHNICS/Unknown_cd/160,10.ir b/_CSV-IRDB_/T/TECHNICS/Unknown_cd/160,10.ir
index cb017e7a..89ed0962 100644
--- a/_CSV-IRDB_/T/TECHNICS/Unknown_cd/160,10.ir
+++ b/_CSV-IRDB_/T/TECHNICS/Unknown_cd/160,10.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 01 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 02 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 21 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 3D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: A0 0A 00 00
 command: 49 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 55 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
diff --git a/_CSV-IRDB_/T/TECHNICS/Unknown_sl-ps670a/160,10.ir b/_CSV-IRDB_/T/TECHNICS/Unknown_sl-ps670a/160,10.ir
index 34fe124c..ede7916a 100644
--- a/_CSV-IRDB_/T/TECHNICS/Unknown_sl-ps670a/160,10.ir
+++ b/_CSV-IRDB_/T/TECHNICS/Unknown_sl-ps670a/160,10.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 00 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 21 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 3D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: A0 0A 00 00
 command: 55 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
 command: 80 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: A0 0A 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_100TS035/10,-1.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_100TS035/10,-1.ir
index 92039010..ecc72cdc 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_100TS035/10,-1.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_100TS035/10,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -85,31 +85,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 23 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_FBPNA35/10,-1.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_FBPNA35/10,-1.ir
index e64194ca..648dccf5 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_FBPNA35/10,-1.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_FBPNA35/10,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 23 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -127,79 +127,79 @@ protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_FBPVR335A/10,-1.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_FBPVR335A/10,-1.ir
index f81b55a8..ac0fdd4e 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_FBPVR335A/10,-1.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_FBPVR335A/10,-1.ir
@@ -1,253 +1,253 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 22 00 00 00
 #
-name: KEY_SOUND
+name: SOUND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 23 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 26 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 37 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_QUESTION
+name: QUESTION
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 7D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_ST3002S/1,-1.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_ST3002S/1,-1.ir
index a89161b0..fd8a5fa4 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_ST3002S/1,-1.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_ST3002S/1,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -19,13 +19,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_TAB
+name: TAB
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -55,61 +55,61 @@ protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 29 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_ST3004S/1,-1.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_ST3004S/1,-1.ir
index 245ce5a4..d32960db 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_ST3004S/1,-1.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_ST3004S/1,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -13,79 +13,79 @@ protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 24 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 27 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 35 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_TECHNISAT/1,-1.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_TECHNISAT/1,-1.ir
index 70b97171..c4519066 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_TECHNISAT/1,-1.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_TECHNISAT/1,-1.ir
@@ -1,31 +1,31 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_TTS35AI.conf/10,-1.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_TTS35AI.conf/10,-1.ir
index 17da6fb7..7a5f7c9d 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_TTS35AI.conf/10,-1.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_TTS35AI.conf/10,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -85,31 +85,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 23 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -139,19 +139,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -163,31 +163,31 @@ protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_TTS35AI/10,-1.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_TTS35AI/10,-1.ir
index 8686154a..9c0e42b9 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_TTS35AI/10,-1.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_TTS35AI/10,-1.ir
@@ -1,199 +1,199 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REDO
+name: REDO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 22 00 00 00
 #
-name: KEY_AB
+name: AB
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 23 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/T/TECHNISAT/Unknown_st-6000e/131,121.ir b/_CSV-IRDB_/T/TECHNISAT/Unknown_st-6000e/131,121.ir
index c0fd4dea..217dfef7 100644
--- a/_CSV-IRDB_/T/TECHNISAT/Unknown_st-6000e/131,121.ir
+++ b/_CSV-IRDB_/T/TECHNISAT/Unknown_st-6000e/131,121.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 83 79 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 79 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 83 79 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 79 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 83 79 00 00
 command: 07 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 79 00 00
@@ -61,43 +61,43 @@ protocol: NECext
 address: 83 79 00 00
 command: 0A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 0B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 0D 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 0F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 11 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 79 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 83 79 00 00
 command: 14 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 83 79 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 83 79 00 00
 command: 1A 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 79 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 83 79 00 00
 command: 1F 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 83 79 00 00
@@ -181,31 +181,31 @@ protocol: NECext
 address: 83 79 00 00
 command: 44 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 48 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 4C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 50 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 79 00 00
 command: 54 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 79 00 00
diff --git a/_CSV-IRDB_/T/TELEFUNKEN/AUDIO_IR3000/0,1.ir b/_CSV-IRDB_/T/TELEFUNKEN/AUDIO_IR3000/0,1.ir
index df40bb5a..a0d0816d 100644
--- a/_CSV-IRDB_/T/TELEFUNKEN/AUDIO_IR3000/0,1.ir
+++ b/_CSV-IRDB_/T/TELEFUNKEN/AUDIO_IR3000/0,1.ir
@@ -85,13 +85,13 @@ protocol: NECext
 address: 00 01 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 01 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 00 01 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 00 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 01 00 00
 command: 1D 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 00 01 00 00
diff --git a/_CSV-IRDB_/T/TELEFUNKEN/TV_1127/7,-1.ir b/_CSV-IRDB_/T/TELEFUNKEN/TV_1127/7,-1.ir
index 322c3edb..50f21247 100644
--- a/_CSV-IRDB_/T/TELEFUNKEN/TV_1127/7,-1.ir
+++ b/_CSV-IRDB_/T/TELEFUNKEN/TV_1127/7,-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -85,37 +85,37 @@ protocol: NECext
 address: 07 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 29 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 38 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 39 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/T/TELEFUNKEN/TV_RC-1345/5,-1.ir b/_CSV-IRDB_/T/TELEFUNKEN/TV_RC-1345/5,-1.ir
index 401c9d36..bea0fee9 100644
--- a/_CSV-IRDB_/T/TELEFUNKEN/TV_RC-1345/5,-1.ir
+++ b/_CSV-IRDB_/T/TELEFUNKEN/TV_RC-1345/5,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 38 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 39 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/T/TELEFUNKEN/VCR_FB1550/67,-1.ir b/_CSV-IRDB_/T/TELEFUNKEN/VCR_FB1550/67,-1.ir
index 7f114c2a..3b9685fb 100644
--- a/_CSV-IRDB_/T/TELEFUNKEN/VCR_FB1550/67,-1.ir
+++ b/_CSV-IRDB_/T/TELEFUNKEN/VCR_FB1550/67,-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 03 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 04 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 06 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -79,61 +79,61 @@ protocol: NECext
 address: 43 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 21 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 22 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 23 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 24 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 25 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 26 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 27 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 43 00 00 00
 command: 28 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 31 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 34 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 38 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 43 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 43 00 00 00
@@ -319,7 +319,7 @@ protocol: NECext
 address: 43 00 00 00
 command: BE 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 43 00 00 00
diff --git a/_CSV-IRDB_/T/TELEFUNKEN/VCR_RC1323-Video-B/8,-1.ir b/_CSV-IRDB_/T/TELEFUNKEN/VCR_RC1323-Video-B/8,-1.ir
index e6700a83..289764de 100644
--- a/_CSV-IRDB_/T/TELEFUNKEN/VCR_RC1323-Video-B/8,-1.ir
+++ b/_CSV-IRDB_/T/TELEFUNKEN/VCR_RC1323-Video-B/8,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -55,25 +55,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 21 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 22 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 25 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 28 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 37 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/T/TRIAX/Unknown_DVB/10,-1.ir b/_CSV-IRDB_/T/TRIAX/Unknown_DVB/10,-1.ir
index a4ad1482..f27ea477 100644
--- a/_CSV-IRDB_/T/TRIAX/Unknown_DVB/10,-1.ir
+++ b/_CSV-IRDB_/T/TRIAX/Unknown_DVB/10,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/T/Tab_Electronics/Unknown_Kit/0,-1.ir b/_CSV-IRDB_/T/Tab_Electronics/Unknown_Kit/0,-1.ir
index 3f547363..fd097ac8 100644
--- a/_CSV-IRDB_/T/Tab_Electronics/Unknown_Kit/0,-1.ir
+++ b/_CSV-IRDB_/T/Tab_Electronics/Unknown_Kit/0,-1.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/Technosonic/Unknown_DVD-204/16,237.ir b/_CSV-IRDB_/T/Technosonic/Unknown_DVD-204/16,237.ir
index 96d5fc3f..89bace32 100644
--- a/_CSV-IRDB_/T/Technosonic/Unknown_DVD-204/16,237.ir
+++ b/_CSV-IRDB_/T/Technosonic/Unknown_DVD-204/16,237.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 00 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -25,37 +25,37 @@ protocol: NECext
 address: 10 ED 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 04 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 05 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 06 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 07 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -67,43 +67,43 @@ protocol: NECext
 address: 10 ED 00 00
 command: 0A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 0B 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 13 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 19 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1B 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 1D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 1E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 41 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 10 ED 00 00
 command: 43 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 44 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 45 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -175,61 +175,61 @@ protocol: NECext
 address: 10 ED 00 00
 command: 47 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 49 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 4A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 50 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 58 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 59 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5A 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
@@ -241,13 +241,13 @@ protocol: NECext
 address: 10 ED 00 00
 command: 5D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
 command: 5E 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 10 ED 00 00
diff --git a/_CSV-IRDB_/T/Technotrend/Unknown_DVB/21,-1.ir b/_CSV-IRDB_/T/Technotrend/Unknown_DVB/21,-1.ir
index a368337a..c701d47c 100644
--- a/_CSV-IRDB_/T/Technotrend/Unknown_DVB/21,-1.ir
+++ b/_CSV-IRDB_/T/Technotrend/Unknown_DVB/21,-1.ir
@@ -103,13 +103,13 @@ protocol: NECext
 address: 15 00 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 12 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -145,79 +145,79 @@ protocol: NECext
 address: 15 00 00 00
 command: 18 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 23 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 24 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 26 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/T/Technotrend/Unknown_Micro/21,-1.ir b/_CSV-IRDB_/T/Technotrend/Unknown_Micro/21,-1.ir
index 4d44c8c2..ec2c16fc 100644
--- a/_CSV-IRDB_/T/Technotrend/Unknown_Micro/21,-1.ir
+++ b/_CSV-IRDB_/T/Technotrend/Unknown_Micro/21,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 15 00 00 00
 command: 12 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 15 00 00 00
 command: 16 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -157,43 +157,43 @@ protocol: NECext
 address: 15 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 23 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 24 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 26 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/T/Technotrend/Unknown_S2400/21,-1.ir b/_CSV-IRDB_/T/Technotrend/Unknown_S2400/21,-1.ir
index b9d6aaea..5b2e7bc2 100644
--- a/_CSV-IRDB_/T/Technotrend/Unknown_S2400/21,-1.ir
+++ b/_CSV-IRDB_/T/Technotrend/Unknown_S2400/21,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -13,193 +13,193 @@ protocol: NECext
 address: 15 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 12 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 15 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 16 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 18 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 23 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 24 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 26 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 15 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/T/Technotrend/Unknown_Technotrend/21,-1.ir b/_CSV-IRDB_/T/Technotrend/Unknown_Technotrend/21,-1.ir
index 5851d720..474f12f2 100644
--- a/_CSV-IRDB_/T/Technotrend/Unknown_Technotrend/21,-1.ir
+++ b/_CSV-IRDB_/T/Technotrend/Unknown_Technotrend/21,-1.ir
@@ -1,223 +1,223 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 10 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 12 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 15 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 16 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 18 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 23 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 24 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 26 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/T/Technotrend/Unknown_remote/21,-1.ir b/_CSV-IRDB_/T/Technotrend/Unknown_remote/21,-1.ir
index be323a45..4be98d58 100644
--- a/_CSV-IRDB_/T/Technotrend/Unknown_remote/21,-1.ir
+++ b/_CSV-IRDB_/T/Technotrend/Unknown_remote/21,-1.ir
@@ -139,55 +139,55 @@ protocol: NECext
 address: 15 00 00 00
 command: 18 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 21 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 23 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 24 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 15 00 00 00
 command: 26 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 15 00 00 00
diff --git a/_CSV-IRDB_/T/Teleka/Unknown_STR2060/1,-1.ir b/_CSV-IRDB_/T/Teleka/Unknown_STR2060/1,-1.ir
index 2ae2a242..bcb5b567 100644
--- a/_CSV-IRDB_/T/Teleka/Unknown_STR2060/1,-1.ir
+++ b/_CSV-IRDB_/T/Teleka/Unknown_STR2060/1,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2KHZ
+name: 2KHZ
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -67,67 +67,67 @@ protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/T/Telemann/PC_HDTV_Tuner_Card/8,-1.ir b/_CSV-IRDB_/T/Telemann/PC_HDTV_Tuner_Card/8,-1.ir
index f55055df..805813c6 100644
--- a/_CSV-IRDB_/T/Telemann/PC_HDTV_Tuner_Card/8,-1.ir
+++ b/_CSV-IRDB_/T/Telemann/PC_HDTV_Tuner_Card/8,-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/T/Televes/Unknown_145075/8,-1.ir b/_CSV-IRDB_/T/Televes/Unknown_145075/8,-1.ir
index 2e327b7a..3875defb 100644
--- a/_CSV-IRDB_/T/Televes/Unknown_145075/8,-1.ir
+++ b/_CSV-IRDB_/T/Televes/Unknown_145075/8,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -115,73 +115,73 @@ protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -193,49 +193,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 20 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 21 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 22 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 23 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 24 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 25 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 26 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/T/Televes/Unknown_711701/1,-1.ir b/_CSV-IRDB_/T/Televes/Unknown_711701/1,-1.ir
index 9df93dda..3416224e 100644
--- a/_CSV-IRDB_/T/Televes/Unknown_711701/1,-1.ir
+++ b/_CSV-IRDB_/T/Televes/Unknown_711701/1,-1.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FILE
+name: FILE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 40 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -157,25 +157,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 43 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 51 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 52 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 54 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 55 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 56 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 57 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_GOTO
+name: GOTO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/T/Tensai/Unknown_5340fb/134,124.ir b/_CSV-IRDB_/T/Tensai/Unknown_5340fb/134,124.ir
index 6eb0ad29..6f45f7c5 100644
--- a/_CSV-IRDB_/T/Tensai/Unknown_5340fb/134,124.ir
+++ b/_CSV-IRDB_/T/Tensai/Unknown_5340fb/134,124.ir
@@ -1,139 +1,139 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 03 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 08 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 09 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 86 7C 00 00
diff --git a/_CSV-IRDB_/T/Terratec/Unknown_1400/4,235.ir b/_CSV-IRDB_/T/Terratec/Unknown_1400/4,235.ir
index 4062164c..79a2f7db 100644
--- a/_CSV-IRDB_/T/Terratec/Unknown_1400/4,235.ir
+++ b/_CSV-IRDB_/T/Terratec/Unknown_1400/4,235.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 04 EB 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: 04 EB 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 0E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 11 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 14 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 15 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
@@ -151,67 +151,67 @@ protocol: NECext
 address: 04 EB 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 4C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 54 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 58 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
diff --git a/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/134,107.ir b/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/134,107.ir
index 46aeb61c..cf34c5e3 100644
--- a/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/134,107.ir
+++ b/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/134,107.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -73,31 +73,31 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0B 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 86 6B 00 00
 command: 11 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 14 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -163,49 +163,49 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 20 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 21 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 22 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/20,-1.ir b/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/20,-1.ir
index 51ee154c..2a5f618d 100644
--- a/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/20,-1.ir
+++ b/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/20,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 14 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -79,163 +79,163 @@ protocol: NECext
 address: 14 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 11 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 14 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 17 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 18 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 19 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 40 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 42 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 43 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 44 00 00 00
 #
-name: KEY_DELETE
+name: DELETE
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 45 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 46 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 47 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 48 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 49 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 14 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 14 00 00 00
@@ -265,25 +265,25 @@ protocol: NECext
 address: 14 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 54 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 14 00 00 00
 command: 58 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 14 00 00 00
diff --git a/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/4,235.ir b/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/4,235.ir
index 2015cd5f..7fa11551 100644
--- a/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/4,235.ir
+++ b/_CSV-IRDB_/T/Terratec/Unknown_Cinergy/4,235.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 03 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 09 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
@@ -67,145 +67,145 @@ protocol: NECext
 address: 04 EB 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 0C 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 0E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 0F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 11 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 14 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 15 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 17 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 17 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 18 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 19 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 1F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 04 EB 00 00
 command: 54 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 EB 00 00
diff --git a/_CSV-IRDB_/T/Terratec/Unknown_M3PO/10,-1.ir b/_CSV-IRDB_/T/Terratec/Unknown_M3PO/10,-1.ir
index 3515b280..1bdc9440 100644
--- a/_CSV-IRDB_/T/Terratec/Unknown_M3PO/10,-1.ir
+++ b/_CSV-IRDB_/T/Terratec/Unknown_M3PO/10,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 46 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -19,25 +19,25 @@ protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -49,19 +49,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 61 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -73,37 +73,37 @@ protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 70 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/T/Terratec/Unknown_home/1,-1.ir b/_CSV-IRDB_/T/Terratec/Unknown_home/1,-1.ir
index 0b346592..3b3fefce 100644
--- a/_CSV-IRDB_/T/Terratec/Unknown_home/1,-1.ir
+++ b/_CSV-IRDB_/T/Terratec/Unknown_home/1,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -25,25 +25,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/T/Tesla/Unknown_32LCD70WDGHD/1,-1.ir b/_CSV-IRDB_/T/Tesla/Unknown_32LCD70WDGHD/1,-1.ir
index 7fbe4c57..43276000 100644
--- a/_CSV-IRDB_/T/Tesla/Unknown_32LCD70WDGHD/1,-1.ir
+++ b/_CSV-IRDB_/T/Tesla/Unknown_32LCD70WDGHD/1,-1.ir
@@ -61,19 +61,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -85,49 +85,49 @@ protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 22 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 29 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -187,43 +187,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 30 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 34 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 35 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 38 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/T/Tesla/Unknown_Tesla/11,11.ir b/_CSV-IRDB_/T/Tesla/Unknown_Tesla/11,11.ir
index 49d325cd..7ae3865b 100644
--- a/_CSV-IRDB_/T/Tesla/Unknown_Tesla/11,11.ir
+++ b/_CSV-IRDB_/T/Tesla/Unknown_Tesla/11,11.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 0C 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 16 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 18 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 0B 0B 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
 command: 1D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0B 0B 00 00
diff --git a/_CSV-IRDB_/T/Tesla/Unknown_Tesla/5,-1.ir b/_CSV-IRDB_/T/Tesla/Unknown_Tesla/5,-1.ir
index 26e9789a..1a0e90c2 100644
--- a/_CSV-IRDB_/T/Tesla/Unknown_Tesla/5,-1.ir
+++ b/_CSV-IRDB_/T/Tesla/Unknown_Tesla/5,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -109,73 +109,73 @@ protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_3830/1,-1.ir b/_CSV-IRDB_/T/Tevion/Unknown_3830/1,-1.ir
index 73e6235d..a87a56a2 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_3830/1,-1.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_3830/1,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 24 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 29 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 30 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -181,37 +181,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 34 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_41666/131,69.ir b/_CSV-IRDB_/T/Tevion/Unknown_41666/131,69.ir
index 01df9f67..d8047bf3 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_41666/131,69.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_41666/131,69.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -13,61 +13,61 @@ protocol: NECext
 address: 83 45 00 00
 command: 03 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 03 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 07 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 08 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 09 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 0A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 0B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 0C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 0D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -79,109 +79,109 @@ protocol: NECext
 address: 83 45 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 18 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 1D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 40 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 42 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 43 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 44 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 45 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 46 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 4B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 4F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 83 45 00 00
@@ -205,37 +205,37 @@ protocol: NECext
 address: 83 45 00 00
 command: 57 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 58 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 59 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 5C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 5E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 83 45 00 00
 command: 5F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 83 45 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_DFA/0,-1.ir b/_CSV-IRDB_/T/Tevion/Unknown_DFA/0,-1.ir
index d8a3ee7b..ebcd782d 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_DFA/0,-1.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_DFA/0,-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,127 +67,127 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_DVD/67,71.ir b/_CSV-IRDB_/T/Tevion/Unknown_DVD/67,71.ir
index 240beb62..25cd1441 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_DVD/67,71.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_DVD/67,71.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -73,103 +73,103 @@ protocol: NECext
 address: 43 47 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 15 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 16 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 17 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 18 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 19 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 43 47 00 00
 command: 1D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 43 47 00 00
 command: 1F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 2E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_MD-5410/5,-1.ir b/_CSV-IRDB_/T/Tevion/Unknown_MD-5410/5,-1.ir
index 25f1bf82..3e21c560 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_MD-5410/5,-1.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_MD-5410/5,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -67,133 +67,133 @@ protocol: NECext
 address: 05 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_CAMERA
+name: CAMERA
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_MD/23,105.ir b/_CSV-IRDB_/T/Tevion/Unknown_MD/23,105.ir
index d7011725..795c1ac4 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_MD/23,105.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_MD/23,105.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 17 69 00 00
 command: 00 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 17 69 00 00
 command: 01 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -31,115 +31,115 @@ protocol: NECext
 address: 17 69 00 00
 command: 04 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 11 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 13 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -151,85 +151,85 @@ protocol: NECext
 address: 17 69 00 00
 command: 1F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 42 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 49 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 4C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 4D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 51 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 52 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 53 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 55 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 59 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 17 69 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_MD/48,-1.ir b/_CSV-IRDB_/T/Tevion/Unknown_MD/48,-1.ir
index 2cef0496..a16bf3a1 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_MD/48,-1.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_MD/48,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -67,13 +67,13 @@ protocol: NECext
 address: 30 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 30 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -103,55 +103,55 @@ protocol: NECext
 address: 30 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 20 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 28 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 29 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 30 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 31 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -169,37 +169,37 @@ protocol: NECext
 address: 30 00 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 58 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 59 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 30 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 30 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 30 00 00 00
 command: F7 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 30 00 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_MDC-982PLL/162,162.ir b/_CSV-IRDB_/T/Tevion/Unknown_MDC-982PLL/162,162.ir
index 8b8548a2..004339e1 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_MDC-982PLL/162,162.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_MDC-982PLL/162,162.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 04 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 06 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 07 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: A2 A2 00 00
 command: 0E 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 0F 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: A2 A2 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: A2 A2 00 00
 command: 1D 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 1E 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
 command: 60 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: A2 A2 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_RS20536/67,71.ir b/_CSV-IRDB_/T/Tevion/Unknown_RS20536/67,71.ir
index 8fd8d9f2..acaf26c7 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_RS20536/67,71.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_RS20536/67,71.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -73,67 +73,67 @@ protocol: NECext
 address: 43 47 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 0F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 13 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 15 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: 43 47 00 00
 command: 18 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 19 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 1A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 43 47 00 00
 command: 1D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 43 47 00 00
 command: 1F 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 43 47 00 00
 command: 2E 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 43 47 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_SAT928/5,-1.ir b/_CSV-IRDB_/T/Tevion/Unknown_SAT928/5,-1.ir
index c6f78a5a..f312a91d 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_SAT928/5,-1.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_SAT928/5,-1.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 18 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -73,85 +73,85 @@ protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 23 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 27 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -163,55 +163,55 @@ protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 30 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_TDR-250HD/0,159.ir b/_CSV-IRDB_/T/Tevion/Unknown_TDR-250HD/0,159.ir
index c3d82659..76dcbb79 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_TDR-250HD/0,159.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_TDR-250HD/0,159.ir
@@ -13,25 +13,25 @@ protocol: NECext
 address: 00 9F 00 00
 command: 01 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 02 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 03 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 00 9F 00 00
 command: 09 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 0A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 9F 00 00
 command: 0C 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 00 9F 00 00
 command: 0E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 00 9F 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 15 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 9F 00 00
 command: 17 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 00 9F 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 00 9F 00 00
 command: 1D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 1E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -181,25 +181,25 @@ protocol: NECext
 address: 00 9F 00 00
 command: 40 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 41 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 42 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 00 9F 00 00
 command: 48 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 49 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 4A 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 9F 00 00
 command: 4C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 00 9F 00 00
 command: 4F 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 00 9F 00 00
 command: 54 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -289,49 +289,49 @@ protocol: NECext
 address: 00 9F 00 00
 command: 56 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 57 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 58 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 59 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 5A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 5B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 5C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 5D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_TDR51DV/0,159.ir b/_CSV-IRDB_/T/Tevion/Unknown_TDR51DV/0,159.ir
index 2cb99e78..4fce51cf 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_TDR51DV/0,159.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_TDR51DV/0,159.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 00 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 01 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 02 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 03 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -43,19 +43,19 @@ protocol: NECext
 address: 00 9F 00 00
 command: 08 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 09 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 0A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 00 9F 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -103,37 +103,37 @@ protocol: NECext
 address: 00 9F 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 15 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 16 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -157,73 +157,73 @@ protocol: NECext
 address: 00 9F 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 1E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 1F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 40 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 41 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 42 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 43 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 45 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 46 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 48 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 49 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 4A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 00 9F 00 00
 command: 4D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -253,31 +253,31 @@ protocol: NECext
 address: 00 9F 00 00
 command: 4F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 51 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 52 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 54 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 55 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -289,13 +289,13 @@ protocol: NECext
 address: 00 9F 00 00
 command: 57 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 58 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
@@ -307,19 +307,19 @@ protocol: NECext
 address: 00 9F 00 00
 command: 5A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 5B 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
 command: 5D 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 00 9F 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_TE-0603/64,63.ir b/_CSV-IRDB_/T/Tevion/Unknown_TE-0603/64,63.ir
index 090d5f4b..f24a02bd 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_TE-0603/64,63.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_TE-0603/64,63.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: 40 3F 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -61,37 +61,37 @@ protocol: NECext
 address: 40 3F 00 00
 command: 0A 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0B 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0F 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 40 3F 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 40 3F 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 17 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 40 3F 00 00
 command: 19 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -169,91 +169,91 @@ protocol: NECext
 address: 40 3F 00 00
 command: 1C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 1D 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 42 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 46 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 47 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 48 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 49 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 4A 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 4B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 4D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_TEV1020/0,-1.ir b/_CSV-IRDB_/T/Tevion/Unknown_TEV1020/0,-1.ir
index de7dbad9..6c452694 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_TEV1020/0,-1.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_TEV1020/0,-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,43 +61,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 56 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_Tevion-MD80383/5,5.ir b/_CSV-IRDB_/T/Tevion/Unknown_Tevion-MD80383/5,5.ir
index e8ec8f59..9241c85f 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_Tevion-MD80383/5,5.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_Tevion-MD80383/5,5.ir
@@ -7,127 +7,127 @@ protocol: NECext
 address: 05 05 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 12 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 1E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -151,31 +151,31 @@ protocol: NECext
 address: 05 05 00 00
 command: 22 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 28 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 2B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 2C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 2D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 05 05 00 00
 command: 31 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 3A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 3D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -217,13 +217,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 43 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 60 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_Tevion-MD81035-ASAT-Code-0905/23,105.ir b/_CSV-IRDB_/T/Tevion/Unknown_Tevion-MD81035-ASAT-Code-0905/23,105.ir
index 085930e4..480ea618 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_Tevion-MD81035-ASAT-Code-0905/23,105.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_Tevion-MD81035-ASAT-Code-0905/23,105.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -13,73 +13,73 @@ protocol: NECext
 address: 17 69 00 00
 command: 03 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 04 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 11 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -91,49 +91,49 @@ protocol: NECext
 address: 17 69 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 15 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 17 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -145,37 +145,37 @@ protocol: NECext
 address: 17 69 00 00
 command: 1F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 42 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 44 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 48 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 17 69 00 00
@@ -187,67 +187,67 @@ protocol: NECext
 address: 17 69 00 00
 command: 4C 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 4C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 4D 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 50 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 51 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 52 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 53 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 54 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 55 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 59 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 17 69 00 00
 command: 5A 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 17 69 00 00
diff --git a/_CSV-IRDB_/T/Tevion/Unknown_TevionMd3607/7,-1.ir b/_CSV-IRDB_/T/Tevion/Unknown_TevionMd3607/7,-1.ir
index 4287c823..2499f035 100644
--- a/_CSV-IRDB_/T/Tevion/Unknown_TevionMd3607/7,-1.ir
+++ b/_CSV-IRDB_/T/Tevion/Unknown_TevionMd3607/7,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 26 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -151,13 +151,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 27 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 32 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/T/Theta_Digital/Surround_Processor/16,-1.ir b/_CSV-IRDB_/T/Theta_Digital/Surround_Processor/16,-1.ir
index 687aed1f..2b048270 100644
--- a/_CSV-IRDB_/T/Theta_Digital/Surround_Processor/16,-1.ir
+++ b/_CSV-IRDB_/T/Theta_Digital/Surround_Processor/16,-1.ir
@@ -139,7 +139,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 10 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 00 00 00
diff --git a/_CSV-IRDB_/T/Thinkgeek/Unknown_Lightbulb/64,-1.ir b/_CSV-IRDB_/T/Thinkgeek/Unknown_Lightbulb/64,-1.ir
index f2d914b1..9ac24e19 100644
--- a/_CSV-IRDB_/T/Thinkgeek/Unknown_Lightbulb/64,-1.ir
+++ b/_CSV-IRDB_/T/Thinkgeek/Unknown_Lightbulb/64,-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Thompson/Unknown_THOMPSON/133,48.ir b/_CSV-IRDB_/T/Thompson/Unknown_THOMPSON/133,48.ir
index 40012842..cdc345ea 100644
--- a/_CSV-IRDB_/T/Thompson/Unknown_THOMPSON/133,48.ir
+++ b/_CSV-IRDB_/T/Thompson/Unknown_THOMPSON/133,48.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: 85 30 00 00
 command: 01 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 15 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 85 30 00 00
 command: 18 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -55,73 +55,73 @@ protocol: NECext
 address: 85 30 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 20 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 22 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 23 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 24 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 25 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -133,91 +133,91 @@ protocol: NECext
 address: 85 30 00 00
 command: 27 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 28 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 29 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 30 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 31 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 32 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 33 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 38 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 39 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
diff --git a/_CSV-IRDB_/T/Thomson/Unknown_230/0,-1.ir b/_CSV-IRDB_/T/Thomson/Unknown_230/0,-1.ir
index 54aa0df3..cf11ed3e 100644
--- a/_CSV-IRDB_/T/Thomson/Unknown_230/0,-1.ir
+++ b/_CSV-IRDB_/T/Thomson/Unknown_230/0,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,55 +97,55 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,37 +157,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/Thomson/Unknown_RCS615TCLM1/5,-1.ir b/_CSV-IRDB_/T/Thomson/Unknown_RCS615TCLM1/5,-1.ir
index 4645c260..377f23a3 100644
--- a/_CSV-IRDB_/T/Thomson/Unknown_RCS615TCLM1/5,-1.ir
+++ b/_CSV-IRDB_/T/Thomson/Unknown_RCS615TCLM1/5,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 12 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 13 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 14 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -103,67 +103,67 @@ protocol: NECext
 address: 05 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 22 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 24 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 26 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 33 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/T/Thomson/Unknown_TM9258/128,255.ir b/_CSV-IRDB_/T/Thomson/Unknown_TM9258/128,255.ir
index acec7179..cd9c7845 100644
--- a/_CSV-IRDB_/T/Thomson/Unknown_TM9258/128,255.ir
+++ b/_CSV-IRDB_/T/Thomson/Unknown_TM9258/128,255.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 80 FF 00 00
 command: 80 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 FF 00 00
 command: 84 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 FF 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 80 FF 00 00
 command: 8C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 FF 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 80 FF 00 00
 command: 90 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 FF 00 00
@@ -55,13 +55,13 @@ protocol: NECext
 address: 80 FF 00 00
 command: 94 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 80 FF 00 00
 command: 95 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 80 FF 00 00
diff --git a/_CSV-IRDB_/T/Thomson/Unknown_TV/7,-1.ir b/_CSV-IRDB_/T/Thomson/Unknown_TV/7,-1.ir
index 40e23bc1..415027ac 100644
--- a/_CSV-IRDB_/T/Thomson/Unknown_TV/7,-1.ir
+++ b/_CSV-IRDB_/T/Thomson/Unknown_TV/7,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 10 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 26 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 29 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/T/TiVo/Unknown_Series1/133,48.ir b/_CSV-IRDB_/T/TiVo/Unknown_Series1/133,48.ir
index 6aad7b15..7936a445 100644
--- a/_CSV-IRDB_/T/TiVo/Unknown_Series1/133,48.ir
+++ b/_CSV-IRDB_/T/TiVo/Unknown_Series1/133,48.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 85 30 00 00
 command: 10 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 11 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -31,25 +31,25 @@ protocol: NECext
 address: 85 30 00 00
 command: 13 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 15 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 16 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 85 30 00 00
 command: 18 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -73,73 +73,73 @@ protocol: NECext
 address: 85 30 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 1F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 20 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 21 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 22 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 23 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 24 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 25 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 85 30 00 00
@@ -151,73 +151,73 @@ protocol: NECext
 address: 85 30 00 00
 command: 27 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 28 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 29 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 2F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 30 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 31 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 85 30 00 00
 command: 32 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 85 30 00 00
diff --git a/_CSV-IRDB_/T/Tivoli/Unknown_Sirius/0,-1.ir b/_CSV-IRDB_/T/Tivoli/Unknown_Sirius/0,-1.ir
index aa6a2697..17d03a2d 100644
--- a/_CSV-IRDB_/T/Tivoli/Unknown_Sirius/0,-1.ir
+++ b/_CSV-IRDB_/T/Tivoli/Unknown_Sirius/0,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -13,61 +13,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/Tokai/Unknown_DVD-715/32,-1.ir b/_CSV-IRDB_/T/Tokai/Unknown_DVD-715/32,-1.ir
index 7445f681..b38aa71b 100644
--- a/_CSV-IRDB_/T/Tokai/Unknown_DVD-715/32,-1.ir
+++ b/_CSV-IRDB_/T/Tokai/Unknown_DVD-715/32,-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -133,43 +133,43 @@ protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/T/Topfield/Unknown_PVR/32,-1.ir b/_CSV-IRDB_/T/Topfield/Unknown_PVR/32,-1.ir
index b84da3fb..38640c70 100644
--- a/_CSV-IRDB_/T/Topfield/Unknown_PVR/32,-1.ir
+++ b/_CSV-IRDB_/T/Topfield/Unknown_PVR/32,-1.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 00 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 01 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 02 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 03 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 04 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 07 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -163,25 +163,25 @@ protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -205,37 +205,37 @@ protocol: NECext
 address: 20 00 00 00
 command: 45 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 46 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 47 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 49 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/T/Topfield/Unknown_TF4000Fi/4,255.ir b/_CSV-IRDB_/T/Topfield/Unknown_TF4000Fi/4,255.ir
index 39c33cae..71fe8669 100644
--- a/_CSV-IRDB_/T/Topfield/Unknown_TF4000Fi/4,255.ir
+++ b/_CSV-IRDB_/T/Topfield/Unknown_TF4000Fi/4,255.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 04 FF 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 06 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
@@ -55,139 +55,139 @@ protocol: NECext
 address: 04 FF 00 00
 command: 08 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 0A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 0C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 0D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 0E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 19 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 1B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 1C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 1D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 04 FF 00 00
 command: 43 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 44 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
 command: 47 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 04 FF 00 00
diff --git a/_CSV-IRDB_/T/Topfield/Unknown_TF4000PVR/32,-1.ir b/_CSV-IRDB_/T/Topfield/Unknown_TF4000PVR/32,-1.ir
index 5732eb5e..559544fc 100644
--- a/_CSV-IRDB_/T/Topfield/Unknown_TF4000PVR/32,-1.ir
+++ b/_CSV-IRDB_/T/Topfield/Unknown_TF4000PVR/32,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -31,43 +31,43 @@ protocol: NECext
 address: 20 00 00 00
 command: 04 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -79,145 +79,145 @@ protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 45 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 46 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 47 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/T/Topseed/Unknown_Topseed/4,15.ir b/_CSV-IRDB_/T/Topseed/Unknown_Topseed/4,15.ir
index cd982929..6676b8a1 100644
--- a/_CSV-IRDB_/T/Topseed/Unknown_Topseed/4,15.ir
+++ b/_CSV-IRDB_/T/Topseed/Unknown_Topseed/4,15.ir
@@ -1,313 +1,313 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 27 00 00 00
 #
-name: KEY_PLAYER
+name: PLAYER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 47 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 47 00 00 00
 #
-name: KEY_PVR
+name: PVR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_MEDIA
+name: MEDIA
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_FILE
+name: FILE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 49 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 4A 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 50 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_GOTO
+name: GOTO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/TV/64,-1.ir b/_CSV-IRDB_/T/Toshiba/TV/64,-1.ir
index 6e6cf5cf..e8e0fca6 100644
--- a/_CSV-IRDB_/T/Toshiba/TV/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/TV/64,-1.ir
@@ -151,13 +151,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_+/CURSOR_RT
+name: VOL+/CURSOR_RT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-/CURSOR_LT
+name: VOL-/CURSOR_LT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-816/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-816/64,-1.ir
index 8a341739..ef085af4 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-816/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-816/64,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -97,49 +97,49 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 71 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-826/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-826/64,-1.ir
index 42a05705..2cabccf4 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-826/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-826/64,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 13 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -109,43 +109,43 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -181,19 +181,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 57 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 58 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 63 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-832/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-832/64,-1.ir
index 0ccf7888..9b6a5bf2 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-832/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-832/64,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -103,49 +103,49 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 59 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 71 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-859/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-859/64,-1.ir
index d086431f..1fb48959 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-859/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-859/64,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 12 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 57 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 63 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 83 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-90038/231,10.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-90038/231,10.ir
index 02ea120b..4446c3da 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-90038/231,10.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-90038/231,10.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: E7 0A 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
@@ -49,31 +49,31 @@ protocol: NECext
 address: E7 0A 00 00
 command: 1F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 41 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 42 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 43 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: E7 0A 00 00
 command: 45 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-90205/231,10.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-90205/231,10.ir
index 7c42e295..48c8063e 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-90205/231,10.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-90205/231,10.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 12 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
@@ -25,43 +25,43 @@ protocol: NECext
 address: E7 0A 00 00
 command: 14 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 1B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 41 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
 command: 42 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: E7 0A 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-90298/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-90298/64,-1.ir
index c7b1de7c..1abf091e 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-90298/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-90298/64,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -91,31 +91,31 @@ protocol: NECext
 address: 40 00 00 00
 command: 13 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 14 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 15 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -151,61 +151,61 @@ protocol: NECext
 address: 40 00 00 00
 command: 22 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 43 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 52 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 53 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 59 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-90326/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-90326/64,-1.ir
index 791c870a..19ac72b7 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-90326/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-90326/64,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -91,67 +91,67 @@ protocol: NECext
 address: 40 00 00 00
 command: 13 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 14 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 15 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 16 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 40 00 00 00
 command: 22 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 40 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 42 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -187,31 +187,31 @@ protocol: NECext
 address: 40 00 00 00
 command: 44 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 45 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 54 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 63 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-9573/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-9573/64,-1.ir
index 03f84cec..7d61a303 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-9573/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-9573/64,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -85,61 +85,61 @@ protocol: NECext
 address: 40 00 00 00
 command: 16 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-9784/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-9784/64,-1.ir
index 1a666e92..ab3791c3 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-9784/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-9784/64,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: X_KEY_0+
+name: X_0+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 14 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -115,49 +115,49 @@ protocol: NECext
 address: 40 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 54 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-9881/134,107.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-9881/134,107.ir
index 7dd92705..07a5e65e 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-9881/134,107.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-9881/134,107.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 86 6B 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -151,49 +151,49 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 48 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 49 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 4A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 54 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_CT-9952/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_CT-9952/64,-1.ir
index 0277d911..a5338dd1 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_CT-9952/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_CT-9952/64,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -91,55 +91,55 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -151,37 +151,37 @@ protocol: NECext
 address: 40 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 51 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 53 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 58 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_G83C0008A110/4,15.ir b/_CSV-IRDB_/T/Toshiba/Unknown_G83C0008A110/4,15.ir
index a51b16f9..788d8b6e 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_G83C0008A110/4,15.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_G83C0008A110/4,15.ir
@@ -1,265 +1,265 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1C 00 00 00
 #
-name: KEY_NUMERIC_STAR
+name: NUMERIC_STAR
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 48 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_RM-614Q/5,5.ir b/_CSV-IRDB_/T/Toshiba/Unknown_RM-614Q/5,5.ir
index 13d36f1d..a03c4bbe 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_RM-614Q/5,5.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_RM-614Q/5,5.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 0E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 05 05 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -97,49 +97,49 @@ protocol: NECext
 address: 05 05 00 00
 command: 12 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 18 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 1D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 05 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 05 05 00 00
 command: 2D 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 05 05 00 00
 command: 32 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 05 05 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0031/69,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0031/69,-1.ir
index 6b4bde7e..44f74496 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0031/69,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0031/69,-1.ir
@@ -7,61 +7,61 @@ protocol: NECext
 address: 45 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 45 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -115,61 +115,61 @@ protocol: NECext
 address: 45 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 20 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 21 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 22 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 23 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 24 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 25 00 00 00
 #
-name: KEY_T
+name: T
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 26 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 28 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 41 00 00 00
 #
-name: X_KEY_3D
+name: X_3D
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -223,31 +223,31 @@ protocol: NECext
 address: 45 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 51 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 80 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 81 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 45 00 00 00
 command: DE 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 45 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0049/69,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0049/69,-1.ir
index 51292314..e97b2d32 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0049/69,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0049/69,-1.ir
@@ -7,91 +7,91 @@ protocol: NECext
 address: 45 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -103,31 +103,31 @@ protocol: NECext
 address: 45 00 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 20 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 21 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 22 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 45 00 00 00
 command: 24 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 26 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 28 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -211,31 +211,31 @@ protocol: NECext
 address: 45 00 00 00
 command: 43 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 51 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 80 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 81 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 45 00 00 00
 command: EE 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: EF 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0058/69,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0058/69,-1.ir
index 086b895d..9e4327b6 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0058/69,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0058/69,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 45 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -121,67 +121,67 @@ protocol: NECext
 address: 45 00 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 20 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 21 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 22 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 23 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 24 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 26 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 28 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 43 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -241,25 +241,25 @@ protocol: NECext
 address: 45 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 51 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 80 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 81 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -271,25 +271,25 @@ protocol: NECext
 address: 45 00 00 00
 command: DE 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: EF 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: F0 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: F1 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0127/69,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0127/69,-1.ir
index f4897371..403ae6a9 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0127/69,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_SE-R0127/69,-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 45 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 19 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -49,37 +49,37 @@ protocol: NECext
 address: 45 00 00 00
 command: 24 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 28 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 29 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: EF 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_TOSHIBA/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_TOSHIBA/64,-1.ir
index 460a6db8..aa896eb3 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_TOSHIBA/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_TOSHIBA/64,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 40 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -97,43 +97,43 @@ protocol: NECext
 address: 40 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 40 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 51 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 53 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 83 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 40 00 00 00
 command: 91 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_TOSHIBA/68,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_TOSHIBA/68,-1.ir
index fc5c9f9e..f8ebf62e 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_TOSHIBA/68,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_TOSHIBA/68,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 44 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 44 00 00 00
 command: 96 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: A0 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: A1 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 44 00 00 00
 command: AC 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_TOSHTV/64,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_TOSHTV/64,-1.ir
index c5cb9bd1..b3906359 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_TOSHTV/64,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_TOSHTV/64,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 10 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 40 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 40 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 40 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_TSR-101R/66,187.ir b/_CSV-IRDB_/T/Toshiba/Unknown_TSR-101R/66,187.ir
index 96ec2c09..a0c66922 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_TSR-101R/66,187.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_TSR-101R/66,187.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 89 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 8A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 42 BB 00 00
 command: 8E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 92 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 42 BB 00 00
 command: 9A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 42 BB 00 00
 command: 9C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 42 BB 00 00
 command: C0 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: C8 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: C9 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: CA 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: 42 BB 00 00
 command: CC 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: D1 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: D4 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: D7 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_Toshiba-SE-R0047/69,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_Toshiba-SE-R0047/69,-1.ir
index 51292314..e97b2d32 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_Toshiba-SE-R0047/69,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_Toshiba-SE-R0047/69,-1.ir
@@ -7,91 +7,91 @@ protocol: NECext
 address: 45 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -103,31 +103,31 @@ protocol: NECext
 address: 45 00 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 20 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 21 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 22 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -139,31 +139,31 @@ protocol: NECext
 address: 45 00 00 00
 command: 24 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 25 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 26 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 28 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -211,31 +211,31 @@ protocol: NECext
 address: 45 00 00 00
 command: 43 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 51 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 80 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 81 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -259,13 +259,13 @@ protocol: NECext
 address: 45 00 00 00
 command: EE 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: EF 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_Toshiba-SE-R0090/69,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_Toshiba-SE-R0090/69,-1.ir
index 364a09d5..f50f6943 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_Toshiba-SE-R0090/69,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_Toshiba-SE-R0090/69,-1.ir
@@ -7,61 +7,61 @@ protocol: NECext
 address: 45 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 45 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 45 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 20 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 21 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 45 00 00 00
 command: 24 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 26 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 27 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 28 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -211,31 +211,31 @@ protocol: NECext
 address: 45 00 00 00
 command: 43 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 51 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 80 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 81 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 45 00 00 00
 command: EC 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: EF 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_VC-642T/68,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_VC-642T/68,-1.ir
index 1f3def85..4ec100cd 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_VC-642T/68,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_VC-642T/68,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 44 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 44 00 00 00
 command: AC 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_VC-90B/68,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_VC-90B/68,-1.ir
index 306b127e..fd397857 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_VC-90B/68,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_VC-90B/68,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -73,43 +73,43 @@ protocol: NECext
 address: 44 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 44 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_VT-11/68,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_VT-11/68,-1.ir
index 2e1ba0fc..3bc11b4e 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_VT-11/68,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_VT-11/68,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -79,31 +79,31 @@ protocol: NECext
 address: 44 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 44 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 44 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_VT-204G/68,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_VT-204G/68,-1.ir
index 9ee7c8a5..226cf9f9 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_VT-204G/68,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_VT-204G/68,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 44 00 00 00
 command: C0 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_VT-209W/68,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_VT-209W/68,-1.ir
index af7924d8..e578dbbc 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_VT-209W/68,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_VT-209W/68,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -109,25 +109,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 44 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: EF 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_VT-75F/68,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_VT-75F/68,-1.ir
index 1bd0f3dd..c37c379b 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_VT-75F/68,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_VT-75F/68,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 44 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 44 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 44 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 44 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 44 00 00 00
 command: 51 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 44 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 44 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 44 00 00 00
diff --git a/_CSV-IRDB_/T/Toshiba/Unknown_toshiba-RM-A210/42,-1.ir b/_CSV-IRDB_/T/Toshiba/Unknown_toshiba-RM-A210/42,-1.ir
index 29d42108..d222955d 100644
--- a/_CSV-IRDB_/T/Toshiba/Unknown_toshiba-RM-A210/42,-1.ir
+++ b/_CSV-IRDB_/T/Toshiba/Unknown_toshiba-RM-A210/42,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 2A 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
@@ -97,7 +97,7 @@ protocol: NECext
 address: 2A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 2A 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 2A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 2A 00 00 00
diff --git a/_CSV-IRDB_/T/Total_Control/Unknown_Control/7,-1.ir b/_CSV-IRDB_/T/Total_Control/Unknown_Control/7,-1.ir
index b3e27bd4..d5964507 100644
--- a/_CSV-IRDB_/T/Total_Control/Unknown_Control/7,-1.ir
+++ b/_CSV-IRDB_/T/Total_Control/Unknown_Control/7,-1.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 03 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 20 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 21 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 22 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -175,67 +175,67 @@ protocol: NECext
 address: 07 00 00 00
 command: 26 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 27 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 28 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 29 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 30 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 33 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 36 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 39 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/T/Total_Media_In_Hand/Unknown_Media/2,189.ir b/_CSV-IRDB_/T/Total_Media_In_Hand/Unknown_Media/2,189.ir
index 6d0acab0..40bd2ac3 100644
--- a/_CSV-IRDB_/T/Total_Media_In_Hand/Unknown_Media/2,189.ir
+++ b/_CSV-IRDB_/T/Total_Media_In_Hand/Unknown_Media/2,189.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 09 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 02 BD 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 02 BD 00 00
 command: 13 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
@@ -139,55 +139,55 @@ protocol: NECext
 address: 02 BD 00 00
 command: 17 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 18 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 19 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 1A 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 1C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 1E 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 1F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 40 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
 command: 41 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 02 BD 00 00
 command: 44 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 BD 00 00
diff --git a/_CSV-IRDB_/T/Traxis/Unknown_3500/4,-1.ir b/_CSV-IRDB_/T/Traxis/Unknown_3500/4,-1.ir
index 94319e1a..374e2933 100644
--- a/_CSV-IRDB_/T/Traxis/Unknown_3500/4,-1.ir
+++ b/_CSV-IRDB_/T/Traxis/Unknown_3500/4,-1.ir
@@ -1,85 +1,85 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 25 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 28 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 33 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 34 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/T/Trust/Unknown_RC-2400/52,15.ir b/_CSV-IRDB_/T/Trust/Unknown_RC-2400/52,15.ir
index 2906e7a1..1cd9372c 100644
--- a/_CSV-IRDB_/T/Trust/Unknown_RC-2400/52,15.ir
+++ b/_CSV-IRDB_/T/Trust/Unknown_RC-2400/52,15.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
@@ -151,109 +151,109 @@ protocol: NECext
 address: 34 0F 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 24 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 26 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 47 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 49 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 4A 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 50 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 5A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 5B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 5C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
 command: 5D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 34 0F 00 00
diff --git a/_CSV-IRDB_/T/Trutech/Unknown_TV/0,1.ir b/_CSV-IRDB_/T/Trutech/Unknown_TV/0,1.ir
index 5134391a..4b23b2a0 100644
--- a/_CSV-IRDB_/T/Trutech/Unknown_TV/0,1.ir
+++ b/_CSV-IRDB_/T/Trutech/Unknown_TV/0,1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 01 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 00 01 00 00
 command: 03 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 04 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 05 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 01 00 00
@@ -43,91 +43,91 @@ protocol: NECext
 address: 00 01 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 13 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 14 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 17 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 19 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 1E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 1F 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 48 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 01 00 00
 command: 4A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 01 00 00
diff --git a/_CSV-IRDB_/T/Turtle_Beach/MP3_Player/1,249.ir b/_CSV-IRDB_/T/Turtle_Beach/MP3_Player/1,249.ir
index 226aa6dc..c0facea8 100644
--- a/_CSV-IRDB_/T/Turtle_Beach/MP3_Player/1,249.ir
+++ b/_CSV-IRDB_/T/Turtle_Beach/MP3_Player/1,249.ir
@@ -145,7 +145,7 @@ protocol: NECext
 address: 01 F9 00 00
 command: 17 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 01 F9 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
diff --git a/_CSV-IRDB_/T/Turtlebeach/Unknown_Audiotron/1,249.ir b/_CSV-IRDB_/T/Turtlebeach/Unknown_Audiotron/1,249.ir
index b4024e1c..f687e415 100644
--- a/_CSV-IRDB_/T/Turtlebeach/Unknown_Audiotron/1,249.ir
+++ b/_CSV-IRDB_/T/Turtlebeach/Unknown_Audiotron/1,249.ir
@@ -13,115 +13,115 @@ protocol: NECext
 address: 01 F9 00 00
 command: 01 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 02 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 0A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 0B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 0E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 10 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 01 F9 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 01 F9 00 00
 command: 19 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
@@ -157,49 +157,49 @@ protocol: NECext
 address: 01 F9 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 1E 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 1F 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 40 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 41 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 42 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
 command: 43 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
@@ -235,7 +235,7 @@ protocol: NECext
 address: 01 F9 00 00
 command: 4C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 F9 00 00
diff --git a/_CSV-IRDB_/T/Twinhan/Unknown_AD-SP200/0,-1.ir b/_CSV-IRDB_/T/Twinhan/Unknown_AD-SP200/0,-1.ir
index 8dd1ea08..b0a40cf9 100644
--- a/_CSV-IRDB_/T/Twinhan/Unknown_AD-SP200/0,-1.ir
+++ b/_CSV-IRDB_/T/Twinhan/Unknown_AD-SP200/0,-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TAB
+name: TAB
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,109 +55,109 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,19 +169,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,31 +193,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,31 +241,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -283,19 +283,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -307,13 +307,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/Twinhan/Unknown_DTV/0,-1.ir b/_CSV-IRDB_/T/Twinhan/Unknown_DTV/0,-1.ir
index ee7f9f9b..ed7bed58 100644
--- a/_CSV-IRDB_/T/Twinhan/Unknown_DTV/0,-1.ir
+++ b/_CSV-IRDB_/T/Twinhan/Unknown_DTV/0,-1.ir
@@ -1,175 +1,175 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TAB
+name: TAB
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/Typhoon/Unknown_DTV/0,-1.ir b/_CSV-IRDB_/T/Typhoon/Unknown_DTV/0,-1.ir
index ee7f9f9b..ed7bed58 100644
--- a/_CSV-IRDB_/T/Typhoon/Unknown_DTV/0,-1.ir
+++ b/_CSV-IRDB_/T/Typhoon/Unknown_DTV/0,-1.ir
@@ -1,175 +1,175 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_TAB
+name: TAB
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/T/Typhoon/Unknown_RC-0718-3/96,1.ir b/_CSV-IRDB_/T/Typhoon/Unknown_RC-0718-3/96,1.ir
index 07b1c910..c6b02160 100644
--- a/_CSV-IRDB_/T/Typhoon/Unknown_RC-0718-3/96,1.ir
+++ b/_CSV-IRDB_/T/Typhoon/Unknown_RC-0718-3/96,1.ir
@@ -13,61 +13,61 @@ protocol: NECext
 address: 60 01 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 05 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 06 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 07 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 08 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 09 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0B 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0C 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -79,49 +79,49 @@ protocol: NECext
 address: 60 01 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 0F 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 10 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 14 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 60 01 00 00
@@ -133,13 +133,13 @@ protocol: NECext
 address: 60 01 00 00
 command: 18 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 60 01 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 60 01 00 00
diff --git a/_CSV-IRDB_/T/trio/Unknown_xms007/8,-1.ir b/_CSV-IRDB_/T/trio/Unknown_xms007/8,-1.ir
index 515395cb..becfe51d 100644
--- a/_CSV-IRDB_/T/trio/Unknown_xms007/8,-1.ir
+++ b/_CSV-IRDB_/T/trio/Unknown_xms007/8,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -85,49 +85,49 @@ protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -145,31 +145,31 @@ protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/U/UEC/Unknown_DVB/24,-1.ir b/_CSV-IRDB_/U/UEC/Unknown_DVB/24,-1.ir
index 6c807e19..3b6ca0ed 100644
--- a/_CSV-IRDB_/U/UEC/Unknown_DVB/24,-1.ir
+++ b/_CSV-IRDB_/U/UEC/Unknown_DVB/24,-1.ir
@@ -1,193 +1,193 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 22 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 24 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 25 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 18 00 00 00
 command: 31 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 18 00 00 00
diff --git a/_CSV-IRDB_/U/UPC/Unknown_SAT/39,-1.ir b/_CSV-IRDB_/U/UPC/Unknown_SAT/39,-1.ir
index 7c9a9df8..a11377f1 100644
--- a/_CSV-IRDB_/U/UPC/Unknown_SAT/39,-1.ir
+++ b/_CSV-IRDB_/U/UPC/Unknown_SAT/39,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 27 00 00 00
 command: 21 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 27 00 00 00
diff --git a/_CSV-IRDB_/U/US_Electronics/Cable_Box/0,-1.ir b/_CSV-IRDB_/U/US_Electronics/Cable_Box/0,-1.ir
index e125b3d7..2ef28cf3 100644
--- a/_CSV-IRDB_/U/US_Electronics/Cable_Box/0,-1.ir
+++ b/_CSV-IRDB_/U/US_Electronics/Cable_Box/0,-1.ir
@@ -91,7 +91,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/U/Ultrawave/Unknown_3500PFTA/2,2.ir b/_CSV-IRDB_/U/Ultrawave/Unknown_3500PFTA/2,2.ir
index 988cfe9d..fff9e9dd 100644
--- a/_CSV-IRDB_/U/Ultrawave/Unknown_3500PFTA/2,2.ir
+++ b/_CSV-IRDB_/U/Ultrawave/Unknown_3500PFTA/2,2.ir
@@ -1,157 +1,157 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 0B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 0D 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 0E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 11 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 12 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 13 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 14 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 16 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 17 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 19 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 1B 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 02 02 00 00
@@ -163,49 +163,49 @@ protocol: NECext
 address: 02 02 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 1E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 1F 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 40 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 41 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 42 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 43 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 02 02 00 00
 command: 44 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 02 02 00 00
diff --git a/_CSV-IRDB_/U/Umax/Unknown_D-701/0,240.ir b/_CSV-IRDB_/U/Umax/Unknown_D-701/0,240.ir
index 012caa4b..7f61c598 100644
--- a/_CSV-IRDB_/U/Umax/Unknown_D-701/0,240.ir
+++ b/_CSV-IRDB_/U/Umax/Unknown_D-701/0,240.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 00 F0 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
@@ -19,19 +19,19 @@ protocol: NECext
 address: 00 F0 00 00
 command: 06 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
 command: 07 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
 command: 09 00 00 00
 #
-name: KEY_MAX
+name: MAX
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 00 F0 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 00 F0 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 00 F0 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
 command: 13 00 00 00
 #
-name: KEY_2ch-out
+name: 2ch-out
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 00 F0 00 00
 command: 1B 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 F0 00 00
diff --git a/_CSV-IRDB_/U/Uniden/Satellite/1,-1.ir b/_CSV-IRDB_/U/Uniden/Satellite/1,-1.ir
index 8f175956..25b94760 100644
--- a/_CSV-IRDB_/U/Uniden/Satellite/1,-1.ir
+++ b/_CSV-IRDB_/U/Uniden/Satellite/1,-1.ir
@@ -67,7 +67,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/U/United/Unknown_United-DVD4057M/0,-1.ir b/_CSV-IRDB_/U/United/Unknown_United-DVD4057M/0,-1.ir
index b7fbde64..c0613828 100644
--- a/_CSV-IRDB_/U/United/Unknown_United-DVD4057M/0,-1.ir
+++ b/_CSV-IRDB_/U/United/Unknown_United-DVD4057M/0,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,25 +55,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,43 +85,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 44 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,31 +133,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 47 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,31 +199,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 53 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 54 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -235,49 +235,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 57 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 59 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_001/4,15.ir b/_CSV-IRDB_/U/Universal/Unknown_001/4,15.ir
index 6b87cb7b..b9dfbf50 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_001/4,15.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_001/4,15.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 09 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -73,91 +73,91 @@ protocol: NECext
 address: 04 0F 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0C 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_0Plus
+name: 0Plus
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 13 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 14 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 16 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 17 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 18 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -175,25 +175,25 @@ protocol: NECext
 address: 04 0F 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1E 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 1F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
 command: 20 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 04 0F 00 00
 command: 23 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 04 0F 00 00
 command: 25 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 0F 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_006/56,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_006/56,-1.ir
index d5794d47..4633abad 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_006/56,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_006/56,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -73,55 +73,55 @@ protocol: NECext
 address: 38 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 17 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 18 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 38 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 38 00 00 00
 command: 46 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 49 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 38 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 38 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_089/6,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_089/6,-1.ir
index e23f3299..11a04c6d 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_089/6,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_089/6,-1.ir
@@ -1,115 +1,115 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 06 00 00 00
 command: 39 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -145,7 +145,7 @@ protocol: NECext
 address: 06 00 00 00
 command: 70 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_101/6,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_101/6,-1.ir
index f4990fc2..3855529e 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_101/6,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_101/6,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,37 +103,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -193,13 +193,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,19 +241,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -265,19 +265,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 06 00 00 00
 command: 36 00 00 00
 #
-name: KEY_M
+name: M
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 06 00 00 00
@@ -295,19 +295,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3E 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_111/135,124.ir b/_CSV-IRDB_/U/Universal/Unknown_111/135,124.ir
index ba2981ca..ac157451 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_111/135,124.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_111/135,124.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 0C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 0D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 0F 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 10 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 11 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 12 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 13 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 87 7C 00 00
 command: 23 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 24 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -121,25 +121,25 @@ protocol: NECext
 address: 87 7C 00 00
 command: 57 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 80 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 88 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 89 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -157,43 +157,43 @@ protocol: NECext
 address: 87 7C 00 00
 command: 91 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 94 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 99 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 9A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 9C 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 9D 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 9E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 87 7C 00 00
 command: D1 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_Knopex/7,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_Knopex/7,-1.ir
index 1e025581..b565276f 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_Knopex/7,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_Knopex/7,-1.ir
@@ -1,181 +1,181 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 21 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 26 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 27 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 29 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_3play
+name: 3play
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_MC-10/5,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_MC-10/5,-1.ir
index 0bfa033b..195d1d66 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_MC-10/5,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_MC-10/5,-1.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 15 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 21 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -151,43 +151,43 @@ protocol: NECext
 address: 05 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 37 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_Powerhouse/166,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_Powerhouse/166,-1.ir
index 2bda1b49..254c79ce 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_Powerhouse/166,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_Powerhouse/166,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: A6 00 00 00
@@ -73,43 +73,43 @@ protocol: NECext
 address: A6 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 44 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 45 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: A6 00 00 00
 command: 46 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: A6 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: A6 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: A6 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_RC/0,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_RC/0,-1.ir
index 69b13748..5fb9ce42 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_RC/0,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_RC/0,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -19,91 +19,91 @@ protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -121,31 +121,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 24 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -157,19 +157,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 39 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_RM-V211T/2,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_RM-V211T/2,-1.ir
index a98aefe1..ef156b93 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_RM-V211T/2,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_RM-V211T/2,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 05 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 12 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 20 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 21 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 22 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 02 00 00 00
 command: 25 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -127,25 +127,25 @@ protocol: NECext
 address: 02 00 00 00
 command: 27 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_QUIT
+name: QUIT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 02 00 00 00
 command: 36 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 39 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_RZ-55/1,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_RZ-55/1,-1.ir
index 11959a1d..496c151d 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_RZ-55/1,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_RZ-55/1,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -85,49 +85,49 @@ protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -139,37 +139,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 28 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 29 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_3next
+name: 3next
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -181,13 +181,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -205,49 +205,49 @@ protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 48 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 49 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_H
+name: H
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 68 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 78 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_URC-6012w/2,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_URC-6012w/2,-1.ir
index ed501b4b..ff21f001 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_URC-6012w/2,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_URC-6012w/2,-1.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 13 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 28 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 02 00 00 00
 command: 43 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 51 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_cme/7,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_cme/7,-1.ir
index 5380f2c6..de2cd1b1 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_cme/7,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_cme/7,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 01 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 03 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 04 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 07 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1-
+name: 1-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 13 00 00 00
 #
-name: KEY_2-
+name: 2-
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -175,13 +175,13 @@ protocol: NECext
 address: 07 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -193,25 +193,25 @@ protocol: NECext
 address: 07 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 20 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 21 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 22 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 07 00 00 00
@@ -223,67 +223,67 @@ protocol: NECext
 address: 07 00 00 00
 command: 24 00 00 00
 #
-name: KEY_3PLAY
+name: 3PLAY
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 25 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 26 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 27 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 28 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 29 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_H
+name: H
 type: parsed
 protocol: NECext
 address: 07 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 07 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_lircd.conf/0,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_lircd.conf/0,-1.ir
index 4c212391..c968197b 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_lircd.conf/0,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_lircd.conf/0,-1.ir
@@ -1,127 +1,127 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,43 +145,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_lircd.conf/128,123.ir b/_CSV-IRDB_/U/Universal/Unknown_lircd.conf/128,123.ir
index 8823fbd5..acb2e361 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_lircd.conf/128,123.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_lircd.conf/128,123.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 0D 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -97,37 +97,37 @@ protocol: NECext
 address: 80 7B 00 00
 command: 13 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 17 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 44 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 48 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 4C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 4E 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_lt3607-aux599/135,124.ir b/_CSV-IRDB_/U/Universal/Unknown_lt3607-aux599/135,124.ir
index 872d66de..1ca9124c 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_lt3607-aux599/135,124.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_lt3607-aux599/135,124.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 01 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 02 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 87 7C 00 00
 command: 06 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 07 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
@@ -49,91 +49,91 @@ protocol: NECext
 address: 87 7C 00 00
 command: 85 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 88 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 8A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 8B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 8C 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 8E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 8F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 92 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 93 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 94 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 96 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 97 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: 98 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: C5 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
 command: C7 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 87 7C 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_testrecord.config/0,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_testrecord.config/0,-1.ir
index b2c3529c..be80ebae 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_testrecord.config/0,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_testrecord.config/0,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,13 +73,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,13 +97,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,25 +133,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -169,25 +169,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -205,85 +205,85 @@ protocol: NECext
 address: 00 00 00 00
 command: 26 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 28 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_H
+name: H
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 35 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_3next
+name: 3next
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/U/Universal/Unknown_tv/1,-1.ir b/_CSV-IRDB_/U/Universal/Unknown_tv/1,-1.ir
index 664095c9..1ad227bf 100644
--- a/_CSV-IRDB_/U/Universal/Unknown_tv/1,-1.ir
+++ b/_CSV-IRDB_/U/Universal/Unknown_tv/1,-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/U/universum/SAT/97,135.ir b/_CSV-IRDB_/U/universum/SAT/97,135.ir
index e8ef491b..0d9caa07 100644
--- a/_CSV-IRDB_/U/universum/SAT/97,135.ir
+++ b/_CSV-IRDB_/U/universum/SAT/97,135.ir
@@ -13,19 +13,19 @@ protocol: NECext
 address: 61 87 00 00
 command: 02 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 61 87 00 00
@@ -37,37 +37,37 @@ protocol: NECext
 address: 61 87 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 61 87 00 00
@@ -79,25 +79,25 @@ protocol: NECext
 address: 61 87 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 11 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 61 87 00 00
 command: 18 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 61 87 00 00
diff --git a/_CSV-IRDB_/U/universum/SAT_SR420/15,-1.ir b/_CSV-IRDB_/U/universum/SAT_SR420/15,-1.ir
index 80e10509..4702b5e0 100644
--- a/_CSV-IRDB_/U/universum/SAT_SR420/15,-1.ir
+++ b/_CSV-IRDB_/U/universum/SAT_SR420/15,-1.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -103,43 +103,43 @@ protocol: NECext
 address: 0F 00 00 00
 command: 22 00 00 00
 #
-name: KEY_LIST
+name: LIST
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 32 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 34 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
@@ -151,25 +151,25 @@ protocol: NECext
 address: 0F 00 00 00
 command: 38 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 44 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 45 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
 command: 52 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0F 00 00 00
diff --git a/_CSV-IRDB_/U/universum/Unknown_universum/0,-1.ir b/_CSV-IRDB_/U/universum/Unknown_universum/0,-1.ir
index d92fcba4..8aef0d5c 100644
--- a/_CSV-IRDB_/U/universum/Unknown_universum/0,-1.ir
+++ b/_CSV-IRDB_/U/universum/Unknown_universum/0,-1.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -85,25 +85,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,43 +163,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 51 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 52 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 55 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -265,25 +265,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 68 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -295,7 +295,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/U/universum/Unknown_universum/16,16.ir b/_CSV-IRDB_/U/universum/Unknown_universum/16,16.ir
index 183b7ef5..57f33def 100644
--- a/_CSV-IRDB_/U/universum/Unknown_universum/16,16.ir
+++ b/_CSV-IRDB_/U/universum/Unknown_universum/16,16.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 10 10 00 00
@@ -49,13 +49,13 @@ protocol: NECext
 address: 10 10 00 00
 command: 07 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 08 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 10 10 00 00
@@ -115,13 +115,13 @@ protocol: NECext
 address: 10 10 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 10 10 00 00
@@ -145,73 +145,73 @@ protocol: NECext
 address: 10 10 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 1E 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 1F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 41 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 42 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 43 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 46 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 47 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 48 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: 49 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 10 10 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 10 10 00 00
 command: 83 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 10 10 00 00
 command: C1 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 10 10 00 00
diff --git a/_CSV-IRDB_/U/universum/VCR/128,123.ir b/_CSV-IRDB_/U/universum/VCR/128,123.ir
index 0da388e6..57baee2b 100644
--- a/_CSV-IRDB_/U/universum/VCR/128,123.ir
+++ b/_CSV-IRDB_/U/universum/VCR/128,123.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 12 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -103,19 +103,19 @@ protocol: NECext
 address: 80 7B 00 00
 command: 14 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 15 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 16 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 18 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 19 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -151,7 +151,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 44 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 49 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 80 7B 00 00
 command: 4D 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
 command: 4E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 80 7B 00 00
 command: 52 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 7B 00 00
diff --git a/_CSV-IRDB_/U/universum/VCR_VR743A/5,-1.ir b/_CSV-IRDB_/U/universum/VCR_VR743A/5,-1.ir
index b677e363..8b17574e 100644
--- a/_CSV-IRDB_/U/universum/VCR_VR743A/5,-1.ir
+++ b/_CSV-IRDB_/U/universum/VCR_VR743A/5,-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 20 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 25 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -115,25 +115,25 @@ protocol: NECext
 address: 05 00 00 00
 command: 29 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 35 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 05 00 00 00
 command: 3A 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 05 00 00 00
 command: 70 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 05 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 05 00 00 00
 command: 7A 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 05 00 00 00
diff --git a/_CSV-IRDB_/V/Velodyne/Subwoofer/0,69.ir b/_CSV-IRDB_/V/Velodyne/Subwoofer/0,69.ir
index dd54ffb7..1db0a782 100644
--- a/_CSV-IRDB_/V/Velodyne/Subwoofer/0,69.ir
+++ b/_CSV-IRDB_/V/Velodyne/Subwoofer/0,69.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 00 45 00 00
 command: 80 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 45 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 00 45 00 00
 command: 86 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 45 00 00
diff --git a/_CSV-IRDB_/V/Venturer/Unknown_STB7766G1/66,187.ir b/_CSV-IRDB_/V/Venturer/Unknown_STB7766G1/66,187.ir
index ef9ec5f8..939db665 100644
--- a/_CSV-IRDB_/V/Venturer/Unknown_STB7766G1/66,187.ir
+++ b/_CSV-IRDB_/V/Venturer/Unknown_STB7766G1/66,187.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 81 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 82 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 83 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 84 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 85 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 86 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 87 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 88 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 89 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 8A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 42 BB 00 00
 command: 8C 00 00 00
 #
-name: KEY_DOT
+name: DOT
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 8E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 92 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
@@ -97,67 +97,67 @@ protocol: NECext
 address: 42 BB 00 00
 command: 98 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 9A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 9B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 9C 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: 9F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: C8 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: C9 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: CA 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: CB 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: D4 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
 command: FE 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 42 BB 00 00
diff --git a/_CSV-IRDB_/V/Venturer/Unknown_boombox/129,129.ir b/_CSV-IRDB_/V/Venturer/Unknown_boombox/129,129.ir
index 9a4dd23f..d36546b9 100644
--- a/_CSV-IRDB_/V/Venturer/Unknown_boombox/129,129.ir
+++ b/_CSV-IRDB_/V/Venturer/Unknown_boombox/129,129.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 81 81 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 81 81 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 81 81 00 00
 command: 09 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 81 81 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 81 81 00 00
 command: 12 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 81 81 00 00
diff --git a/_CSV-IRDB_/V/Vestel/Unknown_TV/0,-1.ir b/_CSV-IRDB_/V/Vestel/Unknown_TV/0,-1.ir
index d75d43d8..2d7a1c12 100644
--- a/_CSV-IRDB_/V/Vestel/Unknown_TV/0,-1.ir
+++ b/_CSV-IRDB_/V/Vestel/Unknown_TV/0,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -73,7 +73,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -139,49 +139,49 @@ protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_F
+name: F
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_G
+name: G
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2C 00 00 00
 #
-name: KEY_D
+name: D
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2D 00 00 00
 #
-name: KEY_E
+name: E
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_H
+name: H
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 37 00 00 00
 #
-name: KEY_Y
+name: Y
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 38 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 3C 00 00 00
 #
-name: KEY_X
+name: X
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/V/Video7/Unknown_Video7-RC750/32,-1.ir b/_CSV-IRDB_/V/Video7/Unknown_Video7-RC750/32,-1.ir
index 7bf2a02f..0f4d4381 100644
--- a/_CSV-IRDB_/V/Video7/Unknown_Video7-RC750/32,-1.ir
+++ b/_CSV-IRDB_/V/Video7/Unknown_Video7-RC750/32,-1.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 02 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 07 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 07 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 18 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 40 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 41 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/V/Vidikron/Video_Projector/0,-1.ir b/_CSV-IRDB_/V/Vidikron/Video_Projector/0,-1.ir
index d94d8efa..81062a74 100644
--- a/_CSV-IRDB_/V/Vidikron/Video_Projector/0,-1.ir
+++ b/_CSV-IRDB_/V/Vidikron/Video_Projector/0,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/V/ViewSonic/Unknown_98TR7BD-ONT-VSF/131,241.ir b/_CSV-IRDB_/V/ViewSonic/Unknown_98TR7BD-ONT-VSF/131,241.ir
index e08a57f6..1e5dbf04 100644
--- a/_CSV-IRDB_/V/ViewSonic/Unknown_98TR7BD-ONT-VSF/131,241.ir
+++ b/_CSV-IRDB_/V/ViewSonic/Unknown_98TR7BD-ONT-VSF/131,241.ir
@@ -1,145 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 13 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 1E 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 25 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 26 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 27 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 28 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 83 F1 00 00
 command: 2B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 2C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 83 F1 00 00
 command: 31 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 83 F1 00 00
 command: 33 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -199,43 +199,43 @@ protocol: NECext
 address: 83 F1 00 00
 command: 35 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 36 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 37 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 40 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 45 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 46 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 47 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -247,13 +247,13 @@ protocol: NECext
 address: 83 F1 00 00
 command: 70 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 71 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -271,7 +271,7 @@ protocol: NECext
 address: 83 F1 00 00
 command: 74 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
diff --git a/_CSV-IRDB_/V/ViewSonic/Unknown_RC00070P/131,241.ir b/_CSV-IRDB_/V/ViewSonic/Unknown_RC00070P/131,241.ir
index b6c0091e..80682667 100644
--- a/_CSV-IRDB_/V/ViewSonic/Unknown_RC00070P/131,241.ir
+++ b/_CSV-IRDB_/V/ViewSonic/Unknown_RC00070P/131,241.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 0B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 0C 00 00 00
 #
-name: KEY_0/-
+name: 0/-
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -145,49 +145,49 @@ protocol: NECext
 address: 83 F1 00 00
 command: 24 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 25 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 26 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 27 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 28 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 29 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 2A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 2B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 83 F1 00 00
 command: 45 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
@@ -229,19 +229,19 @@ protocol: NECext
 address: 83 F1 00 00
 command: 76 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 77 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
 command: 78 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 83 F1 00 00
diff --git a/_CSV-IRDB_/V/ViewSonic/Unknown_vsnv6/0,-1.ir b/_CSV-IRDB_/V/ViewSonic/Unknown_vsnv6/0,-1.ir
index 28ca9cc0..b0b635e2 100644
--- a/_CSV-IRDB_/V/ViewSonic/Unknown_vsnv6/0,-1.ir
+++ b/_CSV-IRDB_/V/ViewSonic/Unknown_vsnv6/0,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,73 +31,73 @@ protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -109,61 +109,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/V/Viewmaster/Unknown_RC-03/73,-1.ir b/_CSV-IRDB_/V/Viewmaster/Unknown_RC-03/73,-1.ir
index e1dee406..479003a9 100644
--- a/_CSV-IRDB_/V/Viewmaster/Unknown_RC-03/73,-1.ir
+++ b/_CSV-IRDB_/V/Viewmaster/Unknown_RC-03/73,-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 49 00 00 00
 command: 00 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 01 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 02 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -31,25 +31,25 @@ protocol: NECext
 address: 49 00 00 00
 command: 04 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 05 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 06 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 07 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -61,31 +61,31 @@ protocol: NECext
 address: 49 00 00 00
 command: 09 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -97,37 +97,37 @@ protocol: NECext
 address: 49 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 12 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 15 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 16 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 17 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -139,49 +139,49 @@ protocol: NECext
 address: 49 00 00 00
 command: 19 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 40 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 42 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 43 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 44 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 45 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 46 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -199,25 +199,25 @@ protocol: NECext
 address: 49 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -229,19 +229,19 @@ protocol: NECext
 address: 49 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 50 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
@@ -253,25 +253,25 @@ protocol: NECext
 address: 49 00 00 00
 command: 53 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 54 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 55 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 49 00 00 00
 command: 56 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 49 00 00 00
diff --git a/_CSV-IRDB_/V/Viewsat/Unknown_SAT/32,255.ir b/_CSV-IRDB_/V/Viewsat/Unknown_SAT/32,255.ir
index e543596d..f5579ad6 100644
--- a/_CSV-IRDB_/V/Viewsat/Unknown_SAT/32,255.ir
+++ b/_CSV-IRDB_/V/Viewsat/Unknown_SAT/32,255.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 10 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 11 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 13 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
@@ -157,25 +157,25 @@ protocol: NECext
 address: 20 FF 00 00
 command: 15 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 16 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 17 00 00 00
 #
-name: KEY_F1
+name: F1
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 18 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
@@ -193,43 +193,43 @@ protocol: NECext
 address: 20 FF 00 00
 command: 1B 00 00 00
 #
-name: KEY_F4
+name: F4
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 1C 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 1D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 1E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 1F 00 00 00
 #
-name: KEY_F2
+name: F2
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 40 00 00 00
 #
-name: KEY_F3
+name: F3
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 41 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
diff --git a/_CSV-IRDB_/V/Viewsat/Unknown_VS2000/32,255.ir b/_CSV-IRDB_/V/Viewsat/Unknown_VS2000/32,255.ir
index 1f5cc9d4..236e75f0 100644
--- a/_CSV-IRDB_/V/Viewsat/Unknown_VS2000/32,255.ir
+++ b/_CSV-IRDB_/V/Viewsat/Unknown_VS2000/32,255.ir
@@ -1,151 +1,151 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 09 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0A 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0C 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0D 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0E 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 0F 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 10 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 11 00 00 00
 #
-name: KEY_SAT
+name: SAT
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 12 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 13 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
@@ -157,13 +157,13 @@ protocol: NECext
 address: 20 FF 00 00
 command: 15 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 16 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
@@ -175,19 +175,19 @@ protocol: NECext
 address: 20 FF 00 00
 command: 18 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 19 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 1A 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
@@ -199,19 +199,19 @@ protocol: NECext
 address: 20 FF 00 00
 command: 1C 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 1D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
 command: 1E 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 20 FF 00 00
diff --git a/_CSV-IRDB_/V/Virgin-media/Unknown_VIRGINTIVO/10,-1.ir b/_CSV-IRDB_/V/Virgin-media/Unknown_VIRGINTIVO/10,-1.ir
index 8807e2ef..51914167 100644
--- a/_CSV-IRDB_/V/Virgin-media/Unknown_VIRGINTIVO/10,-1.ir
+++ b/_CSV-IRDB_/V/Virgin-media/Unknown_VIRGINTIVO/10,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 13 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -97,163 +97,163 @@ protocol: NECext
 address: 0A 00 00 00
 command: 17 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 21 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 22 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 30 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 32 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 36 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 37 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 51 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/V/Visionetics/Unknown_Cable/134,107.ir b/_CSV-IRDB_/V/Visionetics/Unknown_Cable/134,107.ir
index 294be2d7..74f01344 100644
--- a/_CSV-IRDB_/V/Visionetics/Unknown_Cable/134,107.ir
+++ b/_CSV-IRDB_/V/Visionetics/Unknown_Cable/134,107.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0C 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/V/Vistron/Unknown_DVD-5211/0,-1.ir b/_CSV-IRDB_/V/Vistron/Unknown_DVD-5211/0,-1.ir
index 6fe74c62..e41c7c78 100644
--- a/_CSV-IRDB_/V/Vistron/Unknown_DVD-5211/0,-1.ir
+++ b/_CSV-IRDB_/V/Vistron/Unknown_DVD-5211/0,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,19 +79,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -103,7 +103,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -115,43 +115,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,43 +163,43 @@ protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 42 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 46 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -211,37 +211,37 @@ protocol: NECext
 address: 00 00 00 00
 command: 49 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/V/Vistron/Unknown_LTM-3271E/8,-1.ir b/_CSV-IRDB_/V/Vistron/Unknown_LTM-3271E/8,-1.ir
index d54d7942..3fb2f939 100644
--- a/_CSV-IRDB_/V/Vistron/Unknown_LTM-3271E/8,-1.ir
+++ b/_CSV-IRDB_/V/Vistron/Unknown_LTM-3271E/8,-1.ir
@@ -1,79 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 09 00 00 00
 #
-name: KEY_102ND
+name: 102ND
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -85,91 +85,91 @@ protocol: NECext
 address: 08 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 13 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 14 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 16 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 17 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 18 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -193,25 +193,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_CANCEL
+name: CANCEL
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 41 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 42 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 44 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -265,7 +265,7 @@ protocol: NECext
 address: 08 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
@@ -277,25 +277,25 @@ protocol: NECext
 address: 08 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 53 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 08 00 00 00
 command: 54 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 08 00 00 00
diff --git a/_CSV-IRDB_/V/Vivanco/Unknown_DVD/26,73.ir b/_CSV-IRDB_/V/Vivanco/Unknown_DVD/26,73.ir
index 2a5ee061..2bebf73b 100644
--- a/_CSV-IRDB_/V/Vivanco/Unknown_DVD/26,73.ir
+++ b/_CSV-IRDB_/V/Vivanco/Unknown_DVD/26,73.ir
@@ -1,73 +1,73 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 1A 49 00 00
 command: 0B 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -91,7 +91,7 @@ protocol: NECext
 address: 1A 49 00 00
 command: 0F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -103,61 +103,61 @@ protocol: NECext
 address: 1A 49 00 00
 command: 0F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 15 00 00 00
 #
-name: KEY_TEXT
+name: TEXT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 1B 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 1B 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 30 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 31 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 32 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 33 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 38 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
@@ -169,31 +169,31 @@ protocol: NECext
 address: 1A 49 00 00
 command: 53 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 54 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 79 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
 command: 7B 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 49 00 00
diff --git a/_CSV-IRDB_/V/Vivanco/Unknown_UR2/10,-1.ir b/_CSV-IRDB_/V/Vivanco/Unknown_UR2/10,-1.ir
index e73bda7b..21ca46f6 100644
--- a/_CSV-IRDB_/V/Vivanco/Unknown_UR2/10,-1.ir
+++ b/_CSV-IRDB_/V/Vivanco/Unknown_UR2/10,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 09 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 0A 00 00 00
 command: 28 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 0A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 50 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 0A 00 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 0A 00 00 00
 command: 61 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
 command: 6D 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 0A 00 00 00
diff --git a/_CSV-IRDB_/V/Vivanco/Unknown_ur89/0,-1.ir b/_CSV-IRDB_/V/Vivanco/Unknown_ur89/0,-1.ir
index aea2b9fe..3156fee7 100644
--- a/_CSV-IRDB_/V/Vivanco/Unknown_ur89/0,-1.ir
+++ b/_CSV-IRDB_/V/Vivanco/Unknown_ur89/0,-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -97,61 +97,61 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 20 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 21 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 23 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 29 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_HELP
+name: HELP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 2E 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 34 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 36 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/V/Vizio/Unknown_VX37L/4,-1.ir b/_CSV-IRDB_/V/Vizio/Unknown_VX37L/4,-1.ir
index d0c146b1..9ff9fe87 100644
--- a/_CSV-IRDB_/V/Vizio/Unknown_VX37L/4,-1.ir
+++ b/_CSV-IRDB_/V/Vizio/Unknown_VX37L/4,-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -13,25 +13,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -43,91 +43,91 @@ protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -145,55 +145,55 @@ protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_ZOOMIN
+name: ZOOMIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_ZOOMOUT
+name: ZOOMOUT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 44 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 48 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -253,7 +253,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 66 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -277,13 +277,13 @@ protocol: NECext
 address: 04 00 00 00
 command: C6 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: D6 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/V/Vizio/Unknown_Vizio/4,-1.ir b/_CSV-IRDB_/V/Vizio/Unknown_Vizio/4,-1.ir
index fe49ce89..4a604206 100644
--- a/_CSV-IRDB_/V/Vizio/Unknown_Vizio/4,-1.ir
+++ b/_CSV-IRDB_/V/Vizio/Unknown_Vizio/4,-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: CH_DWN
+name: CH-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: VOL_DWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -115,31 +115,31 @@ protocol: NECext
 address: 04 00 00 00
 command: 2F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 45 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 46 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 04 00 00 00
 command: C6 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/V/Voxson/Unknown_PT2222-1/0,-1.ir b/_CSV-IRDB_/V/Voxson/Unknown_PT2222-1/0,-1.ir
index ec1371ea..8f40b77c 100644
--- a/_CSV-IRDB_/V/Voxson/Unknown_PT2222-1/0,-1.ir
+++ b/_CSV-IRDB_/V/Voxson/Unknown_PT2222-1/0,-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 80 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 81 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 82 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 85 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 87 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -61,25 +61,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 89 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 00 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 00 00 00 00
 command: 91 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 92 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 93 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 95 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 00 00 00 00
 command: 97 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C0 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C1 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C2 00 00 00
 #
-name: X_KEY_3D
+name: X_3D
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -175,31 +175,31 @@ protocol: NECext
 address: 00 00 00 00
 command: C4 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C5 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C6 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C7 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: C8 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -217,19 +217,19 @@ protocol: NECext
 address: 00 00 00 00
 command: CB 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: CC 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: CD 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -241,25 +241,25 @@ protocol: NECext
 address: 00 00 00 00
 command: CF 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: D0 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: D1 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: D2 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -283,7 +283,7 @@ protocol: NECext
 address: 00 00 00 00
 command: D6 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/V/videologic/Unknown_rm201/134,107.ir b/_CSV-IRDB_/V/videologic/Unknown_rm201/134,107.ir
index f88247f6..86c29f85 100644
--- a/_CSV-IRDB_/V/videologic/Unknown_rm201/134,107.ir
+++ b/_CSV-IRDB_/V/videologic/Unknown_rm201/134,107.ir
@@ -13,7 +13,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -31,7 +31,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 05 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -55,7 +55,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 86 6B 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 86 6B 00 00
diff --git a/_CSV-IRDB_/V/viewmaxpro/Unknown_viewmaxpro/32,64.ir b/_CSV-IRDB_/V/viewmaxpro/Unknown_viewmaxpro/32,64.ir
index d282a4ed..a726a495 100644
--- a/_CSV-IRDB_/V/viewmaxpro/Unknown_viewmaxpro/32,64.ir
+++ b/_CSV-IRDB_/V/viewmaxpro/Unknown_viewmaxpro/32,64.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 40 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 20 40 00 00
 command: 04 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 05 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 06 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 40 00 00
@@ -55,19 +55,19 @@ protocol: NECext
 address: 20 40 00 00
 command: 08 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 09 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 0A 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 40 00 00
@@ -79,37 +79,37 @@ protocol: NECext
 address: 20 40 00 00
 command: 0C 00 00 00
 #
-name: KEY_LAST
+name: LAST
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 0D 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 40 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 20 40 00 00
 command: 17 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 40 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 20 40 00 00
 command: 19 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 20 40 00 00
 command: 1A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 40 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 20 40 00 00
 command: 1E 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 20 40 00 00
diff --git a/_CSV-IRDB_/W/WD/Unknown_HDTVMediaPlayerV1/132,121.ir b/_CSV-IRDB_/W/WD/Unknown_HDTVMediaPlayerV1/132,121.ir
index bc6013a6..6dbd910e 100644
--- a/_CSV-IRDB_/W/WD/Unknown_HDTVMediaPlayerV1/132,121.ir
+++ b/_CSV-IRDB_/W/WD/Unknown_HDTVMediaPlayerV1/132,121.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 00 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 01 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 04 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 05 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 07 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 08 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 0A 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 12 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 1A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 1B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 1E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 84 79 00 00
diff --git a/_CSV-IRDB_/W/WD/Unknown_TV/132,121.ir b/_CSV-IRDB_/W/WD/Unknown_TV/132,121.ir
index adcf5437..0831f814 100644
--- a/_CSV-IRDB_/W/WD/Unknown_TV/132,121.ir
+++ b/_CSV-IRDB_/W/WD/Unknown_TV/132,121.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 00 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 01 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 04 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 05 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 07 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 08 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 09 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 0A 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 0F 00 00 00
 #
-name: KEY_EJECTCLOSECD
+name: EJECTCLOSECD
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 10 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 12 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 1A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 1B 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 84 79 00 00
 command: 1E 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 84 79 00 00
diff --git a/_CSV-IRDB_/W/Westinghouse/Unknown_LVM-47W1/1,-1.ir b/_CSV-IRDB_/W/Westinghouse/Unknown_LVM-47W1/1,-1.ir
index 003fa1b6..f96ef724 100644
--- a/_CSV-IRDB_/W/Westinghouse/Unknown_LVM-47W1/1,-1.ir
+++ b/_CSV-IRDB_/W/Westinghouse/Unknown_LVM-47W1/1,-1.ir
@@ -7,19 +7,19 @@ protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -37,7 +37,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -67,73 +67,73 @@ protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -145,37 +145,37 @@ protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 40 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 43 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 44 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/W/Westinghouse/Unknown_RMT/1,-1.ir b/_CSV-IRDB_/W/Westinghouse/Unknown_RMT/1,-1.ir
index a78c2fa8..d68d3504 100644
--- a/_CSV-IRDB_/W/Westinghouse/Unknown_RMT/1,-1.ir
+++ b/_CSV-IRDB_/W/Westinghouse/Unknown_RMT/1,-1.ir
@@ -1,67 +1,67 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_DOT
+name: DOT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -79,43 +79,43 @@ protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_EPG
+name: EPG
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -127,13 +127,13 @@ protocol: NECext
 address: 01 00 00 00
 command: 18 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 01 00 00 00
 command: 25 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 33 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 34 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 36 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 3B 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_PC
+name: PC
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 01 00 00 00
 command: 5F 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -241,31 +241,31 @@ protocol: NECext
 address: 01 00 00 00
 command: 65 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 6A 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 6B 00 00 00
 #
-name: KEY_C
+name: C
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 6C 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 74 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/W/Wilfa/Unknown_RVC-17/64,175.ir b/_CSV-IRDB_/W/Wilfa/Unknown_RVC-17/64,175.ir
index 092f9a48..10b17457 100644
--- a/_CSV-IRDB_/W/Wilfa/Unknown_RVC-17/64,175.ir
+++ b/_CSV-IRDB_/W/Wilfa/Unknown_RVC-17/64,175.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
@@ -13,19 +13,19 @@ protocol: NECext
 address: 40 AF 00 00
 command: 02 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 03 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
 command: 05 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 40 AF 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 40 AF 00 00
diff --git a/_CSV-IRDB_/X/XMS/Unknown_XMS503/32,-1.ir b/_CSV-IRDB_/X/XMS/Unknown_XMS503/32,-1.ir
index b58ebeef..d7505424 100644
--- a/_CSV-IRDB_/X/XMS/Unknown_XMS503/32,-1.ir
+++ b/_CSV-IRDB_/X/XMS/Unknown_XMS503/32,-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 03 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -43,13 +43,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 07 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1CH
+name: 1CH
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -109,25 +109,25 @@ protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -139,25 +139,25 @@ protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -169,13 +169,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 40 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 42 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 44 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 55 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/X/XORO/Unknown_DVB/1,-1.ir b/_CSV-IRDB_/X/XORO/Unknown_DVB/1,-1.ir
index 02f9769f..51212dd3 100644
--- a/_CSV-IRDB_/X/XORO/Unknown_DVB/1,-1.ir
+++ b/_CSV-IRDB_/X/XORO/Unknown_DVB/1,-1.ir
@@ -1,49 +1,49 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 00 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 02 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 04 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 06 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 07 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 01 00 00 00
@@ -55,133 +55,133 @@ protocol: NECext
 address: 01 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 11 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 13 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 15 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 16 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 19 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 40 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 41 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 01 00 00 00
 command: 42 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 01 00 00 00
diff --git a/_CSV-IRDB_/X/Xlogic/Unknown_XLOGIC-KF8000D/64,63.ir b/_CSV-IRDB_/X/Xlogic/Unknown_XLOGIC-KF8000D/64,63.ir
index 2f525d6b..45635a9a 100644
--- a/_CSV-IRDB_/X/Xlogic/Unknown_XLOGIC-KF8000D/64,63.ir
+++ b/_CSV-IRDB_/X/Xlogic/Unknown_XLOGIC-KF8000D/64,63.ir
@@ -7,13 +7,13 @@ protocol: NECext
 address: 40 3F 00 00
 command: 00 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 01 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -25,7 +25,7 @@ protocol: NECext
 address: 40 3F 00 00
 command: 03 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -37,31 +37,31 @@ protocol: NECext
 address: 40 3F 00 00
 command: 06 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 07 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 08 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 09 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0A 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -73,49 +73,49 @@ protocol: NECext
 address: 40 3F 00 00
 command: 0C 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0D 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0E 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 0F 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 11 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 12 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 13 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -127,37 +127,37 @@ protocol: NECext
 address: 40 3F 00 00
 command: 15 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 17 00 00 00
 #
-name: KEY_0+
+name: 0+
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 18 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 19 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 1A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 40 3F 00 00
 command: 1C 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
@@ -187,85 +187,85 @@ protocol: NECext
 address: 40 3F 00 00
 command: 1F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 40 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 41 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 42 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 43 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 45 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 46 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 47 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 48 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 49 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 4A 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 4B 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 4D 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
 command: 4E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 40 3F 00 00
diff --git a/_CSV-IRDB_/X/Xtreamer/Unknown_Xtreamer/0,-1.ir b/_CSV-IRDB_/X/Xtreamer/Unknown_Xtreamer/0,-1.ir
index 0906cfea..495b5df7 100644
--- a/_CSV-IRDB_/X/Xtreamer/Unknown_Xtreamer/0,-1.ir
+++ b/_CSV-IRDB_/X/Xtreamer/Unknown_Xtreamer/0,-1.ir
@@ -1,205 +1,205 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_AB
+name: AB
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_RESTART
+name: RESTART
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 31 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 32 00 00 00
 #
-name: KEY_SHUFFLE
+name: SHUFFLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 33 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 45 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_PLAYPAUSE
+name: PLAYPAUSE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 58 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5A 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/X/xsat/Unknown_xsat/34,-1.ir b/_CSV-IRDB_/X/xsat/Unknown_xsat/34,-1.ir
index 7bba47e4..10d40375 100644
--- a/_CSV-IRDB_/X/xsat/Unknown_xsat/34,-1.ir
+++ b/_CSV-IRDB_/X/xsat/Unknown_xsat/34,-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 22 00 00 00
 command: 11 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -127,19 +127,19 @@ protocol: NECext
 address: 22 00 00 00
 command: 14 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 15 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 16 00 00 00
 #
-name: KEY_RED
+name: RED
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -151,49 +151,49 @@ protocol: NECext
 address: 22 00 00 00
 command: 19 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 22 00 00 00
 command: 58 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 22 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 22 00 00 00
 command: 9D 00 00 00
 #
-name: X_KEY_QUIT
+name: X_QUIT
 type: parsed
 protocol: NECext
 address: 22 00 00 00
diff --git a/_CSV-IRDB_/Y/YES/Unknown_YES/132_60.ir b/_CSV-IRDB_/Y/YES/Unknown_YES/132_60.ir
index ef44304e..b43fa5b3 100644
--- a/_CSV-IRDB_/Y/YES/Unknown_YES/132_60.ir
+++ b/_CSV-IRDB_/Y/YES/Unknown_YES/132_60.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 20 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 21 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -25,49 +25,49 @@ protocol: NECext
 address: 84 3C 00 00
 command: 23 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 24 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 25 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 26 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 27 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 28 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 29 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2A 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -79,55 +79,55 @@ protocol: NECext
 address: 84 3C 00 00
 command: 2C 00 00 00
 #
-name: KEY_GREEN
+name: GREEN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2D 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 2F 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 30 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 31 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 32 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 33 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 34 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 84 3C 00 00
 command: 36 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 37 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 38 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 39 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3A 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3B 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3C 00 00 00
 #
-name: KEY_YELLOW
+name: YELLOW
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
@@ -187,25 +187,25 @@ protocol: NECext
 address: 84 3C 00 00
 command: 3E 00 00 00
 #
-name: KEY_BLUE
+name: BLUE
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 3F 00 00 00
 #
-name: KEY_I
+name: I
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 40 00 00 00
 #
-name: KEY_A
+name: A
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
 command: 41 00 00 00
 #
-name: KEY_B
+name: B
 type: parsed
 protocol: NECext
 address: 84 3C 00 00
diff --git a/_CSV-IRDB_/Y/Yakumo/Unknown_DVD/4,-1.ir b/_CSV-IRDB_/Y/Yakumo/Unknown_DVD/4,-1.ir
index 252b86c8..2ef9cf70 100644
--- a/_CSV-IRDB_/Y/Yakumo/Unknown_DVD/4,-1.ir
+++ b/_CSV-IRDB_/Y/Yakumo/Unknown_DVD/4,-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -37,151 +37,151 @@ protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 50 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -247,25 +247,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 56 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamada/Unknown_DVX-6xxx/4,-1.ir b/_CSV-IRDB_/Y/Yamada/Unknown_DVX-6xxx/4,-1.ir
index 0acbd508..cffa11bb 100644
--- a/_CSV-IRDB_/Y/Yamada/Unknown_DVX-6xxx/4,-1.ir
+++ b/_CSV-IRDB_/Y/Yamada/Unknown_DVX-6xxx/4,-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -37,151 +37,151 @@ protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -205,19 +205,19 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 50 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -229,13 +229,13 @@ protocol: NECext
 address: 04 00 00 00
 command: 52 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 54 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -247,25 +247,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 56 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 58 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 59 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamada/Unknown_PVD-500/0,-1.ir b/_CSV-IRDB_/Y/Yamada/Unknown_PVD-500/0,-1.ir
index ed52a4ff..366e19c5 100644
--- a/_CSV-IRDB_/Y/Yamada/Unknown_PVD-500/0,-1.ir
+++ b/_CSV-IRDB_/Y/Yamada/Unknown_PVD-500/0,-1.ir
@@ -1,43 +1,43 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 00 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 02 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 03 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 09 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 00 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 00 00 00
@@ -79,115 +79,115 @@ protocol: NECext
 address: 00 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 10 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 11 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 12 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 15 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 16 00 00 00
 #
-name: KEY_2step
+name: 2step
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 17 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 19 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 40 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 48 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Amplifier/120,-1.ir b/_CSV-IRDB_/Y/Yamaha/Amplifier/120,-1.ir
index 7ad149c3..ca8b4bd1 100644
--- a/_CSV-IRDB_/Y/Yamaha/Amplifier/120,-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Amplifier/120,-1.ir
@@ -163,13 +163,13 @@ protocol: NECext
 address: 78 00 00 00
 command: 1D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Amplifier/122,-1.ir b/_CSV-IRDB_/Y/Yamaha/Amplifier/122,-1.ir
index 42a10b85..14aa1bb8 100644
--- a/_CSV-IRDB_/Y/Yamaha/Amplifier/122,-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Amplifier/122,-1.ir
@@ -43,13 +43,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Amplifier/125,-1.ir b/_CSV-IRDB_/Y/Yamaha/Amplifier/125,-1.ir
index 026a2678..b718b58d 100644
--- a/_CSV-IRDB_/Y/Yamaha/Amplifier/125,-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Amplifier/125,-1.ir
@@ -67,13 +67,13 @@ protocol: NECext
 address: 7D 00 00 00
 command: 8C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
 command: 8D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/CD_Player/121,-1.ir b/_CSV-IRDB_/Y/Yamaha/CD_Player/121,-1.ir
index f860c5ed..1206bc86 100644
--- a/_CSV-IRDB_/Y/Yamaha/CD_Player/121,-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/CD_Player/121,-1.ir
@@ -829,7 +829,7 @@ protocol: NECext
 address: 79 00 00 00
 command: 60 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/DSP/120_-1.ir b/_CSV-IRDB_/Y/Yamaha/DSP/120_-1.ir
index 45398f1a..037b1de7 100644
--- a/_CSV-IRDB_/Y/Yamaha/DSP/120_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/DSP/120_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 0F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/DVD/124_-1.ir b/_CSV-IRDB_/Y/Yamaha/DVD/124_-1.ir
index 26d0c9f0..778dd34d 100644
--- a/_CSV-IRDB_/Y/Yamaha/DVD/124_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/DVD/124_-1.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 7C 00 00 00
 command: 80 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 7C 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/DVD_Player/124_-1.ir b/_CSV-IRDB_/Y/Yamaha/DVD_Player/124_-1.ir
index 4ac9b7c5..31e5f5b6 100644
--- a/_CSV-IRDB_/Y/Yamaha/DVD_Player/124_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/DVD_Player/124_-1.ir
@@ -7,7 +7,7 @@ protocol: NECext
 address: 7C 00 00 00
 command: 80 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 7C 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/DVD_Pre-amp/120_-1.ir b/_CSV-IRDB_/Y/Yamaha/DVD_Pre-amp/120_-1.ir
index ef1c6304..4360374d 100644
--- a/_CSV-IRDB_/Y/Yamaha/DVD_Pre-amp/120_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/DVD_Pre-amp/120_-1.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: 78 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/DVD_Receiver/120_-1.ir b/_CSV-IRDB_/Y/Yamaha/DVD_Receiver/120_-1.ir
index 8180b9f4..e6ac3b50 100644
--- a/_CSV-IRDB_/Y/Yamaha/DVD_Receiver/120_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/DVD_Receiver/120_-1.ir
@@ -19,13 +19,13 @@ protocol: NECext
 address: 78 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/DVR/120_-1.ir b/_CSV-IRDB_/Y/Yamaha/DVR/120_-1.ir
index 78490933..e80a244b 100644
--- a/_CSV-IRDB_/Y/Yamaha/DVR/120_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/DVR/120_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -79,13 +79,13 @@ protocol: NECext
 address: 78 00 00 00
 command: 1C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Music_Server/128_55.ir b/_CSV-IRDB_/Y/Yamaha/Music_Server/128_55.ir
index da2d395c..abd64f66 100644
--- a/_CSV-IRDB_/Y/Yamaha/Music_Server/128_55.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Music_Server/128_55.ir
@@ -439,13 +439,13 @@ protocol: NECext
 address: 80 37 00 00
 command: 9D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 37 00 00
 command: 9E 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 37 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Receiver/120_-1.ir b/_CSV-IRDB_/Y/Yamaha/Receiver/120_-1.ir
index edaef62e..50a351af 100644
--- a/_CSV-IRDB_/Y/Yamaha/Receiver/120_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Receiver/120_-1.ir
@@ -79,13 +79,13 @@ protocol: NECext
 address: 78 00 00 00
 command: 1D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Receiver/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Receiver/122_-1.ir
index 1e1674ca..42e61f6c 100644
--- a/_CSV-IRDB_/Y/Yamaha/Receiver/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Receiver/122_-1.ir
@@ -607,7 +607,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 10 00 00 00
 #
-name: TUN_PRES/CH_UP
+name: TUN_PRES/CH+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -1669,7 +1669,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -1687,7 +1687,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: VOL_UP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -1711,7 +1711,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: MZ:_VOLUME_+
+name: MZ:_VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -1771,7 +1771,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -1789,7 +1789,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: VOL_DOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -1813,7 +1813,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: MZ:_VOLUME_-
+name: MZ:_VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -2035,7 +2035,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1D 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -5233,7 +5233,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 6A 00 00 00
 #
-name: XM:_PRE/CH_UP
+name: XM:_PRE/CH+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -12841,7 +12841,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: DA 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -12859,7 +12859,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: DA 00 00 00
 #
-name: Z2:_VOLUME_+
+name: Z2:_VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -12913,7 +12913,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: DB 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -12931,7 +12931,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: DB 00 00 00
 #
-name: Z2:_VOLUME_-
+name: Z2:_VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -14881,7 +14881,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: FD 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -14893,7 +14893,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: FD 00 00 00
 #
-name: Z3:_VOLUME_+
+name: Z3:_VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -14917,7 +14917,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: FE 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -14929,7 +14929,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: FE 00 00 00
 #
-name: Z3:_VOLUME_-
+name: Z3:_VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Receiver/125_-1.ir b/_CSV-IRDB_/Y/Yamaha/Receiver/125_-1.ir
index a9eb6cf4..fe27ad84 100644
--- a/_CSV-IRDB_/Y/Yamaha/Receiver/125_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Receiver/125_-1.ir
@@ -157,25 +157,25 @@ protocol: NECext
 address: 7D 00 00 00
 command: 6F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
 command: 70 00 00 00
 #
-name: Z2_VOLUME_+
+name: Z2_VOL+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
 command: 70 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
 command: 71 00 00 00
 #
-name: Z2_VOLUME_-
+name: Z2_VOL-
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
@@ -319,13 +319,13 @@ protocol: NECext
 address: 7D 00 00 00
 command: 8C 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
 command: 8D 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
@@ -727,7 +727,7 @@ protocol: NECext
 address: 7D 00 00 00
 command: DB 00 00 00
 #
-name: STANDBY/ON
+name: POWER
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
@@ -757,7 +757,7 @@ protocol: NECext
 address: 7D 00 00 00
 command: E3 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
@@ -769,7 +769,7 @@ protocol: NECext
 address: 7D 00 00 00
 command: E4 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
@@ -895,7 +895,7 @@ protocol: NECext
 address: 7D 00 00 00
 command: F5 00 00 00
 #
-name: TUNER_PRESET/CH_UP
+name: TUNER_PRESET/CH+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Receiver/126_-1.ir b/_CSV-IRDB_/Y/Yamaha/Receiver/126_-1.ir
index 9f99a8fb..33f7a8a3 100644
--- a/_CSV-IRDB_/Y/Yamaha/Receiver/126_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Receiver/126_-1.ir
@@ -757,7 +757,7 @@ protocol: NECext
 address: 7E 00 00 00
 command: 24 00 00 00
 #
-name: VOLUME_+_ALL_ZONES
+name: VOL+_ALL_ZONES
 type: parsed
 protocol: NECext
 address: 7E 00 00 00
@@ -817,7 +817,7 @@ protocol: NECext
 address: 7E 00 00 00
 command: 25 00 00 00
 #
-name: VOLUME_-_ALL_ZONES
+name: VOL-_ALL_ZONES
 type: parsed
 protocol: NECext
 address: 7E 00 00 00
@@ -5797,7 +5797,7 @@ protocol: NECext
 address: 7E 00 00 00
 command: 7E 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 7E 00 00 00
@@ -9721,7 +9721,7 @@ protocol: NECext
 address: 7E 00 00 00
 command: BA 00 00 00
 #
-name: ON
+POWER
 type: parsed
 protocol: NECext
 address: 7E 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Sound_Projector/120_-1.ir b/_CSV-IRDB_/Y/Yamaha/Sound_Projector/120_-1.ir
index 22a1d5c7..7517eb91 100644
--- a/_CSV-IRDB_/Y/Yamaha/Sound_Projector/120_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Sound_Projector/120_-1.ir
@@ -193,7 +193,7 @@ protocol: NECext
 address: 78 00 00 00
 command: 1D 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 78 00 00 00
 command: 1E 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Stereo_Receiver/125_-1.ir b/_CSV-IRDB_/Y/Yamaha/Stereo_Receiver/125_-1.ir
index f9338b45..69837996 100644
--- a/_CSV-IRDB_/Y/Yamaha/Stereo_Receiver/125_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Stereo_Receiver/125_-1.ir
@@ -157,25 +157,25 @@ protocol: NECext
 address: 7D 00 00 00
 command: 6F 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
 command: 70 00 00 00
 #
-name: Z2_VOLUME_+
+name: Z2_VOL+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
 command: 70 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
 command: 71 00 00 00
 #
-name: Z2_VOLUME_-
+name: Z2_VOL-
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
@@ -373,7 +373,7 @@ protocol: NECext
 address: 7D 00 00 00
 command: E8 00 00 00
 #
-name: TUNER_PRESET/CH_UP
+name: TUNER_PRESET/CH+
 type: parsed
 protocol: NECext
 address: 7D 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_DVD-RC/32_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_DVD-RC/32_-1.ir
index c2b58cfa..6df5ece5 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_DVD-RC/32_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_DVD-RC/32_-1.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: 20 00 00 00
 command: 01 00 00 00
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 02 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -43,67 +43,67 @@ protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 13 00 00 00
 #
-name: KEY_1/all
+name: 1/all
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -127,55 +127,55 @@ protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 18 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -187,19 +187,19 @@ protocol: NECext
 address: 20 00 00 00
 command: 41 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 44 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -211,7 +211,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -223,13 +223,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -247,25 +247,25 @@ protocol: NECext
 address: 20 00 00 00
 command: 58 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_DVD/69_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_DVD/69_-1.ir
index 7067bcf3..13172e0e 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_DVD/69_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_DVD/69_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 00 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 01 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 02 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 03 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 04 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 05 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 06 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 07 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 12 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 13 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 14 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -97,25 +97,25 @@ protocol: NECext
 address: 45 00 00 00
 command: 16 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 19 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 21 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 22 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -127,7 +127,7 @@ protocol: NECext
 address: 45 00 00 00
 command: 24 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
@@ -139,43 +139,43 @@ protocol: NECext
 address: 45 00 00 00
 command: 26 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 51 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 80 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 81 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: 84 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 45 00 00 00
 command: DE 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 45 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_JVCDVD/239_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_JVCDVD/239_-1.ir
index ab5a025b..ffd39350 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_JVCDVD/239_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_JVCDVD/239_-1.ir
@@ -1,103 +1,103 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 40 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 43 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 61 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 62 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 63 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 64 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 65 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 66 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 67 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 68 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 69 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 6E 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: 6F 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: B0 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: EF 00 00 00
@@ -109,49 +109,49 @@ protocol: NECext
 address: EF 00 00 00
 command: C0 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: C1 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: C2 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D0 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D1 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D2 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D3 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: EF 00 00 00
 command: D4 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: EF 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RAV-12/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RAV-12/122_-1.ir
index b229c71f..1fd54557 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RAV-12/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RAV-12/122_-1.ir
@@ -127,19 +127,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RAV14/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RAV14/122_-1.ir
index 1080aa38..9e57eb7f 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RAV14/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RAV14/122_-1.ir
@@ -79,7 +79,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -103,25 +103,25 @@ protocol: NECext
 address: 7A 00 00 00
 command: 12 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -193,7 +193,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -223,7 +223,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 86 00 00 00
 #
-name: KEY_6CH_INPUT
+name: 6CH_INPUT
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RAV16/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RAV16/122_-1.ir
index bb067f3d..fb6f506c 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RAV16/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RAV16/122_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -25,37 +25,37 @@ protocol: NECext
 address: 7A 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -91,19 +91,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 57 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 58 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -121,7 +121,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 86 00 00 00
 #
-name: KEY_6chIN
+name: 6chIN
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 95 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 9C 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RAV207/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RAV207/122_-1.ir
index 94ae5381..acbefbd0 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RAV207/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RAV207/122_-1.ir
@@ -43,13 +43,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: AMP/VOL_UP
+name: AMP/VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: AMP/VOL_DOWN
+name: AMP/VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RCX-750/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RCX-750/122_-1.ir
index 6a4ca79c..e7c2f6de 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RCX-750/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RCX-750/122_-1.ir
@@ -145,19 +145,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 40 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RCX/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RCX/122_-1.ir
index b54cbc8f..a5cd3f38 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RCX/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RCX/122_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -85,19 +85,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RCX2/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RCX2/122_-1.ir
index 3322ed82..e0322557 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RCX2/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RCX2/122_-1.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RCX660/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RCX660/122_-1.ir
index 289a0ed7..752afb0f 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RCX660/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RCX660/122_-1.ir
@@ -145,13 +145,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: MASTER_VOLUME_+
+name: MASTER_VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: MASTER_VOLUME_-
+name: MASTER_VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RS-CD5/121_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RS-CD5/121_-1.ir
index f3824748..f14e1f0d 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RS-CD5/121_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RS-CD5/121_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -19,7 +19,7 @@ protocol: NECext
 address: 79 00 00 00
 command: 03 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 79 00 00 00
 command: 06 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -61,67 +61,67 @@ protocol: NECext
 address: 79 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 19 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RS-CX600/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RS-CX600/122_-1.ir
index 8b2b34eb..ac366125 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RS-CX600/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RS-CX600/122_-1.ir
@@ -13,13 +13,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RS-K3/127_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RS-K3/127_-1.ir
index 2aa11bb4..9d1bd4c5 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RS-K3/127_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RS-K3/127_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RX-450/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RX-450/122_-1.ir
index d7568be1..baaefea5 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RX-450/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RX-450/122_-1.ir
@@ -19,43 +19,43 @@ protocol: NECext
 address: 7A 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RX-CX800/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RX-CX800/122_-1.ir
index 2dbd8420..c91e6180 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RX-CX800/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RX-CX800/122_-1.ir
@@ -127,13 +127,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_RX-V850/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_RX-V850/122_-1.ir
index 6d3e75e0..e7c889fe 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_RX-V850/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_RX-V850/122_-1.ir
@@ -109,13 +109,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -139,13 +139,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -157,7 +157,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_V499920/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_V499920/122_-1.ir
index 1851026a..1021ff6e 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_V499920/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_V499920/122_-1.ir
@@ -25,7 +25,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -109,19 +109,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 17 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VI47320/209_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VI47320/209_-1.ir
index d0ebf1b8..9ca18b3a 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VI47320/209_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VI47320/209_-1.ir
@@ -7,49 +7,49 @@ protocol: NECext
 address: D1 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: D1 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: D1 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: D1 00 00 00
 command: 10 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: D1 00 00 00
 command: 11 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: D1 00 00 00
 command: 12 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: D1 00 00 00
 command: 13 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: D1 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: D1 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VI77760/127_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VI77760/127_-1.ir
index b4d8e3e3..4e0c21af 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VI77760/127_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VI77760/127_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 01 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 04 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 7F 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -67,61 +67,61 @@ protocol: NECext
 address: 7F 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
@@ -133,7 +133,7 @@ protocol: NECext
 address: 7F 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 7F 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VJ59810/121_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VJ59810/121_-1.ir
index cb9a4d6e..4e19c878 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VJ59810/121_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VJ59810/121_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -31,67 +31,67 @@ protocol: NECext
 address: 79 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 19 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 79 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VJI5420/121_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VJI5420/121_-1.ir
index 9bc0f222..a919d2a0 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VJI5420/121_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VJI5420/121_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 00 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 79 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -61,73 +61,73 @@ protocol: NECext
 address: 79 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 19 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -163,13 +163,13 @@ protocol: NECext
 address: 79 00 00 00
 command: 50 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 55 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VK34080/121_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VK34080/121_-1.ir
index 8657ee5b..5dda6716 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VK34080/121_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VK34080/121_-1.ir
@@ -1,25 +1,25 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 02 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 04 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -31,67 +31,67 @@ protocol: NECext
 address: 79 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 19 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -109,13 +109,13 @@ protocol: NECext
 address: 79 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VK38010/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VK38010/122_-1.ir
index 4851455b..29747836 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VK38010/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VK38010/122_-1.ir
@@ -115,19 +115,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -145,13 +145,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VM70300/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VM70300/122_-1.ir
index b360a2f7..13e38dd2 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VM70300/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VM70300/122_-1.ir
@@ -127,13 +127,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -169,7 +169,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -205,7 +205,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VP59040/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VP59040/122_-1.ir
index 861801c1..31b6822e 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VP59040/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VP59040/122_-1.ir
@@ -1,37 +1,37 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 00 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 01 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 02 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 04 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -49,7 +49,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -85,7 +85,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -115,19 +115,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VQ95010/121_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VQ95010/121_-1.ir
index 346046ad..ca613cfb 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VQ95010/121_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VQ95010/121_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -55,79 +55,79 @@ protocol: NECext
 address: 79 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SPACE
+name: SPACE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 19 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 79 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 55 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 56 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VR81350/123_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VR81350/123_-1.ir
index 387d4caf..841435c7 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VR81350/123_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VR81350/123_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 80 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 82 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
@@ -31,13 +31,13 @@ protocol: NECext
 address: 7B 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
@@ -67,7 +67,7 @@ protocol: NECext
 address: 7B 00 00 00
 command: 97 00 00 00
 #
-name: KEY_NUMERIC_POUND
+name: NUMERIC_POUND
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 7B 00 00 00
 command: D9 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7B 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_VU71330/121_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_VU71330/121_-1.ir
index efe5c3bd..9be00b48 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_VU71330/121_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_VU71330/121_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -43,7 +43,7 @@ protocol: NECext
 address: 79 00 00 00
 command: 08 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -61,13 +61,13 @@ protocol: NECext
 address: 79 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SPACE
+name: SPACE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -151,19 +151,19 @@ protocol: NECext
 address: 79 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 55 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 56 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_Y-TV-1004/4_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_Y-TV-1004/4_-1.ir
index 61a68a22..7c861962 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_Y-TV-1004/4_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_Y-TV-1004/4_-1.ir
@@ -1,91 +1,91 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_YAMAHA/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_YAMAHA/122_-1.ir
index 4c718715..f849d8fc 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_YAMAHA/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_YAMAHA/122_-1.ir
@@ -115,19 +115,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_av/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_av/122_-1.ir
index b0fd36e6..1f2d5f2d 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_av/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_av/122_-1.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -31,19 +31,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -55,25 +55,25 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -85,13 +85,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 52 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -115,7 +115,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 91 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 98 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_cdx-493/121_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_cdx-493/121_-1.ir
index c3928937..b9fc91b7 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_cdx-493/121_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_cdx-493/121_-1.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 01 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -37,13 +37,13 @@ protocol: NECext
 address: 79 00 00 00
 command: 07 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 08 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -61,73 +61,73 @@ protocol: NECext
 address: 79 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_SPACE
+name: SPACE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 79 00 00 00
@@ -163,19 +163,19 @@ protocol: NECext
 address: 79 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 55 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 79 00 00 00
 command: 56 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 79 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_rax9/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_rax9/122_-1.ir
index 18294aa6..97cb1ecd 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_rax9/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_rax9/122_-1.ir
@@ -103,25 +103,25 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 17 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_receiver/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_receiver/122_-1.ir
index a5615e62..3c4d7bf7 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_receiver/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_receiver/122_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VCR
+name: VCR
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -25,13 +25,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -49,31 +49,31 @@ protocol: NECext
 address: 7A 00 00 00
 command: 18 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -91,13 +91,13 @@ protocol: NECext
 address: 7A 00 00 00
 command: 55 00 00 00
 #
-name: KEY_6ch_input
+name: 6ch_input
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 87 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_vu50620/120_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_vu50620/120_-1.ir
index 898253b3..f04ecb43 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_vu50620/120_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_vu50620/120_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -37,19 +37,19 @@ protocol: NECext
 address: 78 00 00 00
 command: 07 00 00 00
 #
-name: KEY_TAPE
+name: TAPE
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 08 00 00 00
 #
-name: KEY_EDIT
+name: EDIT
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 09 00 00 00
 #
-name: KEY_TIME
+name: TIME
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -61,7 +61,7 @@ protocol: NECext
 address: 78 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -73,85 +73,85 @@ protocol: NECext
 address: 78 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 19 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 78 00 00 00
 command: 45 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -199,13 +199,13 @@ protocol: NECext
 address: 78 00 00 00
 command: 47 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 78 00 00 00
 command: 4B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -241,7 +241,7 @@ protocol: NECext
 address: 78 00 00 00
 command: 59 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 78 00 00 00
@@ -259,7 +259,7 @@ protocol: NECext
 address: 78 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_MODE
+name: MODE
 type: parsed
 protocol: NECext
 address: 78 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_yamaha-amp/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_yamaha-amp/122_-1.ir
index 875211b1..1b52af6e 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_yamaha-amp/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_yamaha-amp/122_-1.ir
@@ -37,19 +37,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -67,25 +67,25 @@ protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -109,7 +109,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 56 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -133,61 +133,61 @@ protocol: NECext
 address: 7A 00 00 00
 command: 87 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 88 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 89 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 8A 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 8B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 8C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 8D 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 8E 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 8F 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 90 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 9F 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamaha/Unknown_yamaha-rax7/122_-1.ir b/_CSV-IRDB_/Y/Yamaha/Unknown_yamaha-rax7/122_-1.ir
index 08510870..ae445065 100644
--- a/_CSV-IRDB_/Y/Yamaha/Unknown_yamaha-rax7/122_-1.ir
+++ b/_CSV-IRDB_/Y/Yamaha/Unknown_yamaha-rax7/122_-1.ir
@@ -103,19 +103,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 14 00 00 00
 #
-name: KEY_CD
+name: CD
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 15 00 00 00
 #
-name: KEY_TUNER
+name: TUNER
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 16 00 00 00
 #
-name: KEY_AUX
+name: AUX
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -133,19 +133,19 @@ protocol: NECext
 address: 7A 00 00 00
 command: 19 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
@@ -163,7 +163,7 @@ protocol: NECext
 address: 7A 00 00 00
 command: 4F 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 7A 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamakawa/DVD_Player/32_-1.ir b/_CSV-IRDB_/Y/Yamakawa/DVD_Player/32_-1.ir
index 6a71120a..0d9643ed 100644
--- a/_CSV-IRDB_/Y/Yamakawa/DVD_Player/32_-1.ir
+++ b/_CSV-IRDB_/Y/Yamakawa/DVD_Player/32_-1.ir
@@ -103,7 +103,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -229,7 +229,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 54 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/Y/Yamakawa/Unknown_dvd285vga/32_-1.ir b/_CSV-IRDB_/Y/Yamakawa/Unknown_dvd285vga/32_-1.ir
index d2c21f7d..7d6bc39f 100644
--- a/_CSV-IRDB_/Y/Yamakawa/Unknown_dvd285vga/32_-1.ir
+++ b/_CSV-IRDB_/Y/Yamakawa/Unknown_dvd285vga/32_-1.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_SETUP
+name: SETUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -13,73 +13,73 @@ protocol: NECext
 address: 20 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 08 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 10 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 11 00 00 00
 #
-name: KEY_SUBTITLE
+name: SUBTITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 12 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -91,25 +91,25 @@ protocol: NECext
 address: 20 00 00 00
 command: 14 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 15 00 00 00
 #
-name: KEY_LANGUAGE
+name: LANGUAGE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 16 00 00 00
 #
-name: KEY_1/all
+name: 1/all
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 17 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -121,49 +121,49 @@ protocol: NECext
 address: 20 00 00 00
 command: 19 00 00 00
 #
-name: KEY_EJECTCD
+name: EJECTCD
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1E 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_TITLE
+name: TITLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 40 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 20 00 00 00
 command: 43 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -187,13 +187,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 47 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 48 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -211,31 +211,31 @@ protocol: NECext
 address: 20 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_10CHANNELSUP
+name: 10CHANNELSUP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 4D 00 00 00
 #
-name: KEY_SEARCH
+name: SEARCH
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 50 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 51 00 00 00
 #
-name: KEY_ANGLE
+name: ANGLE
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 54 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 20 00 00 00
@@ -253,13 +253,13 @@ protocol: NECext
 address: 20 00 00 00
 command: 59 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 20 00 00 00
 command: 5C 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 20 00 00 00
diff --git a/_CSV-IRDB_/Y/Yuan/Unknown_SmartVDO/128_-1.ir b/_CSV-IRDB_/Y/Yuan/Unknown_SmartVDO/128_-1.ir
index 4c18f761..a02e8859 100644
--- a/_CSV-IRDB_/Y/Yuan/Unknown_SmartVDO/128_-1.ir
+++ b/_CSV-IRDB_/Y/Yuan/Unknown_SmartVDO/128_-1.ir
@@ -1,223 +1,223 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 00 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 03 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 05 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 06 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 07 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 08 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 09 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 10 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 11 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 12 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 13 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 15 00 00 00
 #
-name: KEY_DISPLAY
+name: DISPLAY
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 17 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 18 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 19 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1A 00 00 00
 #
-name: X_KEY_SOURCE
+name: X_SOURCE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1D 00 00 00
 #
-name: X_KEY_SNAPSHOT
+name: X_SNAPSHOT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 1F 00 00 00
 #
-name: X_KEY_SKIP_LEFT
+name: X_SKIP_LEFT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 40 00 00 00
 #
-name: X_KEY_SKIP_RIGHT
+name: X_SKIP_RIGHT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 42 00 00 00
 #
-name: X_KEY_TIME_SHIFT
+name: X_TIME_SHIFT
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 43 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 44 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 45 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 46 00 00 00
 #
-name: X_KEY_REC_PLAY
+name: X_REC_PLAY
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 47 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 48 00 00 00
 #
-name: X_KEY_MTS
+name: X_MTS
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 49 00 00 00
 #
-name: KEY_OPEN
+name: OPEN
 type: parsed
 protocol: NECext
 address: 80 00 00 00
 command: 4A 00 00 00
 #
-name: KEY_REC
+name: REC
 type: parsed
 protocol: NECext
 address: 80 00 00 00
diff --git a/_CSV-IRDB_/Z/Zalman/Unknown_HD160XT/115_154.ir b/_CSV-IRDB_/Z/Zalman/Unknown_HD160XT/115_154.ir
index 1df758ca..2993fa38 100644
--- a/_CSV-IRDB_/Z/Zalman/Unknown_HD160XT/115_154.ir
+++ b/_CSV-IRDB_/Z/Zalman/Unknown_HD160XT/115_154.ir
@@ -1,97 +1,97 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 01 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 03 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 05 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 07 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 09 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 0A 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 0B 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 0D 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 0E 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 0F 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 11 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 12 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 13 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 14 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 15 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
@@ -103,13 +103,13 @@ protocol: NECext
 address: 73 9A 00 00
 command: 17 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 19 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
@@ -121,19 +121,19 @@ protocol: NECext
 address: 73 9A 00 00
 command: 1B 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 1D 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 1E 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
@@ -145,19 +145,19 @@ protocol: NECext
 address: 73 9A 00 00
 command: 40 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 41 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 42 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
@@ -181,7 +181,7 @@ protocol: NECext
 address: 73 9A 00 00
 command: 47 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
@@ -193,61 +193,61 @@ protocol: NECext
 address: 73 9A 00 00
 command: 4B 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 4C 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 4D 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 4E 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 4F 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 50 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 51 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 52 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 53 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
 command: 54 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 73 9A 00 00
diff --git a/_CSV-IRDB_/Z/Zehnder/Unknown_VCR/3_-1.ir b/_CSV-IRDB_/Z/Zehnder/Unknown_VCR/3_-1.ir
index 148b5574..a8a87ccf 100644
--- a/_CSV-IRDB_/Z/Zehnder/Unknown_VCR/3_-1.ir
+++ b/_CSV-IRDB_/Z/Zehnder/Unknown_VCR/3_-1.ir
@@ -7,31 +7,31 @@ protocol: NECext
 address: 03 00 00 00
 command: 01 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 02 00 00 00
 #
-name: KEY_KPPLUS
+name: KPPLUS
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 03 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 05 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -43,25 +43,25 @@ protocol: NECext
 address: 03 00 00 00
 command: 07 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0C 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 0D 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -73,31 +73,31 @@ protocol: NECext
 address: 03 00 00 00
 command: 0F 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 12 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 14 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -109,25 +109,25 @@ protocol: NECext
 address: 03 00 00 00
 command: 17 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 03 00 00 00
 command: 1D 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 03 00 00 00
@@ -139,7 +139,7 @@ protocol: NECext
 address: 03 00 00 00
 command: 1F 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 03 00 00 00
diff --git a/_CSV-IRDB_/Z/Zenith/TV/5_1.ir b/_CSV-IRDB_/Z/Zenith/TV/5_1.ir
index 3216f86e..ef197bde 100644
--- a/_CSV-IRDB_/Z/Zenith/TV/5_1.ir
+++ b/_CSV-IRDB_/Z/Zenith/TV/5_1.ir
@@ -25,13 +25,13 @@ protocol: NECext
 address: 05 01 00 00
 command: 01 00 00 00
 #
-name: VOLUME_-_DOWN
+name: VOL-_DOWN
 type: parsed
 protocol: NECext
 address: 05 01 00 00
 command: 02 00 00 00
 #
-name: VOLUME_-
+name: VOL-
 type: parsed
 protocol: NECext
 address: 05 01 00 00
@@ -73,19 +73,19 @@ protocol: NECext
 address: 05 01 00 00
 command: 09 00 00 00
 #
-name: VOLUME_-_UP
+name: VOL-_UP
 type: parsed
 protocol: NECext
 address: 05 01 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_+
+name: VOL+
 type: parsed
 protocol: NECext
 address: 05 01 00 00
 command: 0A 00 00 00
 #
-name: VOLUME_-_MUTE
+name: VOL-_MUTE
 type: parsed
 protocol: NECext
 address: 05 01 00 00
diff --git a/_CSV-IRDB_/Z/Zenith/Unknown_AKB36157102/247_-1.ir b/_CSV-IRDB_/Z/Zenith/Unknown_AKB36157102/247_-1.ir
index b838ef22..385cf1eb 100644
--- a/_CSV-IRDB_/Z/Zenith/Unknown_AKB36157102/247_-1.ir
+++ b/_CSV-IRDB_/Z/Zenith/Unknown_AKB36157102/247_-1.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 03 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 04 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 05 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: F7 00 00 00
@@ -67,79 +67,79 @@ protocol: NECext
 address: F7 00 00 00
 command: 0A 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 19 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_FAVORITES
+name: FAVORITES
 type: parsed
 protocol: NECext
 address: F7 00 00 00
@@ -163,31 +163,31 @@ protocol: NECext
 address: F7 00 00 00
 command: 39 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 43 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 44 00 00 00
 #
-name: KEY_KPMINUS
+name: KPMINUS
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: F7 00 00 00
 command: 5B 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: F7 00 00 00
@@ -199,7 +199,7 @@ protocol: NECext
 address: F7 00 00 00
 command: 78 00 00 00
 #
-name: KEY_ZOOM
+name: ZOOM
 type: parsed
 protocol: NECext
 address: F7 00 00 00
@@ -217,7 +217,7 @@ protocol: NECext
 address: F7 00 00 00
 command: 96 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: F7 00 00 00
diff --git a/_CSV-IRDB_/Z/Zenith/Unknown_C32V37/4_-1.ir b/_CSV-IRDB_/Z/Zenith/Unknown_C32V37/4_-1.ir
index e3b9a7f7..9c17cd93 100644
--- a/_CSV-IRDB_/Z/Zenith/Unknown_C32V37/4_-1.ir
+++ b/_CSV-IRDB_/Z/Zenith/Unknown_C32V37/4_-1.ir
@@ -1,55 +1,55 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 06 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 07 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -67,61 +67,61 @@ protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -145,25 +145,25 @@ protocol: NECext
 address: 04 00 00 00
 command: 39 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 40 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 41 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 43 00 00 00
 #
-name: KEY_SELECT
+name: SELECT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -175,7 +175,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 4C 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -187,7 +187,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 51 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 04 00 00 00
@@ -247,7 +247,7 @@ protocol: NECext
 address: 04 00 00 00
 command: 98 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/Z/Zenith/Unknown_TV/4_-1.ir b/_CSV-IRDB_/Z/Zenith/Unknown_TV/4_-1.ir
index 4e9b5a11..76f558ac 100644
--- a/_CSV-IRDB_/Z/Zenith/Unknown_TV/4_-1.ir
+++ b/_CSV-IRDB_/Z/Zenith/Unknown_TV/4_-1.ir
@@ -1,109 +1,109 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 00 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 01 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 02 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 03 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 08 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 09 00 00 00
 #
-name: KEY_SLEEP
+name: SLEEP
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 0E 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 10 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 11 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 12 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 13 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 14 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 15 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 16 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 17 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 18 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 04 00 00 00
 command: 19 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 04 00 00 00
diff --git a/_CSV-IRDB_/Z/Zenith/Unknown_VCR/2_-1.ir b/_CSV-IRDB_/Z/Zenith/Unknown_VCR/2_-1.ir
index d0660e94..29faf6a3 100644
--- a/_CSV-IRDB_/Z/Zenith/Unknown_VCR/2_-1.ir
+++ b/_CSV-IRDB_/Z/Zenith/Unknown_VCR/2_-1.ir
@@ -1,121 +1,121 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 09 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 15 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 18 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 02 00 00 00
diff --git a/_CSV-IRDB_/Z/Zenith/Unknown_ZN5015/26_154.ir b/_CSV-IRDB_/Z/Zenith/Unknown_ZN5015/26_154.ir
index 86c4240c..dc786907 100644
--- a/_CSV-IRDB_/Z/Zenith/Unknown_ZN5015/26_154.ir
+++ b/_CSV-IRDB_/Z/Zenith/Unknown_ZN5015/26_154.ir
@@ -1,61 +1,61 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 00 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 01 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 02 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 03 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 04 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 05 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 07 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 08 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
@@ -67,121 +67,121 @@ protocol: NECext
 address: 1A 9A 00 00
 command: 0B 00 00 00
 #
-name: KEY_ENTER
+name: ENTER
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 0B 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 10 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 11 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 15 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 19 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 1A 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 1B 00 00 00
 #
-name: KEY_FASTFORWARD
+name: FASTFORWARD
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 1C 00 00 00
 #
-name: KEY_RECORD
+name: RECORD
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 1D 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 23 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 2B 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 2B 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 5E 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 5F 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 60 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 61 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 62 00 00 00
 #
-name: KEY_QUIT
+name: QUIT
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 63 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
 command: 6F 00 00 00
 #
-name: KEY_CLOSE
+name: CLOSE
 type: parsed
 protocol: NECext
 address: 1A 9A 00 00
diff --git a/_CSV-IRDB_/Z/Zolid/Unknown_ZOL100/0_239.ir b/_CSV-IRDB_/Z/Zolid/Unknown_ZOL100/0_239.ir
index ff9ff6ba..b003acb9 100644
--- a/_CSV-IRDB_/Z/Zolid/Unknown_ZOL100/0_239.ir
+++ b/_CSV-IRDB_/Z/Zolid/Unknown_ZOL100/0_239.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
@@ -13,85 +13,85 @@ protocol: NECext
 address: 00 EF 00 00
 command: 08 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 10 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 20 00 00 00
 #
-name: KEY_EXIT
+name: EXIT
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 28 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 30 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 40 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 48 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 50 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 60 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 68 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 70 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 80 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 88 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: 90 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
@@ -103,43 +103,43 @@ protocol: NECext
 address: 00 EF 00 00
 command: A8 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: B0 00 00 00
 #
-name: KEY_MENU
+name: MENU
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: C0 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: C8 00 00 00
 #
-name: KEY_ESC
+name: ESC
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: D0 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: E0 00 00 00
 #
-name: KEY_DVD
+name: DVD
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
 command: E8 00 00 00
 #
-name: KEY_REWIND
+name: REWIND
 type: parsed
 protocol: NECext
 address: 00 EF 00 00
diff --git a/_CSV-IRDB_/Z/Zoltrix/Unknown_Zoltrix/0_252.ir b/_CSV-IRDB_/Z/Zoltrix/Unknown_Zoltrix/0_252.ir
index 09f1de64..ec1cd8b2 100644
--- a/_CSV-IRDB_/Z/Zoltrix/Unknown_Zoltrix/0_252.ir
+++ b/_CSV-IRDB_/Z/Zoltrix/Unknown_Zoltrix/0_252.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 00 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 01 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
@@ -25,67 +25,67 @@ protocol: NECext
 address: 00 FC 00 00
 command: 03 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 04 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 05 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 06 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 07 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 08 00 00 00
 #
-name: KEY_CHANNELDOWN
+name: CHANNELDOWN
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 09 00 00 00
 #
-name: KEY_F11
+name: F11
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 0A 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 0B 00 00 00
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 0C 00 00 00
 #
-name: KEY_CHANNELUP
+name: CHANNELUP
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 0D 00 00 00
 #
-name: KEY_CYCLEWINDOWS
+name: CYCLEWINDOWS
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
@@ -97,31 +97,31 @@ protocol: NECext
 address: 00 FC 00 00
 command: 0F 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 10 00 00 00
 #
-name: KEY_RADIO
+name: RADIO
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 11 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 12 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
 command: 13 00 00 00
 #
-name: KEY_TV
+name: TV
 type: parsed
 protocol: NECext
 address: 00 FC 00 00
diff --git a/_CSV-IRDB_/Z/Zyxel/Unknown_DMA-1000/8_230.ir b/_CSV-IRDB_/Z/Zyxel/Unknown_DMA-1000/8_230.ir
index 718badc2..66bcf519 100644
--- a/_CSV-IRDB_/Z/Zyxel/Unknown_DMA-1000/8_230.ir
+++ b/_CSV-IRDB_/Z/Zyxel/Unknown_DMA-1000/8_230.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: KEY_VOLUMEDOWN
+name: VOL-
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 10 00 00 00
 #
-name: KEY_RIGHT
+name: RIGHT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -19,73 +19,73 @@ protocol: NECext
 address: 08 E6 00 00
 command: 12 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 13 00 00 00
 #
-name: KEY_UP
+name: UP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 14 00 00 00
 #
-name: KEY_OK
+name: OK
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 15 00 00 00
 #
-name: KEY_DOWN
+name: DOWN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 16 00 00 00
 #
-name: KEY_PLAY
+name: PLAY
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 17 00 00 00
 #
-name: KEY_VOLUMEUP
+name: VOL+
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 18 00 00 00
 #
-name: KEY_MUTE
+name: MUTE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 19 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1A 00 00 00
 #
-name: KEY_PREVIOUS
+name: PREVIOUS
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1B 00 00 00
 #
-name: KEY_PAGEDOWN
+name: PAGEDOWN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1C 00 00 00
 #
-name: KEY_LEFT
+name: LEFT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 1D 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -97,73 +97,73 @@ protocol: NECext
 address: 08 E6 00 00
 command: 1F 00 00 00
 #
-name: KEY_3
+name: 3
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 40 00 00 00
 #
-name: KEY_2
+name: 2
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 41 00 00 00
 #
-name: KEY_1
+name: 1
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 42 00 00 00
 #
-name: KEY_POWER
+name: POWER
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 43 00 00 00
 #
-name: KEY_6
+name: 6
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 44 00 00 00
 #
-name: KEY_5
+name: 5
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 45 00 00 00
 #
-name: KEY_4
+name: 4
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 46 00 00 00
 #
-name: KEY_HOME
+name: HOME
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 47 00 00 00
 #
-name: KEY_9
+name: 9
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 48 00 00 00
 #
-name: KEY_8
+name: 8
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 49 00 00 00
 #
-name: KEY_7
+name: 7
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4A 00 00 00
 #
-name: KEY_PAGEUP
+name: PAGEUP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -175,31 +175,31 @@ protocol: NECext
 address: 08 E6 00 00
 command: 4C 00 00 00
 #
-name: KEY_0
+name: 0
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4D 00 00 00
 #
-name: KEY_CLEAR
+name: CLEAR
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 4E 00 00 00
 #
-name: KEY_FORWARD
+name: FORWARD
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 50 00 00 00
 #
-name: KEY_SLOW
+name: SLOW
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 51 00 00 00
 #
-name: KEY_OPTION
+name: OPTION
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -211,13 +211,13 @@ protocol: NECext
 address: 08 E6 00 00
 command: 53 00 00 00
 #
-name: KEY_STOP
+name: STOP
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 54 00 00 00
 #
-name: KEY_PAUSE
+name: PAUSE
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -229,19 +229,19 @@ protocol: NECext
 address: 08 E6 00 00
 command: 56 00 00 00
 #
-name: KEY_AUDIO
+name: AUDIO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 57 00 00 00
 #
-name: KEY_BACK
+name: BACK
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 58 00 00 00
 #
-name: KEY_NEXT
+name: NEXT
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -253,19 +253,19 @@ protocol: NECext
 address: 08 E6 00 00
 command: 5A 00 00 00
 #
-name: KEY_VIDEO
+name: VIDEO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5B 00 00 00
 #
-name: KEY_AGAIN
+name: AGAIN
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
 command: 5C 00 00 00
 #
-name: KEY_INFO
+name: INFO
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
@@ -277,7 +277,7 @@ protocol: NECext
 address: 08 E6 00 00
 command: 5E 00 00 00
 #
-name: KEY_IMAGES
+name: IMAGES
 type: parsed
 protocol: NECext
 address: 08 E6 00 00
diff --git a/_IR_Plus_Converted_/A/AEG/SLS-Series.ir b/_IR_Plus_Converted_/A/AEG/SLS-Series.ir
index c4cd087f..3a16ac3f 100644
--- a/_IR_Plus_Converted_/A/AEG/SLS-Series.ir
+++ b/_IR_Plus_Converted_/A/AEG/SLS-Series.ir
@@ -34,25 +34,25 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8866 4420 572 546 546 546 572 546 572 546 546 546 572 546 572 546 572 546 546 1664 546 1664 546 1664 546 1664 546 1664 546 1638 572 546 572 1638 572 1638 572 546 572 546 546 546 572 1638 572 546 572 546 546 546 572 546 572 1638 572 1638 572 1638 572 546 546 1664 546 1664 546 1664 546 40612 8840 2210 572 40612
 #
-name: CENTER VOLUME
+name: CENTER VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8918 4446 572 546 546 546 572 546 572 546 546 546 572 546 572 546 546 572 546 1664 546 1664 546 1664 546 1638 572 1638 572 1638 572 546 572 1638 572 1638 572 546 572 1638 572 546 546 546 572 546 572 546 546 546 572 546 572 1638 572 546 546 1664 546 1664 546 1664 546 1664 546 1664 546 40820 8892 2210 572 40820
 #
-name: FRONT VOLUME
+name: FRONT VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8918 4446 546 546 572 546 572 546 546 572 546 546 572 546 572 546 546 546 572 1638 572 1638 572 1638 572 1638 572 1638 572 1638 572 546 572 1664 572 1638 572 546 546 1664 546 546 572 546 572 546 546 1664 546 546 572 546 572 1664 572 546 572 1638 572 1638 546 1664 546 572 546 1664 546 40872 8892 2210 572 40872
 #
-name: SUBWOOFER VOLUME
+name: SUBWOOFER VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8892 4446 572 546 546 546 572 546 572 546 546 546 572 546 572 546 572 546 546 1664 546 1664 546 1664 546 1664 546 1664 546 1664 546 546 572 1638 572 1638 572 546 572 1638 572 546 546 1664 546 546 572 546 572 546 546 546 572 1638 572 546 572 1638 572 546 546 1664 546 1664 546 1664 546 40690 8866 2210 546 40690
 #
-name: SURROUND VOLUME
+name: SURROUND VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/A/AIWA/RC-6VT06.ir b/_IR_Plus_Converted_/A/AIWA/RC-6VT06.ir
index 179e1227..ddfc49cc 100644
--- a/_IR_Plus_Converted_/A/AIWA/RC-6VT06.ir
+++ b/_IR_Plus_Converted_/A/AIWA/RC-6VT06.ir
@@ -124,7 +124,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9076 4461 612 1637 607 1663 581 529 608 1663 582 1661 611 1636 609 1663 586 525 608 527 609 523 584 528 609 527 609 524 584 525 611 523 614 1635 607 526 611 525 584 526 609 524 611 1634 613 1659 585 1676 608 1642 591 1665 583 1662 610 523 584 528 609 525 610 524 584 526 612 522 612 1636 610 524 611 1636 609 1662 583 1662 610 1636 609 1661 587 1661 612 522 584 1663 609
 #
-name: VOLUME
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -142,7 +142,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9052 4462 611 1637 608 1661 585 525 611 1662 583 1661 612 1637 608 1663 584 526 610 525 611 524 585 524 612 525 609 526 584 524 611 525 610 1636 609 527 611 524 584 525 609 525 610 1635 611 1680 564 1662 610 1636 610 1660 584 1663 609 1636 612 527 607 526 585 524 609 527 610 526 583 1661 613 521 584 528 610 1659 584 1663 609 1636 609 1664 583 1661 648 486 585 1663 609
 #
-name: VOLUME
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/A/AKAI/SmartTV.ir b/_IR_Plus_Converted_/A/AKAI/SmartTV.ir
index eef18f01..04f11a99 100644
--- a/_IR_Plus_Converted_/A/AKAI/SmartTV.ir
+++ b/_IR_Plus_Converted_/A/AKAI/SmartTV.ir
@@ -4,7 +4,7 @@ Version: 1
 # AKAI SmartTV
 # Autogenerated from ircodes/AKAI/SmartTV.xml
 #
-name: power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -160,13 +160,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9072 4497 605 526 605 526 605 526 605 526 605 526 605 526 605 526 605 526 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 1657 605 526 605 526 605 526 605 1657 605 526 605 526 605 1657 605 526 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 526 605 1657 605 41311 9072 4497 605 526 605 1657 605 1657 605 1657 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 526 605 1657 605 1657 605 526 605 526 605 1657 605 1657 605 526 605 1657 605 526 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 526 605 526 605 34553
 #
-name: vol+
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 9072 4497 605 526 605 526 605 526 605 526 605 526 605 526 605 526 605 526 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 1657 605 526 605 526 605 526 605 526 605 1657 605 526 605 526 605 526 605 1657 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 41311 9072 4497 605 526 605 1657 605 1657 605 1657 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 526 605 1657 605 1657 605 526 605 526 605 1657 605 1657 605 526 605 1657 605 526 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 526 605 526 605 34553
 #
-name: mute
+name: MUTE
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -178,7 +178,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9072 4497 605 526 605 526 605 526 605 526 605 526 605 526 605 526 605 526 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 526 605 526 605 526 605 526 605 1657 605 526 605 526 605 526 605 1657 605 1657 605 1657 605 1657 605 41311 9072 4497 605 526 605 1657 605 1657 605 1657 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 526 605 1657 605 1657 605 526 605 1657 605 1657 605 526 605 526 605 1657 605 1657 605 526 605 1657 605 526 605 1657 605 1657 605 526 605 1657 605 1657 605 1657 605 526 605 526 605 34553
 #
-name: vol-
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/A/ARCAM/AVR400.ir b/_IR_Plus_Converted_/A/ARCAM/AVR400.ir
index 44e3c041..637ccc86 100644
--- a/_IR_Plus_Converted_/A/ARCAM/AVR400.ir
+++ b/_IR_Plus_Converted_/A/ARCAM/AVR400.ir
@@ -4,7 +4,7 @@ Version: 1
 # ARCAM AVR400
 # Autogenerated from ircodes/ARCAM/AVR400.xml
 #
-name: On
+POWER
 protocol: RC5
 address: 14 00 00 00
 command: 7B 00 00 00
diff --git a/_IR_Plus_Converted_/A/AUVISIO/PX-1181-675.ir b/_IR_Plus_Converted_/A/AUVISIO/PX-1181-675.ir
index 90ea4f60..df8aaaf3 100644
--- a/_IR_Plus_Converted_/A/AUVISIO/PX-1181-675.ir
+++ b/_IR_Plus_Converted_/A/AUVISIO/PX-1181-675.ir
@@ -14,7 +14,7 @@ protocol: NECext
 address: 7F 80 00 00
 command: 27 D8 00 00
 #
-name: Mute
+name: MUTE
 protocol: NECext
 address: 7F 80 00 00
 command: BF 40 00 00
diff --git a/_IR_Plus_Converted_/B/BOSE/Lifestyle V35.ir b/_IR_Plus_Converted_/B/BOSE/Lifestyle V35.ir
index 5b1709af..195a89a4 100644
--- a/_IR_Plus_Converted_/B/BOSE/Lifestyle V35.ir	
+++ b/_IR_Plus_Converted_/B/BOSE/Lifestyle V35.ir	
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8854 4440 542 542 542 1678 542 542 542 1678 542 1678 542 1678 542 542 542 1678 542 1678 542 1678 542 542 542 1678 542 542 542 542 542 1678 542 542 542 542 542 542 542 1678 542 1678 542 542 542 542 542 1678 542 542 542 1678 542 1678 542 542 542 542 542 1678 542 1678 542 542 542 1678 542 4440
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/BOSE/TV1.ir b/_IR_Plus_Converted_/B/BOSE/TV1.ir
index 247fde84..0a39a676 100644
--- a/_IR_Plus_Converted_/B/BOSE/TV1.ir
+++ b/_IR_Plus_Converted_/B/BOSE/TV1.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9009 4440 542 542 542 1678 542 542 542 1678 542 1678 542 1678 542 542 542 1678 542 1678 542 1678 542 542 542 1678 542 542 542 542 542 1678 542 542 542 542 542 542 542 1678 542 1678 542 542 542 542 542 1678 542 542 542 1678 542 1678 542 542 542 542 542 1678 542 1678 542 542 542 1678 542 4440
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/BUSH/BR330DABC DAB+.ir b/_IR_Plus_Converted_/B/BUSH/BR330DABC DAB+.ir
index 8583eaf7..4be4254b 100644
--- a/_IR_Plus_Converted_/B/BUSH/BR330DABC DAB+.ir	
+++ b/_IR_Plus_Converted_/B/BUSH/BR330DABC DAB+.ir	
@@ -4,7 +4,7 @@ Version: 1
 # BUSH BR330DABC DAB+
 # Autogenerated from ircodes/BUSH/BR330DABC DAB+.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38400
 duty_cycle: 0.33
@@ -70,7 +70,7 @@ frequency: 38400
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 573 573 573 573 1694 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 573 573 1694 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 39785 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38400
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/DP-Lite i.ir b/_IR_Plus_Converted_/B/Beyonwiz/DP-Lite i.ir
index 02fc6093..5ca72c4d 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/DP-Lite i.ir	
+++ b/_IR_Plus_Converted_/B/Beyonwiz/DP-Lite i.ir	
@@ -4,13 +4,13 @@ Version: 1
 # Beyonwiz DP-Lite i
 # Autogenerated from ircodes/BEYONWIZ/DP-Lite i.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: PowerOFF
+name: POWEROFF
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -64,7 +64,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/DP-Lite.ir b/_IR_Plus_Converted_/B/Beyonwiz/DP-Lite.ir
index d70c116d..df16b62f 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/DP-Lite.ir
+++ b/_IR_Plus_Converted_/B/Beyonwiz/DP-Lite.ir
@@ -4,13 +4,13 @@ Version: 1
 # Beyonwiz DP-Lite
 # Autogenerated from ircodes/BEYONWIZ/DP-Lite.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: PowerOFF
+name: POWEROFF
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -64,7 +64,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/DP-P1.ir b/_IR_Plus_Converted_/B/Beyonwiz/DP-P1.ir
index 6c3c44af..e4e100bd 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/DP-P1.ir
+++ b/_IR_Plus_Converted_/B/Beyonwiz/DP-P1.ir
@@ -4,13 +4,13 @@ Version: 1
 # Beyonwiz DP-P1
 # Autogenerated from ircodes/BEYONWIZ/DP-P1.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: PowerOFF
+name: POWEROFF
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -64,7 +64,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/DP-P2.ir b/_IR_Plus_Converted_/B/Beyonwiz/DP-P2.ir
index 7381311a..316cd7ef 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/DP-P2.ir
+++ b/_IR_Plus_Converted_/B/Beyonwiz/DP-P2.ir
@@ -4,13 +4,13 @@ Version: 1
 # Beyonwiz DP-P2
 # Autogenerated from ircodes/BEYONWIZ/DP-P2.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 40906 9041 2267 573 96193
 #
-name: PowerOFF
+name: POWEROFF
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -64,7 +64,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 40906 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/DP-S1.ir b/_IR_Plus_Converted_/B/Beyonwiz/DP-S1.ir
index 0af1b8f3..27b0c8bf 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/DP-S1.ir
+++ b/_IR_Plus_Converted_/B/Beyonwiz/DP-S1.ir
@@ -4,13 +4,13 @@ Version: 1
 # Beyonwiz DP-S1
 # Autogenerated from ircodes/BEYONWIZ/DP-S1.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: PowerOFF
+name: POWEROFF
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -64,7 +64,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/FV-L1.ir b/_IR_Plus_Converted_/B/Beyonwiz/FV-L1.ir
index f63ee50d..d8f27a04 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/FV-L1.ir
+++ b/_IR_Plus_Converted_/B/Beyonwiz/FV-L1.ir
@@ -4,13 +4,13 @@ Version: 1
 # Beyonwiz FV-L1
 # Autogenerated from ircodes/BEYONWIZ/FV-L1.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: PowerOFF
+name: POWEROFF
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -64,7 +64,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 42026 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F2).ir b/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F2).ir
index 525def98..7c0276ca 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F2).ir	
+++ b/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F2).ir	
@@ -4,7 +4,7 @@ Version: 1
 # Beyonwiz T2-4 (0x02F2)
 # Autogenerated from ircodes/BEYONWIZ/T4-2.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -202,7 +202,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 1694 573 1694 573 573 573 1694 573 42026 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F3).ir b/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F3).ir
index f9aedc7c..26e36727 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F3).ir	
+++ b/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F3).ir	
@@ -4,7 +4,7 @@ Version: 1
 # Beyonwiz T2-4 (0x02F3)
 # Autogenerated from ircodes/BEYONWIZ/T4-3.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -202,7 +202,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 1694 573 573 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 1694 573 1694 573 573 573 1694 573 40906 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F4).ir b/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F4).ir
index d3634c8e..9ee4b345 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F4).ir	
+++ b/_IR_Plus_Converted_/B/Beyonwiz/T2-4 (0x02F4).ir	
@@ -4,7 +4,7 @@ Version: 1
 # Beyonwiz T2-4 (0x02F4)
 # Autogenerated from ircodes/BEYONWIZ/T4-4.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -202,7 +202,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 1694 573 1694 573 573 573 1694 573 42026 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/T3 (0xABCD).ir b/_IR_Plus_Converted_/B/Beyonwiz/T3 (0xABCD).ir
index a7bec32e..dd1f8728 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/T3 (0xABCD).ir	
+++ b/_IR_Plus_Converted_/B/Beyonwiz/T3 (0xABCD).ir	
@@ -4,7 +4,7 @@ Version: 1
 # Beyonwiz T3 (0xABCD)
 # Autogenerated from ircodes/BEYONWIZ/T3.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -196,7 +196,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 1694 573 1694 573 573 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 573 573 1694 573 1694 573 573 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 1694 573 1694 573 573 573 1694 573 37519 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/T3 (0xAE97).ir b/_IR_Plus_Converted_/B/Beyonwiz/T3 (0xAE97).ir
index fc253f33..ed188e00 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/T3 (0xAE97).ir	
+++ b/_IR_Plus_Converted_/B/Beyonwiz/T3 (0xAE97).ir	
@@ -4,7 +4,7 @@ Version: 1
 # Beyonwiz T3 (0xAE97)
 # Autogenerated from ircodes/BEYONWIZ/T3-A.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -196,7 +196,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 1694 573 1694 573 573 573 1694 573 37519 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/U4 (0x02F3).ir b/_IR_Plus_Converted_/B/Beyonwiz/U4 (0x02F3).ir
index df76a8a2..67c9daa2 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/U4 (0x02F3).ir	
+++ b/_IR_Plus_Converted_/B/Beyonwiz/U4 (0x02F3).ir	
@@ -4,7 +4,7 @@ Version: 1
 # Beyonwiz U4 (0x02F3)
 # Autogenerated from ircodes/BEYONWIZ/U4A.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -76,7 +76,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 1694 573 573 573 573 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 1694 573 573 573 573 573 573 573 1694 573 1694 573 573 573 1694 573 40906 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/B/Beyonwiz/U4 (0xAE97).ir b/_IR_Plus_Converted_/B/Beyonwiz/U4 (0xAE97).ir
index e0ff4efe..05169355 100644
--- a/_IR_Plus_Converted_/B/Beyonwiz/U4 (0xAE97).ir	
+++ b/_IR_Plus_Converted_/B/Beyonwiz/U4 (0xAE97).ir	
@@ -4,7 +4,7 @@ Version: 1
 # Beyonwiz U4 (0xAE97)
 # Autogenerated from ircodes/BEYONWIZ/U4.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38222
 duty_cycle: 0.33
@@ -76,7 +76,7 @@ frequency: 38222
 duty_cycle: 0.33
 data: 9041 4507 573 573 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 1694 573 573 573 573 573 573 573 1694 573 1694 573 573 573 1694 573 37519 9041 2267 573 96193
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38222
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/C/CINEMATEQ/Studio Player DVD.ir b/_IR_Plus_Converted_/C/CINEMATEQ/Studio Player DVD.ir
index 562167ba..cd5e2fc1 100644
--- a/_IR_Plus_Converted_/C/CINEMATEQ/Studio Player DVD.ir	
+++ b/_IR_Plus_Converted_/C/CINEMATEQ/Studio Player DVD.ir	
@@ -4,7 +4,7 @@ Version: 1
 # CINEMATEQ Studio Player DVD
 # Autogenerated from ircodes/CINEMATEQ/Studio Player DVD.xml
 #
-name: Power ON
+name: POWER ON
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -16,7 +16,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 253 507 253 253 507 253 253 507 507 507 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 507 507 507 253 253 507 253 89382 253 507 253 253 507 253 253 507 507 507 253 253 253 253 253 253 253 253 253 253 253 253 507 507 253 253 253 253 507 507 507 253 253 507 253 89382
 #
-name: Power OFF
+name: POWER OFF
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/C/CISCO/RNG-Series.ir b/_IR_Plus_Converted_/C/CISCO/RNG-Series.ir
index 51dc3b4e..5f19a51b 100644
--- a/_IR_Plus_Converted_/C/CISCO/RNG-Series.ir
+++ b/_IR_Plus_Converted_/C/CISCO/RNG-Series.ir
@@ -154,7 +154,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 208 912 208 1746 208 756 208 2866 208 1329 208 1329 208 1172 208 2710 208 13001 208 912 208 1459 208 756 208 756 208 1589 208 1329 208 756 208 756 208 81837 208 912 208 1746 208 756 208 2866 208 1329 208 1329 208 1172 208 2710 208 13001 208 912 208 2579 208 1876 208 756 208 1589 208 1329 208 756 208 756 208 81837
 #
-name: PIP On/Off
+name: PIP POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/D/DENON/CD-Player.ir b/_IR_Plus_Converted_/D/DENON/CD-Player.ir
index fcd020c1..57d6223d 100644
--- a/_IR_Plus_Converted_/D/DENON/CD-Player.ir
+++ b/_IR_Plus_Converted_/D/DENON/CD-Player.ir
@@ -4,7 +4,7 @@ Version: 1
 # DENON CD-Player
 # Autogenerated from ircodes/DENON (CD DVD)/CD-Player.xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/D/DENON/D-M-Series.ir b/_IR_Plus_Converted_/D/DENON/D-M-Series.ir
index 28c6ce2e..42e576f4 100644
--- a/_IR_Plus_Converted_/D/DENON/D-M-Series.ir
+++ b/_IR_Plus_Converted_/D/DENON/D-M-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 263 789 263 789 263 1841 263 1841 263 789 263 789 263 789 263 789 263 789 263 1841 263 789 263 1841 263 789 263 789 263 789 263 43572 263 789 263 789 263 1841 263 1841 263 789 263 1841 263 1841 263 1841 263 1841 263 789 263 1841 263 789 263 1841 263 1841 263 1841 263 43572
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/D/DENON/DRA.ir b/_IR_Plus_Converted_/D/DENON/DRA.ir
index a662cf89..550a3e63 100644
--- a/_IR_Plus_Converted_/D/DENON/DRA.ir
+++ b/_IR_Plus_Converted_/D/DENON/DRA.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 3459 1729 432 432 432 432 432 1297 432 432 432 1297 432 432 432 1297 432 432 432 432 432 1297 432 432 432 432 432 1297 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 1297 432 1297 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 1297 432 432 432 432 432 1297 432 432 432 432 432 74736
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/D/DENON/RC-903.ir b/_IR_Plus_Converted_/D/DENON/RC-903.ir
index fa2c11e9..b34c7e6d 100644
--- a/_IR_Plus_Converted_/D/DENON/RC-903.ir
+++ b/_IR_Plus_Converted_/D/DENON/RC-903.ir
@@ -4,7 +4,7 @@ Version: 1
 # DENON RC-903
 # Autogenerated from ircodes/DENON (AVR)/RC-903 (AVR2802 AVR982).xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/D/DIRECTV/HR44.ir b/_IR_Plus_Converted_/D/DIRECTV/HR44.ir
index e9a1a211..e7570ae5 100644
--- a/_IR_Plus_Converted_/D/DIRECTV/HR44.ir
+++ b/_IR_Plus_Converted_/D/DIRECTV/HR44.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 5966 1199 1199 1199 573 573 573 573 573 1199 573 573 573 573 573 1199 573 1199 573 29780 2970 1199 1199 1199 573 573 573 573 573 1199 573 573 573 573 573 1199 573 1199 573 29780
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/D/DISH/ViP-622.ir b/_IR_Plus_Converted_/D/DISH/ViP-622.ir
index 693abf44..68d5ddcc 100644
--- a/_IR_Plus_Converted_/D/DISH/ViP-622.ir
+++ b/_IR_Plus_Converted_/D/DISH/ViP-622.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 400 6114 400 2797 400 2797 400 2797 400 2797 400 1667 400 2797 400 1667 400 2797 400 2797 400 2797 400 2797 400 2797 400 2797 400 2797 400 2797 400 2797 400 6114
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/D/DUNE/MediaPlayer.ir b/_IR_Plus_Converted_/D/DUNE/MediaPlayer.ir
index e7239725..c184e279 100644
--- a/_IR_Plus_Converted_/D/DUNE/MediaPlayer.ir
+++ b/_IR_Plus_Converted_/D/DUNE/MediaPlayer.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8866 4420 546 1664 546 1664 546 1664 546 1664 546 1664 546 1664 546 546 546 1664 546 546 546 546 546 546 546 546 546 546 546 546 546 1664 546 546 546 1664 546 1664 546 546 546 546 546 546 546 546 546 1664 546 546 546 546 546 546 546 1664 546 1664 546 1664 546 1664 546 546 546 1664 546 39442 8866 2210 546 95030
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/D/DYNAUDIO/Xeo5.ir b/_IR_Plus_Converted_/D/DYNAUDIO/Xeo5.ir
index 3fb8c202..27fb355c 100644
--- a/_IR_Plus_Converted_/D/DYNAUDIO/Xeo5.ir
+++ b/_IR_Plus_Converted_/D/DYNAUDIO/Xeo5.ir
@@ -4,7 +4,7 @@ Version: 1
 # DYNAUDIO Xeo5
 # Autogenerated from ircodes/DYNAUDIO/Xeo5.xml
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: FF 00 00 00
diff --git a/_IR_Plus_Converted_/D/Dreambox/DM500.ir b/_IR_Plus_Converted_/D/Dreambox/DM500.ir
index d0d9c2db..99a15ee4 100644
--- a/_IR_Plus_Converted_/D/Dreambox/DM500.ir
+++ b/_IR_Plus_Converted_/D/Dreambox/DM500.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 210 763 210 2656 210 763 210 2787 210 1315 210 1315 210 894 210 2130 210 13805 210 763 210 894 210 763 210 763 210 763 210 2787 210 763 210 763 210 80413 210 763 210 2656 210 763 210 2787 210 1315 210 1315 210 894 210 2130 210 13805 210 763 210 1972 210 1841 210 763 210 763 210 2787 210 763 210 763 210 80413
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/E/ELECTROLUX/Air Conditioner.ir b/_IR_Plus_Converted_/E/ELECTROLUX/Air Conditioner.ir
index 235d187a..6c9daa86 100644
--- a/_IR_Plus_Converted_/E/ELECTROLUX/Air Conditioner.ir	
+++ b/_IR_Plus_Converted_/E/ELECTROLUX/Air Conditioner.ir	
@@ -4,13 +4,13 @@ Version: 1
 # ELECTROLUX Air Conditioner
 # Autogenerated from ircodes/ELECTROLUX/Air Conditioner.xml
 #
-name: Power On
+name: POWER On
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 9041 4507 573 1694 573 573 573 1694 573 1694 573 573 573 573 573 1694 573 573 573 573 573 1694 573 573 573 573 573 1694 573 1694 573 573 573 1694 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1694 573 573 573 1694 573 1694 573 1694 573 1694 573 1694 573 1694 573 12689
 #
-name: Power Off
+name: POWER Off
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/E/EMOTIVA/UMC-200.ir b/_IR_Plus_Converted_/E/EMOTIVA/UMC-200.ir
index e5cb75a6..4e035a26 100644
--- a/_IR_Plus_Converted_/E/EMOTIVA/UMC-200.ir
+++ b/_IR_Plus_Converted_/E/EMOTIVA/UMC-200.ir
@@ -10,7 +10,7 @@ frequency: 38028
 duty_cycle: 0.33
 data: 8993 4497 579 552 579 552 579 552 579 552 579 552 579 1683 579 552 579 552 579 1683 579 1683 579 1683 579 1683 579 1683 579 552 579 1683 579 552 579 552 579 1683 579 552 579 552 579 552 579 552 579 552 579 552 579 1683 579 552 579 1683 579 1683 579 1683 579 1683 579 1683 579 1683 579 41179 8993 2235 579 96663
 #
-name: ON
+POWER
 type: raw
 frequency: 38028
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/E/EPSON/EB-485W.ir b/_IR_Plus_Converted_/E/EPSON/EB-485W.ir
index ea5ad78a..cd2cb51d 100644
--- a/_IR_Plus_Converted_/E/EPSON/EB-485W.ir
+++ b/_IR_Plus_Converted_/E/EPSON/EB-485W.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9019 4497 579 1709 579 1709 579 579 579 579 579 579 579 579 579 579 579 1709 579 1709 579 579 579 1709 579 579 579 1709 579 579 579 1709 579 579 579 579 579 579 579 579 579 579 579 1709 579 579 579 579 579 1709 579 1709 579 1709 579 1709 579 1709 579 579 579 1709 579 1709 579 579 579 40653
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/F/FANZTEC/GLIDE.ir b/_IR_Plus_Converted_/F/FANZTEC/GLIDE.ir
index 612473ec..46917ff5 100644
--- a/_IR_Plus_Converted_/F/FANZTEC/GLIDE.ir
+++ b/_IR_Plus_Converted_/F/FANZTEC/GLIDE.ir
@@ -58,7 +58,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9004 4486 561 1691 561 566 561 566 561 566 561 566 561 566 561 1691 561 566 561 1691 561 566 561 566 561 1691 561 1691 561 566 561 1691 561 566 561 1691 561 566 561 566 561 566 561 566 561 566 561 1691 561 566 561 566 561 1691 561 1691 561 1691 561 1691 561 1691 561 566 561 1691 563 41821 9004 4486 561 566 561 1691 561 1691 561 1691 561 1691 561 1691 561 1691 561 566 561 1691 561 1691 561 1691 561 566 561 566 561 566 561 1691 561 1691 561 1691 561 566 561 566 561 1691 561 1691 561 1691 561 566 561 566 561 1691 561 1691 561 1691 561 1691 561 1691 561 1691 561 566 561 566 563
 #
-name: LED ON/OFF Colour
+name: LED POWER Colour
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/H/HARMAN HARDON/SB-Soundbar.ir b/_IR_Plus_Converted_/H/HARMAN HARDON/SB-Soundbar.ir
index 9f4c0258..43532bd9 100644
--- a/_IR_Plus_Converted_/H/HARMAN HARDON/SB-Soundbar.ir	
+++ b/_IR_Plus_Converted_/H/HARMAN HARDON/SB-Soundbar.ir	
@@ -29,7 +29,7 @@ protocol: NECext
 address: 0E 01 00 00
 command: 1C E3 00 00
 #
-name: DOLBY VOLUME
+name: DOLBY VOL+
 protocol: NECext
 address: 0E 01 00 00
 command: 0A F5 00 00
diff --git a/_IR_Plus_Converted_/H/HARMAN KARDON/AVR.ir b/_IR_Plus_Converted_/H/HARMAN KARDON/AVR.ir
index b2c7c2c1..6b543485 100644
--- a/_IR_Plus_Converted_/H/HARMAN KARDON/AVR.ir	
+++ b/_IR_Plus_Converted_/H/HARMAN KARDON/AVR.ir	
@@ -208,7 +208,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8967 4470 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 1683 552 552 552 552 552 1683 552 552 552 552 552 1683 552 552 552 552 552 39891 8967 2235 552 96111
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/H/HARMAN KARDON/AVR80.ir b/_IR_Plus_Converted_/H/HARMAN KARDON/AVR80.ir
index c1f2eaf4..8a049215 100644
--- a/_IR_Plus_Converted_/H/HARMAN KARDON/AVR80.ir	
+++ b/_IR_Plus_Converted_/H/HARMAN KARDON/AVR80.ir	
@@ -10,7 +10,7 @@ frequency: 36044
 duty_cycle: 0.33
 data: 888 888 888 888 888 888 1803 832 888 888 888 888 888 4439 888 888 888 1803 888 888 1803 832 888 888 888 888 888 888 888 888 888 1803 1803 76239
 #
-name: ON
+POWER
 type: raw
 frequency: 36044
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/H/HARMAN KARDON/DVD22.ir b/_IR_Plus_Converted_/H/HARMAN KARDON/DVD22.ir
index bbd1d902..a379e623 100644
--- a/_IR_Plus_Converted_/H/HARMAN KARDON/DVD22.ir	
+++ b/_IR_Plus_Converted_/H/HARMAN KARDON/DVD22.ir	
@@ -4,7 +4,7 @@ Version: 1
 # HARMAN KARDON DVD22
 # Autogenerated from ircodes/HARMAN KARDON/DVD22.xml
 #
-name: ON
+POWER
 protocol: NECext
 address: 4E 41 00 00
 command: 7B 84 00 00
diff --git a/_IR_Plus_Converted_/H/HARMAN KARDON/HK3390.ir b/_IR_Plus_Converted_/H/HARMAN KARDON/HK3390.ir
index 19785174..831a5dd0 100644
--- a/_IR_Plus_Converted_/H/HARMAN KARDON/HK3390.ir	
+++ b/_IR_Plus_Converted_/H/HARMAN KARDON/HK3390.ir	
@@ -4,7 +4,7 @@ Version: 1
 # HARMAN KARDON HK3390
 # Autogenerated from ircodes/HARMAN KARDON/HK3390.xml
 #
-name: ON
+POWER
 protocol: NECext
 address: 6E 61 00 00
 command: FD 02 00 00
diff --git a/_IR_Plus_Converted_/H/HARMAN KARDON/HK3550.ir b/_IR_Plus_Converted_/H/HARMAN KARDON/HK3550.ir
index 367957b9..37b559eb 100644
--- a/_IR_Plus_Converted_/H/HARMAN KARDON/HK3550.ir	
+++ b/_IR_Plus_Converted_/H/HARMAN KARDON/HK3550.ir	
@@ -4,7 +4,7 @@ Version: 1
 # HARMAN KARDON HK3550
 # Autogenerated from ircodes/HARMAN KARDON/HK3550.xml
 #
-name: ON
+POWER
 protocol: NECext
 address: 0E 01 00 00
 command: FC 03 00 00
diff --git a/_IR_Plus_Converted_/H/HITACHI/Projector.ir b/_IR_Plus_Converted_/H/HITACHI/Projector.ir
index 403656ec..1890dd10 100644
--- a/_IR_Plus_Converted_/H/HITACHI/Projector.ir
+++ b/_IR_Plus_Converted_/H/HITACHI/Projector.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8866 4420 546 1664 546 1664 546 1664 546 546 546 546 546 546 546 546 546 1664 546 1664 546 546 546 1664 546 546 546 546 546 546 546 1664 546 546 546 1664 546 1664 546 1664 546 546 546 1664 546 546 546 546 546 546 546 546 546 546 546 546 546 1664 546 546 546 1664 546 1664 546 1664 546 39442 8866 2210 546 95030
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -172,7 +172,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8866 4420 546 1664 546 1664 546 1664 546 546 546 546 546 546 546 546 546 1664 546 1664 546 546 546 1664 546 546 546 546 546 546 546 1664 546 546 546 1664 546 546 546 546 546 546 546 1664 546 546 546 1664 546 1664 546 546 546 1664 546 1664 546 1664 546 546 546 1664 546 546 546 546 546 39442 8866 2210 546 95030
 #
-name: VOLUME
+name: VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/J/JBL/SDP-3.ir b/_IR_Plus_Converted_/J/JBL/SDP-3.ir
index b9bb3171..1887408c 100644
--- a/_IR_Plus_Converted_/J/JBL/SDP-3.ir
+++ b/_IR_Plus_Converted_/J/JBL/SDP-3.ir
@@ -22,7 +22,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8941 4444 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 43178 8941 2235 552 95480
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/J/JVC/RM-C14G.ir b/_IR_Plus_Converted_/J/JVC/RM-C14G.ir
index d29a78e2..eb400fec 100644
--- a/_IR_Plus_Converted_/J/JVC/RM-C14G.ir
+++ b/_IR_Plus_Converted_/J/JVC/RM-C14G.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8400 4200 525 1575 525 1575 525 525 525 525 525 525 525 525 525 525 525 525 525 1575 525 1575 525 1575 525 525 525 1575 525 525 525 525 525 525 525
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/K/KENWOOD/KDC-Series.ir b/_IR_Plus_Converted_/K/KENWOOD/KDC-Series.ir
index 6d522b60..bd7b43e6 100644
--- a/_IR_Plus_Converted_/K/KENWOOD/KDC-Series.ir
+++ b/_IR_Plus_Converted_/K/KENWOOD/KDC-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8941 4470 579 552 579 1657 579 1657 579 552 552 1683 552 1683 552 552 579 1657 579 1657 579 552 579 552 552 1683 552 552 579 552 579 1657 579 552 552 1683 552 552 579 552 579 552 579 1657 579 552 552 552 579 1657 579 552 579 1657 579 1657 579 1657 579 552 552 1683 552 1683 552 552 579 39838 8967 2235 552 96479 8967 2235 579 4497
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/K/KENWOOD/KVR-SERIES.ir b/_IR_Plus_Converted_/K/KENWOOD/KVR-SERIES.ir
index 4052a5a9..2fad12ec 100644
--- a/_IR_Plus_Converted_/K/KENWOOD/KVR-SERIES.ir
+++ b/_IR_Plus_Converted_/K/KENWOOD/KVR-SERIES.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9113 4392 710 472 662 496 662 475 707 1577 695 1569 686 1577 686 475 683 1576 687 1579 662 1601 686 1552 712 472 681 455 683 470 689 1573 687 473 684 1577 711 472 652 1612 687 1578 686 1576 686 472 689 469 688 1576 685 470 686 1576 687 450 714 465 687 470 686 1577 686 1557 684 475 707
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/K/KENWOOD/RC-F0320E.ir b/_IR_Plus_Converted_/K/KENWOOD/RC-F0320E.ir
index 162537a5..816e19b1 100644
--- a/_IR_Plus_Converted_/K/KENWOOD/RC-F0320E.ir
+++ b/_IR_Plus_Converted_/K/KENWOOD/RC-F0320E.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: FE 00 00 00
 command: 5D A2 00 00
 #
-name: TIMER ON/OFF
+name: TIMER POWER
 protocol: NECext
 address: FE 00 00 00
 command: 65 9A 00 00
diff --git a/_IR_Plus_Converted_/L/LED/Candles.ir b/_IR_Plus_Converted_/L/LED/Candles.ir
index f9c116a0..0e14f138 100644
--- a/_IR_Plus_Converted_/L/LED/Candles.ir
+++ b/_IR_Plus_Converted_/L/LED/Candles.ir
@@ -4,7 +4,7 @@ Version: 1
 # LED Candles
 # Autogenerated from ircodes/LED Lights (Group)/LED Candles (Kerzen).xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/L/LED/LED-Tea-Light.ir b/_IR_Plus_Converted_/L/LED/LED-Tea-Light.ir
index f9ab81dd..0e57d878 100644
--- a/_IR_Plus_Converted_/L/LED/LED-Tea-Light.ir
+++ b/_IR_Plus_Converted_/L/LED/LED-Tea-Light.ir
@@ -4,7 +4,7 @@ Version: 1
 # LED LED-Tea-Light
 # Autogenerated from ircodes/LED Lights (Group)/Tea-Light LED.xml
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: FF 00 00 00
diff --git a/_IR_Plus_Converted_/L/LED/Various.ir b/_IR_Plus_Converted_/L/LED/Various.ir
index 6895a40e..a9ae10ce 100644
--- a/_IR_Plus_Converted_/L/LED/Various.ir
+++ b/_IR_Plus_Converted_/L/LED/Various.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: FF 00 00 00
 command: 07 F8 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: 4F B0 00 00
diff --git a/_IR_Plus_Converted_/L/LED/X-Mas LED Cluster Lights.ir b/_IR_Plus_Converted_/L/LED/X-Mas LED Cluster Lights.ir
index 9cbf55ae..21ee9c7f 100644
--- a/_IR_Plus_Converted_/L/LED/X-Mas LED Cluster Lights.ir	
+++ b/_IR_Plus_Converted_/L/LED/X-Mas LED Cluster Lights.ir	
@@ -4,7 +4,7 @@ Version: 1
 # LED X-Mas LED Cluster Lights
 # Autogenerated from ircodes/LED Lights (Group)/X-Mas LED Cluster Lights AX8.xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/L/LED/X-Mas Tree.ir b/_IR_Plus_Converted_/L/LED/X-Mas Tree.ir
index e44393fb..3dfdc0f0 100644
--- a/_IR_Plus_Converted_/L/LED/X-Mas Tree.ir	
+++ b/_IR_Plus_Converted_/L/LED/X-Mas Tree.ir	
@@ -4,7 +4,7 @@ Version: 1
 # LED X-Mas Tree
 # Autogenerated from ircodes/LED Lights (Group)/X-Mas Tree Bulbs.xml
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: 5D A2 00 00
diff --git a/_IR_Plus_Converted_/L/LEXMAN/LED.ir b/_IR_Plus_Converted_/L/LEXMAN/LED.ir
index f6cacd31..701eab68 100644
--- a/_IR_Plus_Converted_/L/LEXMAN/LED.ir
+++ b/_IR_Plus_Converted_/L/LEXMAN/LED.ir
@@ -9,7 +9,7 @@ protocol: NECext
 address: FF 00 00 00
 command: 87 78 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: 07 F8 00 00
diff --git a/_IR_Plus_Converted_/L/LG/LFA-Serie.ir b/_IR_Plus_Converted_/L/LG/LFA-Serie.ir
index bbc2fc07..939e88f4 100644
--- a/_IR_Plus_Converted_/L/LG/LFA-Serie.ir
+++ b/_IR_Plus_Converted_/L/LG/LFA-Serie.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8967 4470 552 552 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 552 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 39891 8967 2235 552 96111
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/L/LILUCO/LED.ir b/_IR_Plus_Converted_/L/LILUCO/LED.ir
index ed9dafb8..62265a5d 100644
--- a/_IR_Plus_Converted_/L/LILUCO/LED.ir
+++ b/_IR_Plus_Converted_/L/LILUCO/LED.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: F7 00 00 00
 command: BF 40 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: F7 00 00 00
 command: 3F C0 00 00
diff --git a/_IR_Plus_Converted_/L/LIVARNO/LED COLOUR EFFECT LAMP.ir b/_IR_Plus_Converted_/L/LIVARNO/LED COLOUR EFFECT LAMP.ir
index fc096d41..4661bdea 100644
--- a/_IR_Plus_Converted_/L/LIVARNO/LED COLOUR EFFECT LAMP.ir	
+++ b/_IR_Plus_Converted_/L/LIVARNO/LED COLOUR EFFECT LAMP.ir	
@@ -19,7 +19,7 @@ protocol: NECext
 address: FF 00 00 00
 command: 07 F8 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: 4F B0 00 00
diff --git a/_IR_Plus_Converted_/L/LIVARNO/LuxLedRopeLight.ir b/_IR_Plus_Converted_/L/LIVARNO/LuxLedRopeLight.ir
index 7e7c0cb4..4341d81b 100644
--- a/_IR_Plus_Converted_/L/LIVARNO/LuxLedRopeLight.ir
+++ b/_IR_Plus_Converted_/L/LIVARNO/LuxLedRopeLight.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: FF 00 00 00
 command: BE 41 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: 3E C1 00 00
diff --git a/_IR_Plus_Converted_/L/LOGITECH/SqueezeboxTouch.ir b/_IR_Plus_Converted_/L/LOGITECH/SqueezeboxTouch.ir
index 2aa49d56..dd6d8edc 100644
--- a/_IR_Plus_Converted_/L/LOGITECH/SqueezeboxTouch.ir
+++ b/_IR_Plus_Converted_/L/LOGITECH/SqueezeboxTouch.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: 89 76 00 00
 command: DD 22 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: 89 76 00 00
 command: 70 8F 00 00
diff --git a/_IR_Plus_Converted_/L/LUTRON/MaestroDimmer.ir b/_IR_Plus_Converted_/L/LUTRON/MaestroDimmer.ir
index e58cbbea..06b3400e 100644
--- a/_IR_Plus_Converted_/L/LUTRON/MaestroDimmer.ir
+++ b/_IR_Plus_Converted_/L/LUTRON/MaestroDimmer.ir
@@ -4,7 +4,7 @@ Version: 1
 # Lutron MaestroDimmer
 # Autogenerated from ircodes/LUTRON/MaestroDimmer.xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/M/MAGICLIGHTING/RGB-LED.ir b/_IR_Plus_Converted_/M/MAGICLIGHTING/RGB-LED.ir
index 58cbf56d..8f34b343 100644
--- a/_IR_Plus_Converted_/M/MAGICLIGHTING/RGB-LED.ir
+++ b/_IR_Plus_Converted_/M/MAGICLIGHTING/RGB-LED.ir
@@ -22,7 +22,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9066 4474 618 516 592 545 593 521 617 526 585 541 595 519 623 509 595 544 594 1657 590 1661 619 1656 595 1662 590 1662 617 1658 594 1658 591 1661 623 514 589 1663 621 1653 596 521 618 514 590 548 593 525 612 515 593 1658 624 516 590 542 600 1654 592 1666 612 1659 594 1658 589 1663 622 40130 9073 2217 592
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/M/MARANTZ/SR-7000.ir b/_IR_Plus_Converted_/M/MARANTZ/SR-7000.ir
index 8a1abe73..dddef3ae 100644
--- a/_IR_Plus_Converted_/M/MARANTZ/SR-7000.ir
+++ b/_IR_Plus_Converted_/M/MARANTZ/SR-7000.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 888 888 90526
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/M/MEDION/MD81733.ir b/_IR_Plus_Converted_/M/MEDION/MD81733.ir
index d8a507ca..cdeb0f27 100644
--- a/_IR_Plus_Converted_/M/MEDION/MD81733.ir
+++ b/_IR_Plus_Converted_/M/MEDION/MD81733.ir
@@ -9,7 +9,7 @@ protocol: NECext
 address: B4 B4 00 00
 command: F3 0C 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: B4 B4 00 00
 command: 51 AE 00 00
diff --git a/_IR_Plus_Converted_/M/MICROSOFT/XBOX360.ir b/_IR_Plus_Converted_/M/MICROSOFT/XBOX360.ir
index 96971912..68f46fdf 100644
--- a/_IR_Plus_Converted_/M/MICROSOFT/XBOX360.ir
+++ b/_IR_Plus_Converted_/M/MICROSOFT/XBOX360.ir
@@ -82,7 +82,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2663 888 444 444 444 444 444 888 444 888 1332 888 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 444 444 444 444 888 888 444 444 444 444 888 888 888 444 444 444 444 444 444 444 444 444 444 888 888 888 444 444 69136
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -238,13 +238,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2663 888 444 444 444 444 444 888 444 888 1332 888 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 444 444 444 444 888 888 444 444 444 444 888 888 888 444 444 444 444 444 444 444 444 888 444 444 444 444 444 444 444 444 69136
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 2663 888 444 444 444 444 444 888 444 888 1332 888 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 444 444 444 444 888 888 444 444 444 444 888 888 888 444 444 444 444 444 444 888 888 888 888 444 444 888 69136
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/M/Mitsubishi/HD1000.ir b/_IR_Plus_Converted_/M/Mitsubishi/HD1000.ir
index c0443f77..f14e0509 100644
--- a/_IR_Plus_Converted_/M/Mitsubishi/HD1000.ir
+++ b/_IR_Plus_Converted_/M/Mitsubishi/HD1000.ir
@@ -4,7 +4,7 @@ Version: 1
 # MITSUBISHI HD1000
 # Autogenerated from ircodes/MITSUBISHI/HD1000.xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/M/Mitsubishi/TV-71-66.ir b/_IR_Plus_Converted_/M/Mitsubishi/TV-71-66.ir
index e4b34435..7ba87a27 100644
--- a/_IR_Plus_Converted_/M/Mitsubishi/TV-71-66.ir
+++ b/_IR_Plus_Converted_/M/Mitsubishi/TV-71-66.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 304 2128 304 2128 304 2128 304 912 304 912 304 912 304 2128 304 912 304 912 304 2128 304 912 304 912 304 912 304 912 304 912 304 912 304 28452
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/N/NAIM/Preamplifier.ir b/_IR_Plus_Converted_/N/NAIM/Preamplifier.ir
index 3fb219ff..245f1751 100644
--- a/_IR_Plus_Converted_/N/NAIM/Preamplifier.ir
+++ b/_IR_Plus_Converted_/N/NAIM/Preamplifier.ir
@@ -44,7 +44,7 @@ protocol: RC5
 address: 14 00 00 00
 command: 1A 00 00 00
 #
-name: Display Toggle On/Off
+name: Display Toggle POWER
 protocol: RC5
 address: 14 00 00 00
 command: 0F 00 00 00
diff --git a/_IR_Plus_Converted_/N/NEC/RD-427E.ir b/_IR_Plus_Converted_/N/NEC/RD-427E.ir
index 6e04e78e..c0b68c0c 100644
--- a/_IR_Plus_Converted_/N/NEC/RD-427E.ir
+++ b/_IR_Plus_Converted_/N/NEC/RD-427E.ir
@@ -4,7 +4,7 @@ Version: 1
 # NEC RD-427E
 # Autogenerated from ircodes/NEC/RD-427E.xml
 #
-name: ON
+POWER
 protocol: NECext
 address: 97 18 00 00
 command: EF 10 00 00
@@ -14,7 +14,7 @@ protocol: NECext
 address: 97 18 00 00
 command: D7 28 00 00
 #
-name: Pic-Mute
+name: Pic-MUTE
 protocol: NECext
 address: 97 18 00 00
 command: 1D E2 00 00
diff --git a/_IR_Plus_Converted_/O/ODYS/TERRA.ir b/_IR_Plus_Converted_/O/ODYS/TERRA.ir
index fec94110..d58381f1 100644
--- a/_IR_Plus_Converted_/O/ODYS/TERRA.ir
+++ b/_IR_Plus_Converted_/O/ODYS/TERRA.ir
@@ -14,7 +14,7 @@ protocol: NECext
 address: EF 10 00 00
 command: ED 12 00 00
 #
-name: Mute
+name: MUTE
 protocol: NECext
 address: EF 10 00 00
 command: 7F 80 00 00
diff --git a/_IR_Plus_Converted_/O/OK/OPD 220.ir b/_IR_Plus_Converted_/O/OK/OPD 220.ir
index 67e4a9d1..cfa1febb 100644
--- a/_IR_Plus_Converted_/O/OK/OPD 220.ir	
+++ b/_IR_Plus_Converted_/O/OK/OPD 220.ir	
@@ -9,7 +9,7 @@ protocol: NECext
 address: FE 01 00 00
 command: 3F C0 00 00
 #
-name: Mute
+name: MUTE
 protocol: NECext
 address: FE 01 00 00
 command: C5 3A 00 00
diff --git a/_IR_Plus_Converted_/O/ONKYO/A-Serie.ir b/_IR_Plus_Converted_/O/ONKYO/A-Serie.ir
index 68031588..92c4f2f8 100644
--- a/_IR_Plus_Converted_/O/ONKYO/A-Serie.ir
+++ b/_IR_Plus_Converted_/O/ONKYO/A-Serie.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 579 579 579 1683 579 579 579 579 579 1657 579 579 579 1683 579 1683 579 579 579 579 579 1657 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 579 579 1657 579 579 579 579 579 1683 579 1683 579 579 579 579 579 1657 579 579 579 1683 579 1683 579 579 579 579 579 42389 8993 2235 579 96059
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/O/ONKYO/DV-BD606.ir b/_IR_Plus_Converted_/O/ONKYO/DV-BD606.ir
index 046636e6..0fc0b306 100644
--- a/_IR_Plus_Converted_/O/ONKYO/DV-BD606.ir
+++ b/_IR_Plus_Converted_/O/ONKYO/DV-BD606.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 573 547 573 547 573 547 573 834 46273 8911 2241 834 95568
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/O/ONKYO/RC-710M.ir b/_IR_Plus_Converted_/O/ONKYO/RC-710M.ir
index 3f8c89c9..d0e53c90 100644
--- a/_IR_Plus_Converted_/O/ONKYO/RC-710M.ir
+++ b/_IR_Plus_Converted_/O/ONKYO/RC-710M.ir
@@ -9,7 +9,7 @@ protocol: NECext
 address: 36 4B 00 00
 command: 2C D3 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: B6 4B 00 00
 command: DF 20 00 00
diff --git a/_IR_Plus_Converted_/O/ONKYO/TX-NR616-EASY.ir b/_IR_Plus_Converted_/O/ONKYO/TX-NR616-EASY.ir
index a6290915..35d4b54a 100644
--- a/_IR_Plus_Converted_/O/ONKYO/TX-NR616-EASY.ir
+++ b/_IR_Plus_Converted_/O/ONKYO/TX-NR616-EASY.ir
@@ -4,7 +4,7 @@ Version: 1
 # ONKYO TX-NR616-EASY
 # Autogenerated from ircodes/ONKYO/TX-NR616-EASY.xml
 #
-name: Standby/On (toggle)
+name: POWER (toggle)
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/O/ONKYO/TX-NR636.ir b/_IR_Plus_Converted_/O/ONKYO/TX-NR636.ir
index 7a2ead92..817f6f5c 100644
--- a/_IR_Plus_Converted_/O/ONKYO/TX-NR636.ir
+++ b/_IR_Plus_Converted_/O/ONKYO/TX-NR636.ir
@@ -10,13 +10,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 40127 8993 2235 552 96111
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 1657 552 1657 552 1657 552 39023 8993 2235 552 96111
 #
-name: Standby/On (toggle)
+name: POWER (toggle)
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -58,7 +58,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 1694 547 1694 547 573 547 573 547 573 547 1694 547 1694 547 1694 547 573 547 573 834 38430 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -490,7 +490,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 1694 547 573 834 40671 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -508,7 +508,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 573 834 40671 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -742,7 +742,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 573 547 573 547 573 547 1694 547 573 547 573 547 573 547 1694 834 44032 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/O/ONKYO/TX-NR717.ir b/_IR_Plus_Converted_/O/ONKYO/TX-NR717.ir
index 41f8d4b8..f9998771 100644
--- a/_IR_Plus_Converted_/O/ONKYO/TX-NR717.ir
+++ b/_IR_Plus_Converted_/O/ONKYO/TX-NR717.ir
@@ -10,13 +10,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 40127 8993 2235 552 96111
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 1657 552 1657 552 1657 552 39023 8993 2235 552 96111
 #
-name: Standby/On (toggle)
+name: POWER (toggle)
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -490,7 +490,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 1694 547 573 834 40671 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -862,7 +862,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 573 547 573 547 573 547 1694 834 41792 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -898,7 +898,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 1694 834 42912 8911 2241 834 95568
 #
-name: Dynamic Volume
+name: Dynamic VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -910,7 +910,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 573 547 573 547 573 547 1694 547 573 547 573 547 573 547 1694 834 44032 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/O/ONKYO/TX-SR608.ir b/_IR_Plus_Converted_/O/ONKYO/TX-SR608.ir
index 3ab08531..753124a7 100644
--- a/_IR_Plus_Converted_/O/ONKYO/TX-SR608.ir
+++ b/_IR_Plus_Converted_/O/ONKYO/TX-SR608.ir
@@ -10,13 +10,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 40127 8993 2235 552 96111
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 1657 552 1657 552 1657 552 39023 8993 2235 552 96111
 #
-name: Standby/On (toggle)
+name: POWER (toggle)
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -40,19 +40,19 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 552 552 1657 552 552 552 552 552 552 552 552 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 1657 552 1657 552 1657 552 39023 8993 2235 552 96111
 #
-name: Speaker A On/Off (toggle)
+name: Speaker A POWER (toggle)
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 39023 8993 2235 552 96111
 #
-name: Speaker B On/Off (toggle)
+name: Speaker B POWER (toggle)
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 552 552 1657 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 39023 8993 2235 552 96111
 #
-name: Speaker A/B On/Off (toggle)
+name: Speaker A/B POWER (toggle)
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -1336,7 +1336,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 573 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 1694 834 41792 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -1354,7 +1354,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 573 547 573 547 573 547 1694 834 41792 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -1390,7 +1390,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 1694 834 42912 8911 2241 834 95568
 #
-name: Dynamic Volume
+name: Dynamic VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -1420,7 +1420,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 573 547 573 547 573 547 1694 547 1694 547 573 547 573 547 1694 834 42912 8911 2241 834 95568
 #
-name: Dolby Volume
+name: Dolby VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -1432,13 +1432,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 573 547 573 547 573 547 1694 547 573 547 573 547 573 547 1694 834 44032 8911 2241 834 95568
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 8911 4481 547 573 547 1694 547 573 547 573 547 1694 547 573 547 1694 547 1694 547 573 547 1694 547 1694 547 1694 547 1694 547 573 547 573 547 573 547 573 547 573 547 573 547 573 547 1694 547 573 547 1694 547 573 547 1694 547 573 547 573 547 1694 547 573 547 573 547 573 547 1694 834 42912 8911 2241 834 95568
 #
-name: Dolby Volume
+name: Dolby VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/O/OPPO/DV980H.ir b/_IR_Plus_Converted_/O/OPPO/DV980H.ir
index 9036ec5c..57e04251 100644
--- a/_IR_Plus_Converted_/O/OPPO/DV980H.ir
+++ b/_IR_Plus_Converted_/O/OPPO/DV980H.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 1683 552 552 552 552 552 1683 552 552 552 552 552 1683 552 552 552 552 552 1683 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 552 552 552 552 552 552 1683 552 552 552 1683 552 552 552 552 552 1683 552 1683 552 1683 552 43993 9019 2261 552 98136
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/O/OPTOMA/HD-Series.ir b/_IR_Plus_Converted_/O/OPTOMA/HD-Series.ir
index 2691fb1b..7e802475 100644
--- a/_IR_Plus_Converted_/O/OPTOMA/HD-Series.ir
+++ b/_IR_Plus_Converted_/O/OPTOMA/HD-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8892 4472 546 546 572 1638 572 546 572 546 546 1664 546 1664 546 546 572 546 572 1638 572 546 546 1664 546 1664 546 546 572 546 572 1638 572 1638 572 1638 572 546 546 546 572 546 572 546 572 546 546 546 572 1638 572 546 572 1638 572 1638 572 1638 572 1638 572 1638 572 1638 572 546 546 39754 8892 2210 572 39754
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PANASONIC/DMR-BS.ir b/_IR_Plus_Converted_/P/PANASONIC/DMR-BS.ir
index 9603916a..411aaa47 100644
--- a/_IR_Plus_Converted_/P/PANASONIC/DMR-BS.ir
+++ b/_IR_Plus_Converted_/P/PANASONIC/DMR-BS.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 1297 432 1297 432 1297 432 432 432 432 432 1297 432 432 432 1297 432 1297 432 432 432 432 432 432 432 1297 432 74736
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PANASONIC/PTAE-Series.ir b/_IR_Plus_Converted_/P/PANASONIC/PTAE-Series.ir
index e3f71850..6ed19d25 100644
--- a/_IR_Plus_Converted_/P/PANASONIC/PTAE-Series.ir
+++ b/_IR_Plus_Converted_/P/PANASONIC/PTAE-Series.ir
@@ -226,7 +226,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 3546 1625 541 324 541 1193 540 325 541 323 539 312 547 324 537 323 541 310 554 341 530 324 535 327 540 333 527 324 535 1204 540 332 539 322 541 303 560 331 556 310 535 327 531 338 539 326 536 327 550 1183 537 326 539 327 545 326 539 1193 539 326 541 324 540 1193 539 326 539 326 539 327 540 326 539 326 540 326 539 327 539 326 539 322 539 1198 540 1193 539 1193 539 1192 540 1206 527 1193 535 327 550 319 534 1197 541 1190 539 1193 539 326 543 1188 551 1181 542 1192 529 1208 539 322 3550 1643 527 323 535 1186 546 326 543 326 540 327 539 326 539 322 541 325 543 326 539 326 539 327 535 327 527 331 538 1192 552 326 540 324 539 326 540 304 549 338 528 326 540 323 540 326 539 332 539 1188 570 335 507 327 535 328 539 1188 569 310 560 321 538 1167 535 331 535 340 510 342 540 315 399
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PANASONIC/Plasma TV.ir b/_IR_Plus_Converted_/P/PANASONIC/Plasma TV.ir
index 5ae32dfc..9f7fd8fd 100644
--- a/_IR_Plus_Converted_/P/PANASONIC/Plasma TV.ir	
+++ b/_IR_Plus_Converted_/P/PANASONIC/Plasma TV.ir	
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 3489 1745 436 436 436 1336 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 1336 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 1336 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 436 1336 436 436 436 1336 436 1336 436 1336 436 1336 436 436 436 436 436 1336 436 436 436 1336 436 1336 436 1336 436 1336 436 436 436 1336 436 74095
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PANASONIC/RAK-SC307WM.ir b/_IR_Plus_Converted_/P/PANASONIC/RAK-SC307WM.ir
index 9fa4084b..8646e34d 100644
--- a/_IR_Plus_Converted_/P/PANASONIC/RAK-SC307WM.ir
+++ b/_IR_Plus_Converted_/P/PANASONIC/RAK-SC307WM.ir
@@ -4,7 +4,7 @@ Version: 1
 # PANASONIC RAK-SC307WM
 # Autogenerated from ircodes/PANASONIC (Various & Legacy)/RAK-SC307WM.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PARASOUND/Halo-Int.ir b/_IR_Plus_Converted_/P/PARASOUND/Halo-Int.ir
index 2471e916..ed6049a3 100644
--- a/_IR_Plus_Converted_/P/PARASOUND/Halo-Int.ir
+++ b/_IR_Plus_Converted_/P/PARASOUND/Halo-Int.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8996 4511 531 1698 531 1698 531 1698 531 531 531 531 531 531 531 531 531 531 531 531 531 1698 531 1698 531 531 531 1698 531 1698 531 1698 531 1698 531 1698 531 531 531 531 531 531 531 531 531 531 531 531 531 531 531 531 531 1698 531 1698 531 1698 531 1698 531 1698 531 1698 531 1698 531 38956 8996 2256 531 96303
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PHILIPS/FR-Series.ir b/_IR_Plus_Converted_/P/PHILIPS/FR-Series.ir
index 8d1d815f..e496822c 100644
--- a/_IR_Plus_Converted_/P/PHILIPS/FR-Series.ir
+++ b/_IR_Plus_Converted_/P/PHILIPS/FR-Series.ir
@@ -220,7 +220,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 1776 1776 888 89888
 #
-name: MODE SURROUND ON/OFF
+name: MODE SURROUND POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PIONEER/BDP-05FD.ir b/_IR_Plus_Converted_/P/PIONEER/BDP-05FD.ir
index 2315698f..217290e2 100644
--- a/_IR_Plus_Converted_/P/PIONEER/BDP-05FD.ir
+++ b/_IR_Plus_Converted_/P/PIONEER/BDP-05FD.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 552 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 552 552 552 552 552 552 552 552 1681 552 552 552 1681 552 1681 552 1681 552 1681 552 1681 552 1681 552 552 552 43982 9032 4516 552 1681 552 1681 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 552 552 552 552 1681 552 552 552 1681 552 552 552 552 552 552 552 1681 552 1681 552 1681 552 1681 552 552 552 1681 552 1681 552 1681 552 552 552 552 552 552 552 552 552 1681 552 552 552 43982
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PIONEER/DVD-Generic.ir b/_IR_Plus_Converted_/P/PIONEER/DVD-Generic.ir
index 6252ac53..2b2140ec 100644
--- a/_IR_Plus_Converted_/P/PIONEER/DVD-Generic.ir
+++ b/_IR_Plus_Converted_/P/PIONEER/DVD-Generic.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9000 4500 550 1675 550 1675 550 550 550 550 550 550 550 1675 550 550 550 1675 550 550 550 550 550 1675 550 1675 550 1675 550 550 550 1675 550 550 550 1675 550 550 550 550 550 1675 550 1675 550 550 550 550 550 1675 550 550 550 1675 550 1675 550 550 550 550 550 1675 550 1675 550 550 550 43825 9000 4500 550 1675 550 1675 550 1675 550 1675 550 550 550 1675 550 550 550 1675 550 550 550 550 550 550 550 550 550 1675 550 550 550 1675 550 550 550 550 550 550 550 1675 550 1675 550 1675 550 1675 550 550 550 1675 550 1675 550 1675 550 550 550 550 550 550 550 550 550 1675 550 550 550 43825
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PIONEER/DVR-Series.ir b/_IR_Plus_Converted_/P/PIONEER/DVR-Series.ir
index c43af605..efbcad9b 100644
--- a/_IR_Plus_Converted_/P/PIONEER/DVR-Series.ir
+++ b/_IR_Plus_Converted_/P/PIONEER/DVR-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8945 4522 547 1665 547 1665 547 547 547 1665 547 547 547 1665 547 547 547 1665 547 547 547 547 547 1665 547 547 547 1665 547 547 547 1665 547 547 547 547 547 547 547 1665 547 1665 547 547 547 1665 547 547 547 547 547 1665 547 1665 547 547 547 547 547 1665 547 547 547 1665 547 1665 547 43609 8945 4522 547 1665 547 1665 547 1665 547 1665 547 547 547 1665 547 547 547 1665 547 547 547 547 547 547 547 547 547 1665 547 547 547 1665 547 547 547 547 547 547 547 1665 547 1665 547 1665 547 1665 547 547 547 1665 547 1665 547 1665 547 547 547 547 547 547 547 547 547 1665 547 547 547 43609
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PIONEER/SC27.ir b/_IR_Plus_Converted_/P/PIONEER/SC27.ir
index b7112108..3912ccde 100644
--- a/_IR_Plus_Converted_/P/PIONEER/SC27.ir
+++ b/_IR_Plus_Converted_/P/PIONEER/SC27.ir
@@ -4,7 +4,7 @@ Version: 1
 # PIONEER SC27
 # Autogenerated from ircodes/PIONEER (HiFi)/SC27.xml
 #
-name: POWER ON/OFF
+name: POWER POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -22,7 +22,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 1681 552 552 552 552 552 552 552 552 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 1681 552 43982
 #
-name: MUTE ON/OFF
+name: MUTE POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -298,7 +298,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 552 552 552 552 1681 552 552 552 1681 552 43982 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 1681 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 43982
 #
-name: MULTI-ZONE ON/OFF
+name: MULTI-ZONE POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -316,7 +316,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 43982 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 552 552 552 552 552 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 1681 552 1681 552 1681 552 43982
 #
-name: ZONE 2 ON/OFF
+name: ZONE 2 POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -334,7 +334,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 43982 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 552 552 552 552 1681 552 552 552 552 552 552 552 552 552 1681 552 1681 552 1681 552 552 552 1681 552 1681 552 1681 552 1681 552 43982
 #
-name: ZONE 3 ON/OFF
+name: ZONE 3 POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -424,7 +424,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 1681 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 552 552 552 552 552 552 1681 552 1681 552 552 552 43982 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 552 552 552 552 1681 552 552 552 552 552 43982
 #
-name: ZONE 2 MUTE ON/OFF
+name: ZONE 2 MUTE POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -538,7 +538,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 43982 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 1681 552 552 552 552 552 43982
 #
-name: ZONE 3 MUTE ON/OFF
+name: ZONE 3 MUTE POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -1294,7 +1294,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 552 552 1681 552 552 552 552 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 1681 552 1681 552 552 552 1681 552 43982
 #
-name: TONE ON/OFF
+name: TONE POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -1396,7 +1396,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 552 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 43982 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 1681 552 552 552 552 552 1681 552 1681 552 1681 552 552 552 552 552 552 552 1681 552 1681 552 552 552 552 552 43982
 #
-name: PHASE CONTROL ON/OFF
+name: PHASE CONTROL POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PIONEER/TV-Code170-175.ir b/_IR_Plus_Converted_/P/PIONEER/TV-Code170-175.ir
index 5064a6bb..901f5418 100644
--- a/_IR_Plus_Converted_/P/PIONEER/TV-Code170-175.ir
+++ b/_IR_Plus_Converted_/P/PIONEER/TV-Code170-175.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 552 552 1681 552 1681 552 1681 552 552 552 552 552 552 552 1681 552 1681 552 552 552 552 552 552 552 1681 552 1681 552 1681 552 24814
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PIONEER/VSX-921.ir b/_IR_Plus_Converted_/P/PIONEER/VSX-921.ir
index a14bd5af..89e70400 100644
--- a/_IR_Plus_Converted_/P/PIONEER/VSX-921.ir
+++ b/_IR_Plus_Converted_/P/PIONEER/VSX-921.ir
@@ -436,7 +436,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 24814 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 552 552 552 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 1681 552 1681 552 1681 552 552 552 552 552 24814
 #
-name: ZONE2VOLUMEDOWN
+name: ZONE2VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -538,7 +538,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 24814 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 1681 552 1681 552 552 552 552 552 1681 552 1681 552 552 552 552 552 552 552 552 552 1681 552 1681 552 552 552 552 552 24814
 #
-name: ZONE3VOLUMEDOWN
+name: ZONE3VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -586,7 +586,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 552 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 1681 552 1681 552 24814
 #
-name: VOLUMEDOWN
+name: VOL-
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/PIONEER/VSX-Y2014.ir b/_IR_Plus_Converted_/P/PIONEER/VSX-Y2014.ir
index 9c82d09c..90dc1991 100644
--- a/_IR_Plus_Converted_/P/PIONEER/VSX-Y2014.ir
+++ b/_IR_Plus_Converted_/P/PIONEER/VSX-Y2014.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9032 4516 552 1681 552 552 552 1681 552 552 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 552 552 1681 552 1681 552 552 552 1681 552 552 552 552 552 552 552 1681 552 1681 552 1681 552 552 552 552 552 552 552 1681 552 1681 552 552 552 552 552 552 552 1681 552 1681 552 1681 552 24814
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/P/POPCORNHOUR/PCH-C200.ir b/_IR_Plus_Converted_/P/POPCORNHOUR/PCH-C200.ir
index def39417..2ef71594 100644
--- a/_IR_Plus_Converted_/P/POPCORNHOUR/PCH-C200.ir
+++ b/_IR_Plus_Converted_/P/POPCORNHOUR/PCH-C200.ir
@@ -9,7 +9,7 @@ protocol: NECext
 address: D3 20 00 00
 command: AD 52 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: D3 20 00 00
 command: C0 3F 00 00
diff --git a/_IR_Plus_Converted_/P/PROMETHEAN/PRM 25 PROJECTOR.ir b/_IR_Plus_Converted_/P/PROMETHEAN/PRM 25 PROJECTOR.ir
index c2fb4ec3..b4dd0805 100644
--- a/_IR_Plus_Converted_/P/PROMETHEAN/PRM 25 PROJECTOR.ir	
+++ b/_IR_Plus_Converted_/P/PROMETHEAN/PRM 25 PROJECTOR.ir	
@@ -9,7 +9,7 @@ protocol: NECext
 address: 73 8C 00 00
 command: 7E 81 00 00
 #
-name: Mute
+name: MUTE
 protocol: NECext
 address: 73 8C 00 00
 command: 6E 91 00 00
diff --git a/_IR_Plus_Converted_/R/RCA/Generic1.ir b/_IR_Plus_Converted_/R/RCA/Generic1.ir
index 5d3544f2..ccf024d7 100644
--- a/_IR_Plus_Converted_/R/RCA/Generic1.ir
+++ b/_IR_Plus_Converted_/R/RCA/Generic1.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 3648 3648 462 1833 462 1833 462 908 462 908 462 908 462 908 462 1833 462 908 462 1833 462 908 462 1833 462 908 462 908 462 908 462 1833 462 1833 462 1833 462 1833 462 908 462 1833 462 908 462 1833 462 908 462 1833 462 7314
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/R/RCA/Generic2.ir b/_IR_Plus_Converted_/R/RCA/Generic2.ir
index 2f2b47b5..082f2739 100644
--- a/_IR_Plus_Converted_/R/RCA/Generic2.ir
+++ b/_IR_Plus_Converted_/R/RCA/Generic2.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 18276 3648 462 1833 462 1833 462 908 462 908 462 908 462 908 462 1833 462 1833 462 1833 462 908 462 1833 462 1833 462 908 462 908 462 1833 462 1833 462 1833 462 1833 462 908 462 908 462 908 462 1833 462 908 462 908 908 7314 3648 3648 462 1833 462 1833 462 908 462 908 462 908 462 908 462 1833 462 1833 462 1833 462 908 462 1833 462 1833 462 908 462 908 462 1833 462 1833 462 1833 462 1833 462 908 462 908 462 908 462 1833 462 908 462 908 908 7314
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/R/REVOLTEC/LED12.ir b/_IR_Plus_Converted_/R/REVOLTEC/LED12.ir
index 29978ffb..9a0736f8 100644
--- a/_IR_Plus_Converted_/R/REVOLTEC/LED12.ir
+++ b/_IR_Plus_Converted_/R/REVOLTEC/LED12.ir
@@ -9,7 +9,7 @@ protocol: NECext
 address: FF 00 00 00
 command: FF 00 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: FF 00 00 00
diff --git a/_IR_Plus_Converted_/R/ROLSEN/RDB-532.ir b/_IR_Plus_Converted_/R/ROLSEN/RDB-532.ir
index 6c4934de..34e99479 100644
--- a/_IR_Plus_Converted_/R/ROLSEN/RDB-532.ir
+++ b/_IR_Plus_Converted_/R/ROLSEN/RDB-532.ir
@@ -94,7 +94,7 @@ protocol: NECext
 address: FF 00 00 00
 command: 5F A0 00 00
 #
-name: vol-
+name: VOL-
 protocol: NECext
 address: FF 00 00 00
 command: 25 DA 00 00
@@ -104,7 +104,7 @@ protocol: NECext
 address: FF 00 00 00
 command: A7 58 00 00
 #
-name: vol+
+name: VOL+
 protocol: NECext
 address: FF 00 00 00
 command: 27 D8 00 00
diff --git a/_IR_Plus_Converted_/R/ROTEL/RA-Series.ir b/_IR_Plus_Converted_/R/ROTEL/RA-Series.ir
index a2c3544d..d140474a 100644
--- a/_IR_Plus_Converted_/R/ROTEL/RA-Series.ir
+++ b/_IR_Plus_Converted_/R/ROTEL/RA-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8892 4446 546 1664 546 1664 546 546 546 546 546 546 546 546 546 546 546 1664 546 1664 546 546 546 546 546 546 546 1664 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 546 1664 546 1664 546 1664 546 1664 546 1664 546 1664 546 1664 546 1664 546 42796 8892 2210 546 95134
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/R/RUNCO/VX-RS-Series.ir b/_IR_Plus_Converted_/R/RUNCO/VX-RS-Series.ir
index a7f73d42..0994ff7d 100644
--- a/_IR_Plus_Converted_/R/RUNCO/VX-RS-Series.ir
+++ b/_IR_Plus_Converted_/R/RUNCO/VX-RS-Series.ir
@@ -4,7 +4,7 @@ Version: 1
 # RUNCO VX-RS-Series
 # Autogenerated from ircodes/RUNCO/VX-RS-Series.xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SABA/TV.ir b/_IR_Plus_Converted_/S/SABA/TV.ir
index 90db6e6f..01e84caa 100644
--- a/_IR_Plus_Converted_/S/SABA/TV.ir
+++ b/_IR_Plus_Converted_/S/SABA/TV.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 510 1980 510 1980 510 4470 510 4470 510 1980 510 1980 510 1980 510 4470 510 4470 510 4470 510 1980 510 1980 510 36630
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SAMSUNG/HLT-XX89.ir b/_IR_Plus_Converted_/S/SAMSUNG/HLT-XX89.ir
index 130a009c..e6bbaebf 100644
--- a/_IR_Plus_Converted_/S/SAMSUNG/HLT-XX89.ir
+++ b/_IR_Plus_Converted_/S/SAMSUNG/HLT-XX89.ir
@@ -4,7 +4,7 @@ Version: 1
 # SAMSUNG HLT-XX89
 # Autogenerated from ircodes/SAMSUNG (Various & Legacy)/HLT-XX89.xml
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SAMSUNG/HT-TX.ir b/_IR_Plus_Converted_/S/SAMSUNG/HT-TX.ir
index bc520c36..697bc1a3 100644
--- a/_IR_Plus_Converted_/S/SAMSUNG/HT-TX.ir
+++ b/_IR_Plus_Converted_/S/SAMSUNG/HT-TX.ir
@@ -454,7 +454,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 4394 4394 520 1664 520 1664 520 520 520 520 520 520 520 520 520 1664 520 520 520 1664 520 1664 520 520 520 520 520 1664 520 520 520 1664 520 520 520 520 520 1664 520 520 520 1664 520 1664 520 1664 520 1664 520 520 520 1664 520 520 520 1664 520 520 520 520 520 520 520 520 520 1664 520 45474
 #
-name: S VOLUME
+name: S VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SAMSUNG/HW-F-Serie.ir b/_IR_Plus_Converted_/S/SAMSUNG/HW-F-Serie.ir
index 59cbe6ec..917b97a2 100644
--- a/_IR_Plus_Converted_/S/SAMSUNG/HW-F-Serie.ir
+++ b/_IR_Plus_Converted_/S/SAMSUNG/HW-F-Serie.ir
@@ -106,7 +106,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 4497 4470 500 500 500 500 500 500 500 500 500 1499 500 1499 500 500 500 500 500 1499 500 1499 500 1499 500 1499 500 500 500 500 500 500 500 500 500 4497 500 1499 500 500 500 500 500 500 500 1499 500 1499 500 500 500 1499 500 500 500 500 500 500 500 1551 500 500 500 500 500 1499 500 500 500 1499 500 1499 500 1499 500 500 500 59139
 #
-name: SMART VOLUME
+name: SMART VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SAMSUNG/SV-DVD3E.ir b/_IR_Plus_Converted_/S/SAMSUNG/SV-DVD3E.ir
index 10fca325..242b55bc 100644
--- a/_IR_Plus_Converted_/S/SAMSUNG/SV-DVD3E.ir
+++ b/_IR_Plus_Converted_/S/SAMSUNG/SV-DVD3E.ir
@@ -4,7 +4,7 @@ Version: 1
 # SAMSUNG SV-DVD3E
 # Autogenerated from ircodes/SAMSUNG (Various & Legacy)/SV-DVD3E.xml
 #
-name: STANDBY/ON
+name: POWER
 protocol: NECext
 address: A0 A0 00 00
 command: BF 40 00 00
diff --git a/_IR_Plus_Converted_/S/SANSUI/RZ-7700AV.ir b/_IR_Plus_Converted_/S/SANSUI/RZ-7700AV.ir
index 2dc62d94..5f00f953 100644
--- a/_IR_Plus_Converted_/S/SANSUI/RZ-7700AV.ir
+++ b/_IR_Plus_Converted_/S/SANSUI/RZ-7700AV.ir
@@ -4,7 +4,7 @@ Version: 1
 # SANSUI RZ-7700AV
 # Autogenerated from ircodes/SANSUI/RZ-7700AV.xml
 #
-name: Power ON/Off
+name: POWER POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SANYO/PLV-Series.ir b/_IR_Plus_Converted_/S/SANYO/PLV-Series.ir
index 27cee78f..58fb5f61 100644
--- a/_IR_Plus_Converted_/S/SANYO/PLV-Series.ir
+++ b/_IR_Plus_Converted_/S/SANYO/PLV-Series.ir
@@ -16,7 +16,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8993 4523 552 552 579 552 579 552 552 552 579 1683 579 1657 579 552 579 552 552 1683 552 1683 552 1683 552 1683 552 552 579 552 579 1683 579 1657 579 1657 579 552 552 552 579 552 579 552 579 1657 579 552 552 1683 552 552 579 1657 579 1657 579 1657 579 1657 579 552 579 1657 579 552 552 40233 9019 2235 552 96164
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SHARP/RRMCG A375 WJSA.ir b/_IR_Plus_Converted_/S/SHARP/RRMCG A375 WJSA.ir
index 0c9cc2d7..4f647d24 100644
--- a/_IR_Plus_Converted_/S/SHARP/RRMCG A375 WJSA.ir	
+++ b/_IR_Plus_Converted_/S/SHARP/RRMCG A375 WJSA.ir	
@@ -4,7 +4,7 @@ Version: 1
 # SHARP RRMCG A375 WJSA
 # Autogenerated from ircodes/SHARP/RRMCG A375 WJSA.xml
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/BDV-Series.ir b/_IR_Plus_Converted_/S/SONY/BDV-Series.ir
index c2ab86e7..503e35a8 100644
--- a/_IR_Plus_Converted_/S/SONY/BDV-Series.ir
+++ b/_IR_Plus_Converted_/S/SONY/BDV-Series.ir
@@ -16,7 +16,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2409 602 1204 602 1204 602 1204 602 1204 602 602 602 1204 602 602 602 602 602 602 602 602 602 602 602 1204 602 602 602 1204 602 602 20398
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/DAV-Series.ir b/_IR_Plus_Converted_/S/SONY/DAV-Series.ir
index a5702804..c960871b 100644
--- a/_IR_Plus_Converted_/S/SONY/DAV-Series.ir
+++ b/_IR_Plus_Converted_/S/SONY/DAV-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2361 572 1168 572 572 572 1168 572 572 572 1168 572 572 572 572 572 572 572 572 572 572 572 572 572 1168 572 1168 572 572 572 572 21419
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/DSP-EP9ES.ir b/_IR_Plus_Converted_/S/SONY/DSP-EP9ES.ir
index 50667ec5..d8ffba6c 100644
--- a/_IR_Plus_Converted_/S/SONY/DSP-EP9ES.ir
+++ b/_IR_Plus_Converted_/S/SONY/DSP-EP9ES.ir
@@ -4,7 +4,7 @@ Version: 1
 # SONY DSP-EP9ES
 # Autogenerated from ircodes/SONY (Various & Legacy)/DSP-EP9ES.xml
 #
-name: VOLUME
+name: VOL+
 +
 type: raw
 frequency: 39857
@@ -29,7 +29,7 @@ frequency: 39857
 duty_cycle: 0.33
 data: 2409 602 1204 602 1204 602 602 602 1204 602 602 602 602 602 1204 602 627 602 1204 602 602 602 1204 602 1204 602 1204 602 602 602 602 602 1204 602 602 602 1204 602 1204 602 1204 12846
 #
-name: VOLUME
+name: VOL+
 -
 type: raw
 frequency: 39857
diff --git a/_IR_Plus_Converted_/S/SONY/DVP-NS.ir b/_IR_Plus_Converted_/S/SONY/DVP-NS.ir
index 0a39b668..fbd6d6b1 100644
--- a/_IR_Plus_Converted_/S/SONY/DVP-NS.ir
+++ b/_IR_Plus_Converted_/S/SONY/DVP-NS.ir
@@ -16,7 +16,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2385 596 1193 596 1193 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 1193 596 596 596 1193 596 1193 596 1193 596 596 596 596 596 1193 596 596 596 596 596 1193 596 596 13145
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/HCT-Soundbar.ir b/_IR_Plus_Converted_/S/SONY/HCT-Soundbar.ir
index f73266e7..a813efaf 100644
--- a/_IR_Plus_Converted_/S/SONY/HCT-Soundbar.ir
+++ b/_IR_Plus_Converted_/S/SONY/HCT-Soundbar.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2409 602 1204 602 602 602 1204 602 602 602 1204 602 602 602 602 602 602 602 602 602 602 602 602 602 1204 602 1204 602 602 602 602 21602
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/RDR-DVD-Recorder.ir b/_IR_Plus_Converted_/S/SONY/RDR-DVD-Recorder.ir
index 3536d242..39597b45 100644
--- a/_IR_Plus_Converted_/S/SONY/RDR-DVD-Recorder.ir
+++ b/_IR_Plus_Converted_/S/SONY/RDR-DVD-Recorder.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2385 596 1193 596 596 596 1193 596 596 596 1193 596 596 596 596 596 596 596 1193 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 1193 596 1193 596 1193 596 1193 596 1193 12797
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/RM-D7M.ir b/_IR_Plus_Converted_/S/SONY/RM-D7M.ir
index 996323b3..57f5c54c 100644
--- a/_IR_Plus_Converted_/S/SONY/RM-D7M.ir
+++ b/_IR_Plus_Converted_/S/SONY/RM-D7M.ir
@@ -10,7 +10,7 @@ frequency: 40000
 duty_cycle: 0.33
 data: 2400 600 1200 600 600 600 1200 600 600 600 1200 600 600 600 600 600 1200 600 1200 600 1200 600 1200 600 600
 #
-name: ON
+POWER
 type: raw
 frequency: 40000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/RM-LG112.ir b/_IR_Plus_Converted_/S/SONY/RM-LG112.ir
index 4460e84e..7f38de24 100644
--- a/_IR_Plus_Converted_/S/SONY/RM-LG112.ir
+++ b/_IR_Plus_Converted_/S/SONY/RM-LG112.ir
@@ -4,7 +4,7 @@ Version: 1
 # SONY RM-LG112
 # Autogenerated from ircodes/SONY (RM-Series)/RM-LG112.xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/RM-P362.ir b/_IR_Plus_Converted_/S/SONY/RM-P362.ir
index e93b2061..f13c4fbc 100644
--- a/_IR_Plus_Converted_/S/SONY/RM-P362.ir
+++ b/_IR_Plus_Converted_/S/SONY/RM-P362.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2410 596 1193 596 621 572 1193 596 596 596 1193 596 596 596 621 572 596 596 621 572 596 596 596 596 1218 25693 2410 596 1193 596 621 572 1193 596 596 596 1193 596 596 596 621 572 596 596 621 572 596 596 596 596 1218 25693 2410 596 1193 596 621 572 1193 596 596 596 1193 596 596 596 621 572 596 596 621 572 596 596 596 596 1218 25693
 #
-name: DOLBY ON/OFF
+name: DOLBY POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/RM-U185.ir b/_IR_Plus_Converted_/S/SONY/RM-U185.ir
index 64a9ee8e..6af95439 100644
--- a/_IR_Plus_Converted_/S/SONY/RM-U185.ir
+++ b/_IR_Plus_Converted_/S/SONY/RM-U185.ir
@@ -10,7 +10,7 @@ frequency: 40000
 duty_cycle: 0.33
 data: 2400 600 1200 600 600 600 1200 600 600 600 1200 600 600 600 600 600 600 600 600 600 600 600 600 600 1200 600 1200 600 600 600 600
 #
-name: ON
+POWER
 type: raw
 frequency: 40000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/STR-DA50ES.ir b/_IR_Plus_Converted_/S/SONY/STR-DA50ES.ir
index 29292e6c..3663f6ee 100644
--- a/_IR_Plus_Converted_/S/SONY/STR-DA50ES.ir
+++ b/_IR_Plus_Converted_/S/SONY/STR-DA50ES.ir
@@ -4,7 +4,7 @@ Version: 1
 # SONY STR-DA50ES
 # Autogenerated from ircodes/SONY (AVR)/STR-DA50ES.xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/SONY/STR-DB890.ir b/_IR_Plus_Converted_/S/SONY/STR-DB890.ir
index a95453e8..56b91183 100644
--- a/_IR_Plus_Converted_/S/SONY/STR-DB890.ir
+++ b/_IR_Plus_Converted_/S/SONY/STR-DB890.ir
@@ -4,7 +4,7 @@ Version: 1
 # SONY STR-DB890
 # Autogenerated from ircodes/SONY (AVR)/STR-DB930RAW.xml
 #
-name: Pwr On/Off
+name: Pwr POWER
 type: raw
 frequency: 40000
 duty_cycle: 0.33
@@ -190,13 +190,13 @@ frequency: 40000
 duty_cycle: 0.33
 data: 2304 576 576 576 576 576 1152 576 1152 576 1152 576 1152 576 1152 576 1152 576 576 576 576 576 576 576 576
 #
-name: Toggle Loundness On/Off
+name: Toggle Loundness POWER
 type: raw
 frequency: 40000
 duty_cycle: 0.33
 data: 2304 576 576 576 576 576 576 576 1152 576 576 576 1152 576 576 576 1152 576 576 576 576 576 576 576 576
 #
-name: Toggle 3D Sound On/Off
+name: Toggle 3D Sound POWER
 type: raw
 frequency: 40000
 duty_cycle: 0.33
@@ -406,7 +406,7 @@ frequency: 40000
 duty_cycle: 0.33
 data: 2304 576 576 576 576 576 576 576 576 576 576 576 1152 576 576 576 576 576 576 576 576 576 576 576 1152
 #
-name: Toggle 5.1 CH Input On/Off
+name: Toggle 5.1 CH Input POWER
 type: raw
 frequency: 40000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/S/STRONG/SRT40FX4003-TV.ir b/_IR_Plus_Converted_/S/STRONG/SRT40FX4003-TV.ir
index d6e0dba3..7016e4f8 100644
--- a/_IR_Plus_Converted_/S/STRONG/SRT40FX4003-TV.ir
+++ b/_IR_Plus_Converted_/S/STRONG/SRT40FX4003-TV.ir
@@ -4,12 +4,12 @@ Version: 1
 # STRONG SRT40FX4003-TV
 # Autogenerated from ircodes/STRONG/SRT40FX4003-TV.xml
 #
-name: Power
+name: POWER
 protocol: NECext
 address: 0E 0E 00 00
 command: F3 0C 00 00
 #
-name: Mute
+name: MUTE
 protocol: NECext
 address: 0E 0E 00 00
 command: F2 0D 00 00
diff --git a/_IR_Plus_Converted_/S/SUMMIT/SCI 5300.ir b/_IR_Plus_Converted_/S/SUMMIT/SCI 5300.ir
index ceaa7c8a..f7452f0d 100644
--- a/_IR_Plus_Converted_/S/SUMMIT/SCI 5300.ir	
+++ b/_IR_Plus_Converted_/S/SUMMIT/SCI 5300.ir	
@@ -9,7 +9,7 @@ protocol: NECext
 address: EF 00 00 00
 command: C5 3A 00 00
 #
-name: Mute
+name: MUTE
 protocol: NECext
 address: EF 00 00 00
 command: 87 78 00 00
diff --git a/_IR_Plus_Converted_/T/T+A/RCII.ir b/_IR_Plus_Converted_/T/T+A/RCII.ir
index 9453b848..1b635922 100644
--- a/_IR_Plus_Converted_/T/T+A/RCII.ir
+++ b/_IR_Plus_Converted_/T/T+A/RCII.ir
@@ -4,13 +4,13 @@ Version: 1
 # T+A RCII
 # Autogenerated from ircodes/T+A/RCII.xml
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 498 2490 996 498 498 498 498 498 498 498 498 498 996 996 498 498 498 498 498 103290
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -172,13 +172,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 498 2490 1494 996 996 498 498 498 498 996 498 498 498 498 498 498 498 103290
 #
-name: Spkr A ON/OFF
+name: Spkr A POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 498 2490 996 498 996 498 498 498 498 996 498 498 498 498 498 498 498 498 498 103290
 #
-name: Spkr B ON/OFF
+name: Spkr B POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -232,7 +232,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 498 2490 1494 498 498 498 498 498 498 996 498 498 498 498 996 996 498 103290
 #
-name: PRE ON/OFF
+name: PRE POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/T/TEAC/A-H-Series.ir b/_IR_Plus_Converted_/T/TEAC/A-H-Series.ir
index 8151fbc4..3bdec72a 100644
--- a/_IR_Plus_Converted_/T/TEAC/A-H-Series.ir
+++ b/_IR_Plus_Converted_/T/TEAC/A-H-Series.ir
@@ -4,7 +4,7 @@ Version: 1
 # TEAC A-H-Series
 # Autogenerated from ircodes/TEAC/A-H-Series.xml
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/T/TEAC/A-H300.ir b/_IR_Plus_Converted_/T/TEAC/A-H300.ir
index 76b61fb8..c14dc5ef 100644
--- a/_IR_Plus_Converted_/T/TEAC/A-H300.ir
+++ b/_IR_Plus_Converted_/T/TEAC/A-H300.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9133 4347 690 1517 716 395 759 1517 690 433 715 410 714 409 715 408 715 1513 690 433 697 1535 724 407 714 1518 715 408 711 1524 715 1512 690 441 688 1544 689 1542 711 1502 733 408 723 1514 712 406 722 407 715 1517 711 421 707 409 690 434 716 1518 689 433 715 1519 711 1493 744 403 716 41239 9115 2117 688
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/T/TECHNICS/SA-DX-Series.ir b/_IR_Plus_Converted_/T/TECHNICS/SA-DX-Series.ir
index 6cb00740..75e56542 100644
--- a/_IR_Plus_Converted_/T/TECHNICS/SA-DX-Series.ir
+++ b/_IR_Plus_Converted_/T/TECHNICS/SA-DX-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 3471 1709 447 447 447 1288 447 447 421 447 421 447 421 421 447 447 447 421 421 447 421 447 421 421 447 447 447 447 421 1315 421 447 421 447 421 421 447 447 447 447 421 447 421 447 421 1288 447 447 447 1315 447 447 421 447 421 447 421 421 447 447 447 421 421 447 421 447 421 1315 421 421 447 1315 447 1315 447 1288 447 1315 447 447 421 447 421 1315 421 421 447 1315 447 1315 447 1288 447 447 447 421 421 1315 421 73628
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/T/TEVION/PVR8005HDD.ir b/_IR_Plus_Converted_/T/TEVION/PVR8005HDD.ir
index fb3288ad..0a9c15ae 100644
--- a/_IR_Plus_Converted_/T/TEVION/PVR8005HDD.ir
+++ b/_IR_Plus_Converted_/T/TEVION/PVR8005HDD.ir
@@ -4,7 +4,7 @@ Version: 1
 # TEVION PVR8005HDD
 # Autogenerated from ircodes/TEVION/PVR8005HDD.xml
 #
-name: PWR On/Off
+name: PWR POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/T/TKOOFN/LED.ir b/_IR_Plus_Converted_/T/TKOOFN/LED.ir
index 704a3834..c1d4cfea 100644
--- a/_IR_Plus_Converted_/T/TKOOFN/LED.ir
+++ b/_IR_Plus_Converted_/T/TKOOFN/LED.ir
@@ -19,7 +19,7 @@ protocol: NECext
 address: FF 00 00 00
 command: A9 56 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: FF 00 00 00
 command: FD 02 00 00
diff --git a/_IR_Plus_Converted_/V/VIEWSONIC/PJ-Series.ir b/_IR_Plus_Converted_/V/VIEWSONIC/PJ-Series.ir
index 7e7ae92c..f1aba45b 100644
--- a/_IR_Plus_Converted_/V/VIEWSONIC/PJ-Series.ir
+++ b/_IR_Plus_Converted_/V/VIEWSONIC/PJ-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 579 1657 579 1657 579 1657 579 552 579 552 579 552 552 552 579 1657 579 1657 579 552 579 1657 579 552 552 552 579 552 579 1657 579 552 552 1683 552 1683 552 1683 552 552 579 1657 579 552 579 552 579 552 552 552 579 552 579 552 552 1683 552 552 579 1657 579 1657 579 1657 579 41311 8993 2235 579 41311
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/V/VIZIO/TV-Generic.ir b/_IR_Plus_Converted_/V/VIZIO/TV-Generic.ir
index e61a03fe..c4b69a3f 100644
--- a/_IR_Plus_Converted_/V/VIZIO/TV-Generic.ir
+++ b/_IR_Plus_Converted_/V/VIZIO/TV-Generic.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 552 552 552 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 40075 9019 2261 552 96506
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/V/VIZIO/VHT-SOUNDBAR.ir b/_IR_Plus_Converted_/V/VIZIO/VHT-SOUNDBAR.ir
index 5e2871b8..c675fe24 100644
--- a/_IR_Plus_Converted_/V/VIZIO/VHT-SOUNDBAR.ir
+++ b/_IR_Plus_Converted_/V/VIZIO/VHT-SOUNDBAR.ir
@@ -100,7 +100,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8993 4497 579 552 579 552 552 579 552 552 579 552 579 552 552 552 579 552 579 1657 579 1657 579 1657 579 1657 579 1657 579 1657 579 1657 579 1657 579 552 552 552 579 552 579 552 552 1683 552 552 579 1657 579 552 579 1657 579 1657 579 1657 579 1657 579 552 579 1657 552 579 552 1683 552 40180 9019 2235 579 40180
 #
-name: AD VOLUME
+name: AD VOL+
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/V/VU+/Uno.ir b/_IR_Plus_Converted_/V/VU+/Uno.ir
index 0ebf3dd2..dcce7e82 100644
--- a/_IR_Plus_Converted_/V/VU+/Uno.ir
+++ b/_IR_Plus_Converted_/V/VU+/Uno.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 2663 888 444 444 444 444 444 888 444 888 1332 888 444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 888 888 888 444 444 888 888 444 444 444 444 888 888 444 444 888 444 444 888 444 444 444 444 444 444 444 444 888 444 444 888 444 444 444 69164
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/Y/YAMAHA/DSP-A595A.ir b/_IR_Plus_Converted_/Y/YAMAHA/DSP-A595A.ir
index cc76e48b..fe8a36d9 100644
--- a/_IR_Plus_Converted_/Y/YAMAHA/DSP-A595A.ir
+++ b/_IR_Plus_Converted_/Y/YAMAHA/DSP-A595A.ir
@@ -16,7 +16,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8967 4470 579 526 579 1657 579 552 579 1657 579 1657 579 1657 579 1657 579 552 579 1657 579 552 579 1657 579 552 579 552 579 552 579 552 579 1657 579 526 579 552 579 552 579 1657 579 1657 579 526 579 552 579 1657 579 1657 579 1657 579 1657 579 552 579 552 579 1657 579 1657 579 552 579 39733 8967 2235 579 95769
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/Y/YAMAHA/FSR50 WY57780.ir b/_IR_Plus_Converted_/Y/YAMAHA/FSR50 WY57780.ir
index 3a49223f..3d8283dd 100644
--- a/_IR_Plus_Converted_/Y/YAMAHA/FSR50 WY57780.ir	
+++ b/_IR_Plus_Converted_/Y/YAMAHA/FSR50 WY57780.ir	
@@ -9,7 +9,7 @@ protocol: NECext
 address: E1 1E 00 00
 command: CC 33 00 00
 #
-name: ON
+POWER
 protocol: NECext
 address: E1 1E 00 00
 command: 81 7E 00 00
@@ -79,7 +79,7 @@ protocol: NECext
 address: E1 1E 00 00
 command: C1 3E 00 00
 #
-name: UNIV VOLUME
+name: UNIV VOL+
 protocol: NECext
 address: E1 1E 00 00
 command: AE 51 00 00
diff --git a/_IR_Plus_Converted_/Y/YAMAHA/RAV221.ir b/_IR_Plus_Converted_/Y/YAMAHA/RAV221.ir
index ea2a142f..4e94a96e 100644
--- a/_IR_Plus_Converted_/Y/YAMAHA/RAV221.ir
+++ b/_IR_Plus_Converted_/Y/YAMAHA/RAV221.ir
@@ -4,7 +4,7 @@ Version: 1
 # YAMAHA RAV221
 # Autogenerated from ircodes/YAMAHA (RAV Remote Code)/RAV221.xml
 #
-name: On
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/Y/YAMAHA/RX-V1400.ir b/_IR_Plus_Converted_/Y/YAMAHA/RX-V1400.ir
index b873b788..7b96569c 100644
--- a/_IR_Plus_Converted_/Y/YAMAHA/RX-V1400.ir
+++ b/_IR_Plus_Converted_/Y/YAMAHA/RX-V1400.ir
@@ -4,19 +4,19 @@ Version: 1
 # YAMAHA RX-V1400
 # Autogenerated from ircodes/YAMAHA (AVR Stereo)/RX-V1400.xml
 #
-name: Power On
+name: POWER On
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 1683 552 1683 552 1683 552 552 552 552 552 552 552 552 552 1683 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 43993 9019 2261 552 98136
 #
-name: Power Off
+name: POWER Off
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 552 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 43993 9019 2261 552 98136
 #
-name: Power Toggle
+name: POWER Toggle
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -124,7 +124,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 552 552 552 552 43993 9019 2261 552 98136
 #
-name: Effect On/Off
+name: Effect POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -202,7 +202,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 552 552 552 552 1683 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 552 552 1683 552 1683 552 552 552 43993 9019 2261 552 98136
 #
-name: Night On/Off
+name: Night POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -562,13 +562,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 552 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 1683 552 43993 9019 2261 552 98136
 #
-name: Main Power On
+name: Main POWER On
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 43993 9019 2261 552 98136
 #
-name: Main Power Off
+name: Main POWER Off
 type: raw
 frequency: 38000
 duty_cycle: 0.33
@@ -850,13 +850,13 @@ frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 552 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 552 552 552 552 552 552 1683 552 552 552 43993 9019 2261 552 98136
 #
-name: Zone2 Power On
+name: Zone2 POWER On
 type: raw
 frequency: 38000
 duty_cycle: 0.33
 data: 9019 4523 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 1683 552 552 552 43993 9019 2261 552 98136
 #
-name: Zone2 Power Off
+name: Zone2 POWER Off
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/Y/YAMAHA/RX-V850.ir b/_IR_Plus_Converted_/Y/YAMAHA/RX-V850.ir
index be1ac84a..d240f2f9 100644
--- a/_IR_Plus_Converted_/Y/YAMAHA/RX-V850.ir
+++ b/_IR_Plus_Converted_/Y/YAMAHA/RX-V850.ir
@@ -174,7 +174,7 @@ protocol: NECext
 address: A1 5E 00 00
 command: 4E B1 00 00
 #
-name: DSP EFFECT ON/OFF
+name: DSP EFFECT POWER
 protocol: NECext
 address: A1 5E 00 00
 command: 95 6A 00 00
diff --git a/_IR_Plus_Converted_/Y/YAMAHA/RX-V995.ir b/_IR_Plus_Converted_/Y/YAMAHA/RX-V995.ir
index 49e2acc1..64b5355f 100644
--- a/_IR_Plus_Converted_/Y/YAMAHA/RX-V995.ir
+++ b/_IR_Plus_Converted_/Y/YAMAHA/RX-V995.ir
@@ -4,7 +4,7 @@ Version: 1
 # YAMAHA RX-V995
 # Autogenerated from ircodes/YAMAHA (RAV Remote Code)/RAV190 (RX-V995).xml
 #
-name: ON
+POWER
 protocol: NECext
 address: 5E A1 00 00
 command: B8 47 00 00
diff --git a/_IR_Plus_Converted_/Y/YAMAHA/VS71360.ir b/_IR_Plus_Converted_/Y/YAMAHA/VS71360.ir
index 3a2a2a36..b17a8f55 100644
--- a/_IR_Plus_Converted_/Y/YAMAHA/VS71360.ir
+++ b/_IR_Plus_Converted_/Y/YAMAHA/VS71360.ir
@@ -244,7 +244,7 @@ protocol: NECext
 address: A1 5E 00 00
 command: 76 89 00 00
 #
-name: DSP-EFFECT ON/OFF
+name: DSP-EFFECT POWER
 protocol: NECext
 address: A1 5E 00 00
 command: 95 6A 00 00
diff --git a/_IR_Plus_Converted_/Y/YAMAHA/YSP-Series.ir b/_IR_Plus_Converted_/Y/YAMAHA/YSP-Series.ir
index ab5d5ebf..f7f1ef0a 100644
--- a/_IR_Plus_Converted_/Y/YAMAHA/YSP-Series.ir
+++ b/_IR_Plus_Converted_/Y/YAMAHA/YSP-Series.ir
@@ -10,7 +10,7 @@ frequency: 38000
 duty_cycle: 0.33
 data: 8967 4470 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 1683 552 1683 552 552 552 552 552 552 552 552 552 1683 552 552 552 552 552 1683 552 1683 552 552 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 552 552 1683 552 1683 552 552 552 552 552 39891 8967 2235 552 96111
 #
-name: ON
+POWER
 type: raw
 frequency: 38000
 duty_cycle: 0.33
diff --git a/_IR_Plus_Converted_/Z/ZEPHIR/HZ-19S-LCD.ir b/_IR_Plus_Converted_/Z/ZEPHIR/HZ-19S-LCD.ir
index e17d9d8e..c2e6afaf 100644
--- a/_IR_Plus_Converted_/Z/ZEPHIR/HZ-19S-LCD.ir
+++ b/_IR_Plus_Converted_/Z/ZEPHIR/HZ-19S-LCD.ir
@@ -14,7 +14,7 @@ protocol: NECext
 address: FE 00 00 00
 command: 1F E0 00 00
 #
-name: Mute
+name: MUTE
 protocol: NECext
 address: FE 00 00 00
 command: C5 3A 00 00
diff --git a/_IR_Plus_Converted_/Z/ZOTAC/ZBOX-CA320NANO-U1.ir b/_IR_Plus_Converted_/Z/ZOTAC/ZBOX-CA320NANO-U1.ir
index ff6d6591..c2183a6f 100644
--- a/_IR_Plus_Converted_/Z/ZOTAC/ZBOX-CA320NANO-U1.ir
+++ b/_IR_Plus_Converted_/Z/ZOTAC/ZBOX-CA320NANO-U1.ir
@@ -10,7 +10,7 @@ frequency: 36044
 duty_cycle: 0.33
 data: 2656 894 447 447 447 447 447 894 447 894 1341 894 447 447 447 447 447 447 447 447 447 447 447 447 447 447 447 447 894 447 447 894 894 894 447 447 447 447 447 447 447 447 447 447 447 447 894 894 447 447 894 894 447 447 447 447 894 447 447 447 447 894 447 53
 #
-name: ON
+POWER
 type: raw
 frequency: 36044
 duty_cycle: 0.33
diff --git a/_Pronto_Converted_/0-9/3M/MP-8625.ir b/_Pronto_Converted_/0-9/3M/MP-8625.ir
index 293c1e16..60f38e1a 100644
--- a/_Pronto_Converted_/0-9/3M/MP-8625.ir
+++ b/_Pronto_Converted_/0-9/3M/MP-8625.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/0-9/3M/MP-8660.ir b/_Pronto_Converted_/0-9/3M/MP-8660.ir
index cf9dda46..6033329b 100644
--- a/_Pronto_Converted_/0-9/3M/MP-8660.ir
+++ b/_Pronto_Converted_/0-9/3M/MP-8660.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/0-9/3M/MP8620.ir b/_Pronto_Converted_/0-9/3M/MP8620.ir
index f2ff6b13..39c53783 100644
--- a/_Pronto_Converted_/0-9/3M/MP8620.ir
+++ b/_Pronto_Converted_/0-9/3M/MP8620.ir
@@ -91,7 +91,7 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 1791 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 896 24095 896 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 896 24095
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 35734
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/A/ADCOM/GTP-880.ir b/_Pronto_Converted_/A/ADCOM/GTP-880.ir
index 60db5546..41e09905 100644
--- a/_Pronto_Converted_/A/ADCOM/GTP-880.ir
+++ b/_Pronto_Converted_/A/ADCOM/GTP-880.ir
@@ -211,7 +211,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8888 4444 552 552 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 552 552 1657 552 552 552 552 552 1657 552 1657 552 1657 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 40285
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/A/APTI/AP-1500X.ir b/_Pronto_Converted_/A/APTI/AP-1500X.ir
index e2f8c8ff..413f240f 100644
--- a/_Pronto_Converted_/A/APTI/AP-1500X.ir
+++ b/_Pronto_Converted_/A/APTI/AP-1500X.ir
@@ -139,7 +139,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 4750 2375 594 594 594 594 594 1781 594 1781 594 594 594 594 594 594 594 594 594 1781 594 1781 594 1781 594 594 594 594 594 1781 594 1781 594 1781 594 1781 594 594 594 1781 594 594 594 594 594 1781 594 594 594 594 594 594 594 1781 594 594 594 1781 594 1781 594 594 594 1781 594 1781 594 41895 4750 4750 594 96722
 #
-name: VOLUME
+name: VOL+
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/A/Acer/P7500.ir b/_Pronto_Converted_/A/Acer/P7500.ir
index 10db83d5..b9d4fe5b 100644
--- a/_Pronto_Converted_/A/Acer/P7500.ir
+++ b/_Pronto_Converted_/A/Acer/P7500.ir
@@ -61,19 +61,19 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 8874 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 1662 563 1662 563 1662 563 1662 563 1662 563 563 563 563 563 1662 563 43856 8874 2225 563 96049 8874 2225 563 563
 #
-name: BRIGHTNESS/KEY_2
+name: BRIGHTNESS/2
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
 data: 8874 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 1662 563 563 563 1662 563 1662 563 563 563 1662 563 563 563 563 563 563 563 1662 563 563 563 563 563 1662 563 44368 8874 2225 563 96024 8874 2225 563 563
 #
-name: COLOR/KEY_3
+name: COLOR/3
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
 data: 8874 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 1662 563 1662 563 1662 563 1662 563 563 563 1662 563 1662 563 563 563 563 563 563 563 563 563 563 563 1662 563 563 563 563 563 1662 563 44368 8874 2225 563 96024 8874 2225 563 563
 #
-name: COMPONENT/KEY_5
+name: COMPONENT/5
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
@@ -85,7 +85,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 8874 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 1662 563 563 563 1662 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 1662 563 563 563 563 563 563 563 1662 563 1662 563 563 563 44623 8874 2225 563 96049 8874 2225 563 563
 #
-name: DVI/KEY_7
+name: DVI/7
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
@@ -97,7 +97,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 8848 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 1662 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 563 563 1662 563 1662 563 1662 563 563 563 43626 8848 2225 563 96049 8848 2225 563 563
 #
-name: HDMI/KEY_8
+name: HDMI/8
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
@@ -115,7 +115,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 8848 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 563 563 563 563 563 563 1662 563 563 563 563 563 1662 563 1662 563 1662 563 1662 563 1662 563 563 563 1662 563 1662 563 563 563 43626 8848 2225 563 96049 8848 2225 563 563
 #
-name: MUTE/KEY_0
+name: MUTE/0
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
@@ -145,7 +145,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 8874 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 1662 563 563 563 1662 563 1662 563 563 563 563 563 563 563 1662 563 563 563 1662 563 563 563 563 563 1662 563 1662 563 1662 563 563 563 44086 8874 2225 563 96049 8874 2225 563 563
 #
-name: RGB/KEY_1
+name: RGB/1
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
@@ -163,13 +163,13 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 8874 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 563 563 1662 563 1662 563 1662 563 563 563 563 563 1662 563 1662 563 1662 563 563 563 44112 8874 2225 563 96024 8874 2225 563 563
 #
-name: VGA/KEY_4
+name: VGA/4
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
 data: 8874 4424 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 1662 563 563 563 1662 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 44086 8874 2225 563 96049 8874 2225 563 563
 #
-name: VIDEO/KEY_6
+name: VIDEO/6
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
@@ -187,7 +187,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 8874 4450 563 563 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 563 563 563 563 563 563 563 563 563 563 1662 563 563 563 563 563 1662 563 1662 563 563 563 1662 563 1662 563 563 563 1662 563 1662 563 563 563 563 563 1662 563 43601
 #
-name: WIRELESS/KEY_9
+name: WIRELESS/9
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/A/Algolith/Mosquito.ir b/_Pronto_Converted_/A/Algolith/Mosquito.ir
index 19f3294b..c4a8481e 100644
--- a/_Pronto_Converted_/A/Algolith/Mosquito.ir
+++ b/_Pronto_Converted_/A/Algolith/Mosquito.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 36683
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/B/B&K_Components/AVP-AVR_SERIES.ir b/_Pronto_Converted_/B/B&K_Components/AVP-AVR_SERIES.ir
index 0afc53e6..8eb09537 100644
--- a/_Pronto_Converted_/B/B&K_Components/AVP-AVR_SERIES.ir
+++ b/_Pronto_Converted_/B/B&K_Components/AVP-AVR_SERIES.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: raw
 frequency: 35734
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/B/B&K_Components/PT3.ir b/_Pronto_Converted_/B/B&K_Components/PT3.ir
index a062e3bb..9a54d3c8 100644
--- a/_Pronto_Converted_/B/B&K_Components/PT3.ir
+++ b/_Pronto_Converted_/B/B&K_Components/PT3.ir
@@ -91,7 +91,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4429 573 1641 573 1641 573 573 573 1641 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 1641 573 573 573 573 573 1641 573 573 573 573 573 1641 573 1641 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 573 573 573 573 1641 573 1641 573 1641 573 573 573 573 573 39863
 #
-name: ON
+POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_1.ir b/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_1.ir
index 8f6f49d9..d806d52d 100644
--- a/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_1.ir
+++ b/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_1.ir
@@ -133,7 +133,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4455 547 547 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 38326
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_2.ir b/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_2.ir
index fc4c755d..e487f50a 100644
--- a/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_2.ir
+++ b/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_2.ir
@@ -133,7 +133,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4455 547 547 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 37206
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_3.ir b/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_3.ir
index 02555973..bbf3bd3e 100644
--- a/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_3.ir
+++ b/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_3.ir
@@ -133,7 +133,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4429 547 547 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 39421
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_4.ir b/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_4.ir
index 7f23a15c..508c5599 100644
--- a/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_4.ir
+++ b/_Pronto_Converted_/B/Bose/BOSE_LIFESTYLE_-_ZONE_4.ir
@@ -133,7 +133,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4429 547 547 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 38300
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/C/CaVS/CaVS_Karaoke.ir b/_Pronto_Converted_/C/CaVS/CaVS_Karaoke.ir
index bf7cdeeb..9f997379 100644
--- a/_Pronto_Converted_/C/CaVS/CaVS_Karaoke.ir
+++ b/_Pronto_Converted_/C/CaVS/CaVS_Karaoke.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: power
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -13,7 +13,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4429 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 39212 8911 2215 573 94969
 #
-name: mute
+name: MUTE
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -61,13 +61,13 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4429 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 573 573 573 573 1667 573 573 573 573 573 1667 573 573 573 573 573 1667 573 1667 573 39212 8911 2215 573 94969
 #
-name: key_+
+name: +
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4429 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 1667 573 573 573 573 573 1667 573 573 573 573 573 1667 573 573 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 39212 8911 2215 573 94969
 #
-name: key_-
+name: -
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/C/California_Audio_Labs/CL-25.ir b/_Pronto_Converted_/C/California_Audio_Labs/CL-25.ir
index 786b4884..c1ce889c 100644
--- a/_Pronto_Converted_/C/California_Audio_Labs/CL-25.ir
+++ b/_Pronto_Converted_/C/California_Audio_Labs/CL-25.ir
@@ -103,7 +103,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3432 1729 432 432 432 1270 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1270 432 432 432 432 432 432 432 432 432 432 432 432 432 1270 432 1270 432 432 432 1270 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1270 432 432 432 432 432 1270 432 432 432 432 432 432 432 432 432 432 432 1270 432 432 432 432 432 73629 3432 1729 432 432 432 1270 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/C/Chiro/C-2R.ir b/_Pronto_Converted_/C/Chiro/C-2R.ir
index d8241c5f..9becc4b5 100644
--- a/_Pronto_Converted_/C/Chiro/C-2R.ir
+++ b/_Pronto_Converted_/C/Chiro/C-2R.ir
@@ -79,7 +79,7 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 89471
 #
-name: ON
+POWER
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/C/Christie_Digital_Systems/LX-55.ir b/_Pronto_Converted_/C/Christie_Digital_Systems/LX-55.ir
index 0a1ba418..4481dab6 100644
--- a/_Pronto_Converted_/C/Christie_Digital_Systems/LX-55.ir
+++ b/_Pronto_Converted_/C/Christie_Digital_Systems/LX-55.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON_OFF
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/C/Chrysalis/Bass_Matrix.ir b/_Pronto_Converted_/C/Chrysalis/Bass_Matrix.ir
index 0d00d5c1..4746a2d5 100644
--- a/_Pronto_Converted_/C/Chrysalis/Bass_Matrix.ir
+++ b/_Pronto_Converted_/C/Chrysalis/Bass_Matrix.ir
@@ -43,13 +43,13 @@ frequency: 27634
 duty_cycle: 0.330000
 data: 12412 6260 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 796 796 796 796 796 796 2352 796 796 796 796 796 796 796 796 796 2352 796 2352 796 2352 796 796 796 2352 796 2352 796 2352 796 2352 796 55982 12412 3148 796 796
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 27634
 duty_cycle: 0.330000
 data: 12340 6260 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 796 796 2352 796 796 796 796 796 796 796 796 796 796 796 796 796 2352 796 796 796 2352 796 2352 796 2352 796 2352 796 55294 12340 3076 796 796
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 27634
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/C/Comcast/XR11.ir b/_Pronto_Converted_/C/Comcast/XR11.ir
index 7ca6a170..c79960cf 100644
Binary files a/_Pronto_Converted_/C/Comcast/XR11.ir and b/_Pronto_Converted_/C/Comcast/XR11.ir differ
diff --git a/_Pronto_Converted_/C/Crestron/iLux.ir b/_Pronto_Converted_/C/Crestron/iLux.ir
index e164d6b0..6dcc26b3 100644
--- a/_Pronto_Converted_/C/Crestron/iLux.ir
+++ b/_Pronto_Converted_/C/Crestron/iLux.ir
@@ -43,7 +43,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 808 808 808 808 808 808 808 808 808 808 808 808 1641 808 808 808 808 808 808 808 808 808 808 808 808 85303
 #
-name: ON
+POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/C/Cyron/HTW-1000.ir b/_Pronto_Converted_/C/Cyron/HTW-1000.ir
index b345a94b..1a9e01b8 100644
Binary files a/_Pronto_Converted_/C/Cyron/HTW-1000.ir and b/_Pronto_Converted_/C/Cyron/HTW-1000.ir differ
diff --git a/_Pronto_Converted_/D/Definitive_Technology/W_Studio.ir b/_Pronto_Converted_/D/Definitive_Technology/W_Studio.ir
index 7e486e5b..3f5ffc30 100644
Binary files a/_Pronto_Converted_/D/Definitive_Technology/W_Studio.ir and b/_Pronto_Converted_/D/Definitive_Technology/W_Studio.ir differ
diff --git a/_Pronto_Converted_/D/Dell/1409X.ir b/_Pronto_Converted_/D/Dell/1409X.ir
index dafe8bca..90760930 100644
--- a/_Pronto_Converted_/D/Dell/1409X.ir
+++ b/_Pronto_Converted_/D/Dell/1409X.ir
@@ -103,13 +103,13 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 9015 4507 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 41739
 #
-name: KEY_ADJ+
+name: ADJ+
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 9015 4481 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 1667 547 41687
 #
-name: KEY_ADJ-
+name: ADJ-
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/D/Denon/DVD-2000.ir b/_Pronto_Converted_/D/Denon/DVD-2000.ir
index f4e9a8d3..18be1fb6 100644
--- a/_Pronto_Converted_/D/Denon/DVD-2000.ir
+++ b/_Pronto_Converted_/D/Denon/DVD-2000.ir
@@ -181,7 +181,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3486 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 74466
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/D/DirecTV/D10.ir b/_Pronto_Converted_/D/DirecTV/D10.ir
index 640ecfd0..5772d95b 100644
--- a/_Pronto_Converted_/D/DirecTV/D10.ir
+++ b/_Pronto_Converted_/D/DirecTV/D10.ir
@@ -13,13 +13,13 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 5937 1187 1187 1187 594 594 594 594 594 1187 594 594 594 594 594 1187 594 1187 594 29711 2969 1187
 #
-name: TV_Power_On
+name: TV_POWER_On
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 5937 1187 1187 1187 594 594 594 1187 594 1187 1187 594 1187 1187 594 1187 594 1187 594 29711 2969 1187
 #
-name: TV_Power_Off
+name: TV_POWER_Off
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
@@ -169,13 +169,13 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 5937 1187 1187 1187 594 594 594 1187 594 594 594 1187 594 594 1187 594 1187 594 594 29711 2969 1187
 #
-name: Vol_Up
+name: VOL+
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 5937 1187 1187 1187 594 594 594 1187 594 1187 1187 594 1187 1187 594 1187 594 1187 594 29711 2969 1187
 #
-name: Vol_Down
+name: VOL-
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
@@ -193,7 +193,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 5937 1187 1187 1187 594 594 594 594 594 594 1187 1187 1187 594 1187 594 1187 1187 594 29711 2969 1187
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/D/DirecTV/DIRECTV_H24-700.ir b/_Pronto_Converted_/D/DirecTV/DIRECTV_H24-700.ir
index d0947180..812605a0 100644
--- a/_Pronto_Converted_/D/DirecTV/DIRECTV_H24-700.ir
+++ b/_Pronto_Converted_/D/DirecTV/DIRECTV_H24-700.ir
@@ -121,13 +121,13 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 5937 1187 1187 1187 594 594 594 594 1187 594 594 594 1187 1187 1187 1187 594 1187 594 29866 2969 1187 1187 1187 594 594 594 594 1187 594 594 594 1187 1187 1187 1187 594 1187 594 29866
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 5937 1187 1187 1187 594 594 594 1187 594 1187 1187 594 1187 1187 594 1187 594 1187 594 29866 2969 1187 1187 1187 594 594 594 1187 594 1187 1187 594 1187 1187 594 1187 594 1187 594 29866
 #
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/D/DirecTV/N-A.ir b/_Pronto_Converted_/D/DirecTV/N-A.ir
index 504eb8e1..7e821c23 100644
--- a/_Pronto_Converted_/D/DirecTV/N-A.ir
+++ b/_Pronto_Converted_/D/DirecTV/N-A.ir
@@ -91,7 +91,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8914 4444 552 1657 552 552 552 1657 552 552 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 1657 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 44676 8914 2209 552 552
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
@@ -109,7 +109,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8914 4444 552 1657 552 552 552 1657 552 552 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 1657 552 1657 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 552 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 47832 8914 2209 552 552
 #
-name: CHAN_UP
+name: CH+
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/D/Dukane/8728A_8711.ir b/_Pronto_Converted_/D/Dukane/8728A_8711.ir
index 3fcc005a..991a88b0 100644
--- a/_Pronto_Converted_/D/Dukane/8728A_8711.ir
+++ b/_Pronto_Converted_/D/Dukane/8728A_8711.ir
@@ -187,7 +187,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 1657 579 1657 579 1657 579 579 579 579 579 579 579 579 579 1657 579 1657 579 579 579 1657 579 579 579 579 579 579 579 1657 579 579 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 1657 579 1657 579 1657 579 579 579 1657 579 579 579 579 579 1657 579 579 579 41232 8993 2235 579 95900
 #
-name: VOLUME
+name: VOL+
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/E/Eiki/LCXGA98OUE.ir b/_Pronto_Converted_/E/Eiki/LCXGA98OUE.ir
index 11af0060..072f9c1a 100644
--- a/_Pronto_Converted_/E/Eiki/LCXGA98OUE.ir
+++ b/_Pronto_Converted_/E/Eiki/LCXGA98OUE.ir
@@ -49,7 +49,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8914 4470 552 552 552 552 552 552 552 552 552 1683 552 1683 552 552 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 1683 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 552 552 39812 8914 2235 552 95532
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/E/Elan/Z_SERIES.ir b/_Pronto_Converted_/E/Elan/Z_SERIES.ir
index ecc2039e..f7904746 100644
--- a/_Pronto_Converted_/E/Elan/Z_SERIES.ir
+++ b/_Pronto_Converted_/E/Elan/Z_SERIES.ir
@@ -37,7 +37,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 131 18407 131 18407 131 12228 131 12228 131 12228 131 18407 131 12228 131 18407 131 12228 131 12228 131 12228 131 135896
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/E/Electronics/USV82.ir b/_Pronto_Converted_/E/Electronics/USV82.ir
index 820abb82..ea927ffe 100644
--- a/_Pronto_Converted_/E/Electronics/USV82.ir
+++ b/_Pronto_Converted_/E/Electronics/USV82.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 41870
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/E/Entone_Cable_Box/Clear_Vision_Clear_Lk_Iowa_Cbl_Box_w-DVR_by_Drew.ir b/_Pronto_Converted_/E/Entone_Cable_Box/Clear_Vision_Clear_Lk_Iowa_Cbl_Box_w-DVR_by_Drew.ir
index 865f8563..56c66be0 100644
--- a/_Pronto_Converted_/E/Entone_Cable_Box/Clear_Vision_Clear_Lk_Iowa_Cbl_Box_w-DVR_by_Drew.ir
+++ b/_Pronto_Converted_/E/Entone_Cable_Box/Clear_Vision_Clear_Lk_Iowa_Cbl_Box_w-DVR_by_Drew.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power_(Alternative)
+name: POWER_(Alternative)
 type: raw
 frequency: 39857
 duty_cycle: 0.330000
 data: 2660 903 427 427 427 427 427 903 427 903 1355 427 427 427 427 903 427 427 903 427 427 903 427 427 427 427 427 427 427 427 427 427 427 427 903 427 427 427 427 903 427 427 903 903 903 427 427 903 427 427 427 427 903 427 427 903 427 427 903 427 427 427 427 903 903 903 427 427 427 427 427 427 903 903 903 427 427 427 427 903 427 427 427 427 427 427 427 427 903 427 427 427 427 903 427 427 427 427 427 427 427 22480 8932 4416 502 502 502 502 502 502 502 502 502 502 502 502 502 1706 502 502 502 1706 502 1706 502 1706 502 1706 502 1706 502 1706 502 502 502 1706 502 502 502 1706 502 502 502 502 502 1706 502 502 502 502 502 502 502 1706 502 502 502 1706 502 1706 502 502 502 1706 502 1706 502 1706 502 41222 8932 2233 502 94387
 #
-name: Power
+name: POWER
 type: raw
 frequency: 36683
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/E/Epson/PowerLite_81p_Multimedia_Projector.ir b/_Pronto_Converted_/E/Epson/PowerLite_81p_Multimedia_Projector.ir
index beb85ae0..89f29c3d 100644
--- a/_Pronto_Converted_/E/Epson/PowerLite_81p_Multimedia_Projector.ir
+++ b/_Pronto_Converted_/E/Epson/PowerLite_81p_Multimedia_Projector.ir
@@ -139,13 +139,13 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8941 4444 579 1657 579 1657 579 579 579 579 579 579 579 579 579 579 579 1657 579 1657 579 579 579 1657 579 579 579 1657 579 579 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 579 579 579 579 579 579 1657 579 1657 579 579 579 1657 579 579 579 1657 579 1657 579 1657 579 579 579 40942
 #
-name: VOLUME_+
+name: VOL+
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8941 4444 579 1657 579 1657 579 579 579 579 579 579 579 579 579 579 579 1657 579 1657 579 579 579 1657 579 579 579 1657 579 579 579 1657 579 579 579 579 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 40942
 #
-name: VOLUME_-
+name: VOL-
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/E/Epson/Power_Lite_Pro_G5650W.ir b/_Pronto_Converted_/E/Epson/Power_Lite_Pro_G5650W.ir
index 2ee82734..fa15fd4e 100644
--- a/_Pronto_Converted_/E/Epson/Power_Lite_Pro_G5650W.ir
+++ b/_Pronto_Converted_/E/Epson/Power_Lite_Pro_G5650W.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/E/EverQuest/Elite_Plus.ir b/_Pronto_Converted_/E/EverQuest/Elite_Plus.ir
index 041ab33b..83c830c1 100644
--- a/_Pronto_Converted_/E/EverQuest/Elite_Plus.ir
+++ b/_Pronto_Converted_/E/EverQuest/Elite_Plus.ir
@@ -91,7 +91,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4444 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1630 552 1630 552 1630 552 1630 552 1630 552 1630 552 1630 552 1630 552 552 552 552 552 552 552 1630 552 552 552 552 552 552 552 552 552 1630 552 1630 552 1630 552 552 552 1630 552 1630 552 1630 552 1630 552 40916 8967 2235 552 95716
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
@@ -133,7 +133,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4444 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1630 552 1630 552 1630 552 1630 552 1630 552 1630 552 1630 552 1630 552 1630 552 1630 552 552 552 1630 552 552 552 552 552 552 552 552 552 552 552 552 552 1630 552 552 552 1630 552 1630 552 1630 552 1630 552 40942 8967 2235 552 95716
 #
-name: On/Off
+name: POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/HP/Media_Center_Control.ir b/_Pronto_Converted_/H/HP/Media_Center_Control.ir
index 3611a951..73b8994f 100644
--- a/_Pronto_Converted_/H/HP/Media_Center_Control.ir
+++ b/_Pronto_Converted_/H/HP/Media_Center_Control.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: power
+name: POWER
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
@@ -121,13 +121,13 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 2636 888 444 444 444 444 444 888 444 888 1332 888 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 444 444 444 444 888 444 444 444 444 444 444 444 444 888 888 444 444 444 444 444 444 888 888 444 444 444 444 888 888 444 68747
 #
-name: vol_up
+name: VOL+
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
 data: 2636 888 444 444 444 444 444 888 444 888 1332 888 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 444 444 444 444 444 444 888 444 444 444 444 444 444 888 888 444 444 444 444 444 444 444 444 888 888 444 444 444 444 444 444 444 68747
 #
-name: vol_down
+name: VOL-
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
@@ -151,7 +151,7 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 2636 888 444 444 444 444 444 888 444 888 1332 888 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 444 888 444 444 444 444 444 444 888 444 444 444 444 444 444 444 444 888 888 444 444 444 444 444 444 444 444 888 888 444 444 888 444 444 69191
 #
-name: mute
+name: MUTE
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Harman_Kardon/2.0_PROCESSOR_SIGNATURE.ir b/_Pronto_Converted_/H/Harman_Kardon/2.0_PROCESSOR_SIGNATURE.ir
index 408701cd..bfd8eae5 100644
--- a/_Pronto_Converted_/H/Harman_Kardon/2.0_PROCESSOR_SIGNATURE.ir
+++ b/_Pronto_Converted_/H/Harman_Kardon/2.0_PROCESSOR_SIGNATURE.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Harman_Kardon/8.5_PROCESSOR.ir b/_Pronto_Converted_/H/Harman_Kardon/8.5_PROCESSOR.ir
index 250ae5f6..d2f571a2 100644
--- a/_Pronto_Converted_/H/Harman_Kardon/8.5_PROCESSOR.ir
+++ b/_Pronto_Converted_/H/Harman_Kardon/8.5_PROCESSOR.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Hitachi/42HDX99.ir b/_Pronto_Converted_/H/Hitachi/42HDX99.ir
index d0fdf85e..c90a287d 100644
--- a/_Pronto_Converted_/H/Hitachi/42HDX99.ir
+++ b/_Pronto_Converted_/H/Hitachi/42HDX99.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -109,67 +109,67 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 547 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_0
+name: 0
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 547 547 547 547 1694 547 1694 547 547 547 547 547 547 547 547 547 1694 547 1694 547 547 547 547 547 1694 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_1
+name: 1
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 547 547 1694 547 1694 547 547 547 547 547 547 547 547 547 547 547 1694 547 547 547 547 547 1694 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_2
+name: 2
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 547 547 547 547 547 547 547 547 1694 547 547 547 547 547 547 547 1694 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_3
+name: 3
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 1694 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 1694 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_4
+name: 4
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 547 547 547 547 1694 547 1694 547 1694 547 547 547 547 547 547 547 1694 547 1694 547 547 547 547 547 547 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_5
+name: 5
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 547 547 1694 547 1694 547 1694 547 547 547 547 547 547 547 547 547 1694 547 547 547 547 547 547 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_6
+name: 6
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 547 547 547 547 1694 547 547 547 547 547 547 547 547 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_7
+name: 7
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 1694 547 1694 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_8
+name: 8
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 547 547 547 547 1694 547 547 547 547 547 547 547 547 547 547 547 1694 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_9
+name: 9
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 547 547 1694 547 547 547 1694 547 1694 547 547 547 1694 547 547 547 547 547 547 547 547 547 547 547 547 547 1694 547 547 547 1694 547 1694 547 1694 547 1694 547 1694 547 39733 8937 2267 547 95542
 #
-name: Key_-
+name: -
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Hitachi/53SDX89B.ir b/_Pronto_Converted_/H/Hitachi/53SDX89B.ir
index a84e5cd1..3652ca18 100644
--- a/_Pronto_Converted_/H/Hitachi/53SDX89B.ir
+++ b/_Pronto_Converted_/H/Hitachi/53SDX89B.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Tv-power
+name: Tv-POWER
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
@@ -67,7 +67,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 8802 4362 568 568 568 568 568 568 568 568 568 1704 568 568 568 1704 568 568 568 1704 568 1704 568 1704 568 1704 568 568 568 1704 568 568 568 1704 568 1704 568 568 568 1704 568 568 568 1704 568 568 568 568 568 568 568 568 568 1704 568 568 568 1704 568 568 568 1704 568 1704 568 1704 568 39907 8802 2220 568 92540
 #
-name: Tv-mute
+name: Tv-MUTE
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Hitachi/CMP-4221.ir b/_Pronto_Converted_/H/Hitachi/CMP-4221.ir
index a69f6b25..ae1d66be 100644
--- a/_Pronto_Converted_/H/Hitachi/CMP-4221.ir
+++ b/_Pronto_Converted_/H/Hitachi/CMP-4221.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4497 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 41258 8967 2261 552 96085
 #
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4497 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 41258 8967 2261 552 96085
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
@@ -37,7 +37,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4497 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 41258 8967 2261 552 96085
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Hitachi/CP-A100.ir b/_Pronto_Converted_/H/Hitachi/CP-A100.ir
index c0632d4a..0c232096 100644
--- a/_Pronto_Converted_/H/Hitachi/CP-A100.ir
+++ b/_Pronto_Converted_/H/Hitachi/CP-A100.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -79,7 +79,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4481 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 40854 8911 2241 547 95203 8911 2241 547 95203 8911 2241 547 95203 8911 2241 547 95203
 #
-name: VOLUME
+name: VOL+
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Hitachi/CP-X10000.ir b/_Pronto_Converted_/H/Hitachi/CP-X10000.ir
index 01835862..f6f91a75 100644
--- a/_Pronto_Converted_/H/Hitachi/CP-X10000.ir
+++ b/_Pronto_Converted_/H/Hitachi/CP-X10000.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Hitachi/CX-A100.ir b/_Pronto_Converted_/H/Hitachi/CX-A100.ir
index c0632d4a..0c232096 100644
--- a/_Pronto_Converted_/H/Hitachi/CX-A100.ir
+++ b/_Pronto_Converted_/H/Hitachi/CX-A100.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: STANDBY/ON
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -79,7 +79,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4481 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 40854 8911 2241 547 95203 8911 2241 547 95203 8911 2241 547 95203 8911 2241 547 95203
 #
-name: VOLUME
+name: VOL+
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/H/Hitachi/P50H401.ir b/_Pronto_Converted_/H/Hitachi/P50H401.ir
index a0bbc365..0a195c8a 100644
--- a/_Pronto_Converted_/H/Hitachi/P50H401.ir
+++ b/_Pronto_Converted_/H/Hitachi/P50H401.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
@@ -85,7 +85,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
@@ -109,67 +109,67 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 568 568 568 568 568 568 568 568 1678 568 568 568 568 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_0
+name: 0
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 568 568 568 568 1678 568 1678 568 568 568 568 568 568 568 568 568 1678 568 1678 568 568 568 568 568 1678 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_1
+name: 1
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 568 568 1678 568 1678 568 568 568 568 568 568 568 568 568 568 568 1678 568 568 568 568 568 1678 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_2
+name: 2
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 568 568 568 568 568 568 568 568 1678 568 568 568 568 568 568 568 1678 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_3
+name: 3
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 1678 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 1678 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_4
+name: 4
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 568 568 568 568 1678 568 1678 568 1678 568 568 568 568 568 568 568 1678 568 1678 568 568 568 568 568 568 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_5
+name: 5
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 568 568 1678 568 1678 568 1678 568 568 568 568 568 568 568 568 568 1678 568 568 568 568 568 568 568 1678 568 1678 568 1678 568 39623 8931 2220 568 95663
 #
-name: Key_6
+name: 6
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 568 568 568 568 1678 568 568 568 568 568 568 568 568 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_7
+name: 7
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 1678 568 1678 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_8
+name: 8
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 568 568 568 568 1678 568 568 568 568 568 568 568 568 568 568 568 1678 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_9
+name: 9
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8931 4517 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 568 568 1678 568 568 568 568 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 1678 568 39597 8931 2220 568 95663
 #
-name: Key_-
+name: -
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/J/JBL/SDP-3.ir b/_Pronto_Converted_/J/JBL/SDP-3.ir
index 098e4f38..028a507e 100644
--- a/_Pronto_Converted_/J/JBL/SDP-3.ir
+++ b/_Pronto_Converted_/J/JBL/SDP-3.ir
@@ -19,7 +19,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8941 4444 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 1683 552 552 552 552 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 1683 552 1683 552 43178 8941 2235 552 95480
 #
-name: ON
+POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/J/JVC/DR-MV100B.ir b/_Pronto_Converted_/J/JVC/DR-MV100B.ir
index 20a3104f..4bb4443c 100644
--- a/_Pronto_Converted_/J/JVC/DR-MV100B.ir
+++ b/_Pronto_Converted_/J/JVC/DR-MV100B.ir
@@ -127,7 +127,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8311 4169 521 1563 521 1563 521 1563 521 1563 521 521 521 1563 521 1563 521 521 521 1563 521 1563 521 521 521 521 521 521 521 521 521 1563 521 521 521 19254
 #
-name: STANDBY/ON
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/J/JVC/DR-MV150.ir b/_Pronto_Converted_/J/JVC/DR-MV150.ir
index 60c4edff..cca5e5f0 100644
--- a/_Pronto_Converted_/J/JVC/DR-MV150.ir
+++ b/_Pronto_Converted_/J/JVC/DR-MV150.ir
@@ -241,7 +241,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8415 4181 526 1578 526 1578 526 1578 526 1578 526 526 526 1578 526 1578 526 526 526 526 526 526 526 1578 526 526 526 1578 526 526 526 1578 526 1578 526 18302
 #
-name: STANDBY/ON
+name: POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/J/JVC/JVC_SR-DVM600.ir b/_Pronto_Converted_/J/JVC/JVC_SR-DVM600.ir
index b460cde7..00098449 100644
--- a/_Pronto_Converted_/J/JVC/JVC_SR-DVM600.ir
+++ b/_Pronto_Converted_/J/JVC/JVC_SR-DVM600.ir
@@ -115,7 +115,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8388 4181 526 1578 526 1578 526 1578 526 1578 526 526 526 1578 526 1578 526 526 526 1578 526 1578 526 526 526 1578 526 526 526 526 526 526 526 526 526 19354
 #
-name: Standby___Power
+name: Standby___POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/J/JVC/JX-S700.ir b/_Pronto_Converted_/J/JVC/JX-S700.ir
index 4bd6539c..d33cdf28 100644
--- a/_Pronto_Converted_/J/JVC/JX-S700.ir
+++ b/_Pronto_Converted_/J/JVC/JX-S700.ir
@@ -7,7 +7,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8337 4143 521 1563 521 1563 521 521 521 521 521 1563 521 1563 521 1563 521 1563 521 1563 521 1563 521 1563 521 521 521 1563 521 521 521 521 521 1563 521 17092
 #
-name: KEY_LOCK
+name: LOCK
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/J/JVC/LXD_1020.ir b/_Pronto_Converted_/J/JVC/LXD_1020.ir
index 6eb2c01d..0da3f262 100644
--- a/_Pronto_Converted_/J/JVC/LXD_1020.ir
+++ b/_Pronto_Converted_/J/JVC/LXD_1020.ir
@@ -7,13 +7,13 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 973 405 324 973 324 405 324 405 324 675 324 405 324 1216 324 405 324 405 324 973 324 675 324 675 324 675 324 675 324 675 324 405 324 405 324 405 324 973 324 973 324 405 324 973 324 675 324 973 324 89597 973 405 324 973 324 405 324 405 324 675 324 405 324 1216 324 405 324 405 324 973 324 675 324 675 324 675 324 675 324 675 324 405 324 405 324 405 324 973 324 973 324 405 324 973 324 675 324 973 324 89597 973 405 324 973 324 405 324 405 324 675 324 405 324 1216 324 405 324 405 324 973 324 675 324 675 324 675 324 675 324 675 324 405 324 405 324 405 324 973 324 973 324 405 324 973 324 675 324 973 324 6890
 #
-name: Power
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
 data: 973 405 324 973 324 405 324 405 324 675 324 405 324 1216 324 405 324 405 324 973 324 675 324 675 324 675 324 675 324 675 324 405 324 405 324 405 324 405 324 405 324 675 324 973 324 973 324 405 324 90678 973 405 324 973 324 405 324 405 324 675 324 405 324 1216 324 405 324 405 324 973 324 675 324 675 324 675 324 675 324 675 324 405 324 405 324 405 324 405 324 405 324 675 324 973 324 973 324 405 324 90678 973 405 324 973 324 405 324 405 324 675 324 405 324 1216 324 405 324 405 324 973 324 675 324 675 324 675 324 675 324 675 324 405 324 405 324 405 324 405 324 405 324 675 324 973 324 973 324 405 324 7971
 #
-name: A-V-mute
+name: A-V-MUTE
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/K/Kenavision/VFKAVPT.ir b/_Pronto_Converted_/K/Kenavision/VFKAVPT.ir
index e18a76e2..10afd108 100644
--- a/_Pronto_Converted_/K/Kenavision/VFKAVPT.ir
+++ b/_Pronto_Converted_/K/Kenavision/VFKAVPT.ir
@@ -73,7 +73,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 1683 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 579 579 579 579 1683 579 579 579 579 579 579 579 1683 579 579 579 579 579 579 579 1683 579 579 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 579 579 1683 579 1683 579 1683 579 42152
 #
-name: PRESET-PROG-ON/OFF
+name: PRESET-PROG-POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
@@ -205,7 +205,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 1683 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 579 579 579 579 1683 579 579 579 579 579 579 579 1683 579 579 579 579 579 579 579 1683 579 579 579 579 579 1683 579 579 579 1683 579 1683 579 1683 579 579 579 1683 579 1683 579 579 579 42099
 #
-name: A_PRESET-PROG-ON/OFF
+name: A_PRESET-PROG-POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/K/Kenwood/Sirius_Receiver.ir b/_Pronto_Converted_/K/Kenwood/Sirius_Receiver.ir
index d877ac8a..75558eb9 100644
--- a/_Pronto_Converted_/K/Kenwood/Sirius_Receiver.ir
+++ b/_Pronto_Converted_/K/Kenwood/Sirius_Receiver.ir
@@ -97,7 +97,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4455 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 1667 547 38352 8885 2215 547 95021
 #
-name: CH_UP
+name: CH+
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/L/LG/LG_BH200.ir b/_Pronto_Converted_/L/LG/LG_BH200.ir
index d9aaa203..b83caef5 100644
--- a/_Pronto_Converted_/L/LG/LG_BH200.ir
+++ b/_Pronto_Converted_/L/LG/LG_BH200.ir
@@ -151,7 +151,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 4429 4429 547 547 547 95751
 #
-name: tv_power
+name: tv_POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/L/LG/Plasma_Discretes.ir b/_Pronto_Converted_/L/LG/Plasma_Discretes.ir
index d0a1ac66..13af28f0 100644
--- a/_Pronto_Converted_/L/LG/Plasma_Discretes.ir
+++ b/_Pronto_Converted_/L/LG/Plasma_Discretes.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8859 4429 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 547 547 40176 8859 2215 547 95386
 #
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -133,7 +133,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8859 4429 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 40176 8859 2215 547 95386
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/L/Lexicon/DC-2_PROESSOR.ir b/_Pronto_Converted_/L/Lexicon/DC-2_PROESSOR.ir
index 9866763a..d254f6dc 100644
--- a/_Pronto_Converted_/L/Lexicon/DC-2_PROESSOR.ir
+++ b/_Pronto_Converted_/L/Lexicon/DC-2_PROESSOR.ir
@@ -19,7 +19,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8941 4444 579 1709 579 579 579 1683 579 579 579 579 579 579 579 579 579 1683 579 579 579 1683 579 579 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 579 579 579 579 579 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 1683 579 44282 8941 2235 579 95480
 #
-name: ON
+POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/L/Linn/No_model.ir b/_Pronto_Converted_/L/Linn/No_model.ir
index f207e2cf..5b12af3f 100644
--- a/_Pronto_Converted_/L/Linn/No_model.ir
+++ b/_Pronto_Converted_/L/Linn/No_model.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Marantz/MV-830.ir b/_Pronto_Converted_/M/Marantz/MV-830.ir
index bf014b34..bed12a0c 100644
--- a/_Pronto_Converted_/M/Marantz/MV-830.ir
+++ b/_Pronto_Converted_/M/Marantz/MV-830.ir
@@ -217,7 +217,7 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 1763 868 868 868 868 868 868 1763 1763 1763 1763 1763 1763 868 868 868 868 868 868 86976 1763 868 868 868 868 868 868 1763 1763 1763 1763 1763 1763 868 868 868 868 868 868 86976 1763 868 868 868 868 868 868 1763 1763 1763 1763 1763 1763 868 868 868 868 868 868 86976 1763 868 868 868 868 868 868 1763 1763 1763 1763 1763 1763 868 868 868 868 868 868 86976 1763 868 868 868 868 868 868 1763 1763 1763 1763 1763 1763 868 868 868 868 868 868 868
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 35734
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Marantz/Marantz_SA_CD_Player.ir b/_Pronto_Converted_/M/Marantz/Marantz_SA_CD_Player.ir
index 97637d10..cadfe5c7 100644
--- a/_Pronto_Converted_/M/Marantz/Marantz_SA_CD_Player.ir
+++ b/_Pronto_Converted_/M/Marantz/Marantz_SA_CD_Player.ir
@@ -205,13 +205,13 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1831 1831 1831 888 888 888 888 888 888 4467 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1831 888 888 888 888 1831 76543
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1831 888 888 888 888 888 888 888 888 1831 1831 888 888 888 888 888 888 90914
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Marantz/PDM-510.ir b/_Pronto_Converted_/M/Marantz/PDM-510.ir
index 124579a9..64da28cd 100644
--- a/_Pronto_Converted_/M/Marantz/PDM-510.ir
+++ b/_Pronto_Converted_/M/Marantz/PDM-510.ir
@@ -31,7 +31,7 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89693
 #
-name: Record-mute
+name: Record-MUTE
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Marantz/Recv_12.ir b/_Pronto_Converted_/M/Marantz/Recv_12.ir
index 14069d61..ac4db892 100644
--- a/_Pronto_Converted_/M/Marantz/Recv_12.ir
+++ b/_Pronto_Converted_/M/Marantz/Recv_12.ir
@@ -277,7 +277,7 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 916 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 888 888 1776 888 888 91386 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 888 888 1776 888 888 909058
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Marantz/SR-19.ir b/_Pronto_Converted_/M/Marantz/SR-19.ir
index 3dadcb3c..2372f6c3 100644
--- a/_Pronto_Converted_/M/Marantz/SR-19.ir
+++ b/_Pronto_Converted_/M/Marantz/SR-19.ir
@@ -121,7 +121,7 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Marantz/VC5000.ir b/_Pronto_Converted_/M/Marantz/VC5000.ir
index 80a807e7..ef8f01e9 100644
--- a/_Pronto_Converted_/M/Marantz/VC5000.ir
+++ b/_Pronto_Converted_/M/Marantz/VC5000.ir
@@ -157,7 +157,7 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 2663 888 444 888 444 444 444 444 1332 1332 444 444 444 444 444 444 444 444 888 888 444 444 444 444 888 888 444 444 888 888 888 444 444 83534
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Mitsubishi/DD-6000.ir b/_Pronto_Converted_/M/Mitsubishi/DD-6000.ir
index 7a3b40ab..953a8f4f 100644
--- a/_Pronto_Converted_/M/Mitsubishi/DD-6000.ir
+++ b/_Pronto_Converted_/M/Mitsubishi/DD-6000.ir
@@ -19,7 +19,7 @@ frequency: 32898
 duty_cycle: 0.330000
 data: 304 2128 304 2128 304 2128 304 912 304 912 304 2128 304 2128 304 912 304 2128 304 2128 304 2128 304 912 304 912 304 2128 304 912 304 912 304 22524
 #
-name: Power
+name: POWER
 type: raw
 frequency: 32898
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Mitsubishi/HS-U790.ir b/_Pronto_Converted_/M/Mitsubishi/HS-U790.ir
index e1c4c5c6..a7c7a416 100644
--- a/_Pronto_Converted_/M/Mitsubishi/HS-U790.ir
+++ b/_Pronto_Converted_/M/Mitsubishi/HS-U790.ir
@@ -19,13 +19,13 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 316 2051 316 2051 316 2051 316 868 316 868 316 868 316 2051 316 868 316 868 316 2051 316 868 316 868 316 868 316 2051 316 868 316 868 316 26033
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 316 2051 316 2051 316 2051 316 868 316 2051 316 868 316 2051 316 868 316 868 316 2051 316 868 316 868 316 868 316 868 316 868 316 868 316 27085
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Motorola/4DTV.ir b/_Pronto_Converted_/M/Motorola/4DTV.ir
index 4855bed4..26e372ed 100644
--- a/_Pronto_Converted_/M/Motorola/4DTV.ir
+++ b/_Pronto_Converted_/M/Motorola/4DTV.ir
@@ -199,7 +199,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 4935 1943 997 2941 997 2941 997 2941 997 2941 997 2941 997 997 997 997 997 997 997 2941 997 2941 997 2941 997 997 997 51119
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/M/Motorola/DCT6412.ir b/_Pronto_Converted_/M/Motorola/DCT6412.ir
index 3c8184bf..d56af721 100644
--- a/_Pronto_Converted_/M/Motorola/DCT6412.ir
+++ b/_Pronto_Converted_/M/Motorola/DCT6412.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/N/NAD/T_770.ir b/_Pronto_Converted_/N/NAD/T_770.ir
index 54e61a1c..4c96cb81 100644
--- a/_Pronto_Converted_/N/NAD/T_770.ir
+++ b/_Pronto_Converted_/N/NAD/T_770.ir
@@ -25,13 +25,13 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 7486 57925 8983 4440 542 1652 542 1652 542 1652 542 542 542 542 542 542 542 542 542 1652 542 542 542 542 542 1652 542 1652 542 1652 542 1652 542 1652 542 542 542 542 542 542 542 542 542 542 542 542 542 1652 542 542 542 542 542 1652 542 1652 542 1652 542 1652 542 1652 542 542 542 1652 542 1652 542 38436 8983 2220 542 95225
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 7434 53330 8570 4466 542 1652 542 1652 542 1652 542 542 542 542 542 542 542 542 542 1652 542 542 542 542 542 1652 542 1652 542 1652 542 1652 542 1652 542 542 542 542 542 542 542 542 542 1652 542 542 542 542 542 542 542 1652 542 1652 542 1652 542 1652 542 542 542 1652 542 1652 542 1652 542 542 542 38436 8570 2220 542 95225
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/N/NEC/RD-363E.ir b/_Pronto_Converted_/N/NEC/RD-363E.ir
index 57e4bfc6..9f6db598 100644
--- a/_Pronto_Converted_/N/NEC/RD-363E.ir
+++ b/_Pronto_Converted_/N/NEC/RD-363E.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power-off
+name: POWER-off
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
 data: 9027 4526 563 563 563 563 563 563 563 1688 563 1688 563 563 563 563 563 563 563 1688 563 563 563 563 563 1688 563 563 563 1688 563 1688 563 1688 563 563 563 563 563 1688 563 563 563 1688 563 563 563 563 563 563 563 1688 563 1688 563 563 563 1688 563 563 563 1688 563 1688 563 1688 563 39253 9027 2250 563 94361
 #
-name: Power-on
+name: POWER-on
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
@@ -79,7 +79,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 9027 4526 563 563 563 563 563 563 563 1688 563 1688 563 563 563 563 563 563 563 1688 563 563 563 563 563 1688 563 563 563 1688 563 1688 563 1688 563 563 563 1688 563 1688 563 563 563 563 563 1688 563 563 563 563 563 1688 563 563 563 563 563 1688 563 1688 563 563 563 1688 563 1688 563 39279 9027 2250 563 94361
 #
-name: PC-mute
+name: PC-MUTE
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/N/NEC/XM29_EXTRA.ir b/_Pronto_Converted_/N/NEC/XM29_EXTRA.ir
index 45694115..70cf4d52 100644
--- a/_Pronto_Converted_/N/NEC/XM29_EXTRA.ir
+++ b/_Pronto_Converted_/N/NEC/XM29_EXTRA.ir
@@ -7,13 +7,13 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 579 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 579 579 579 579 579 579 1683 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 1683 579 579 579 1683 579 39838 8993 2235 579 96006 8993 2235 579 32738
 #
-name: Power-on
+name: POWER-on
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 579 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 579 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 1683 579 39864 8993 2235 579 96006 8993 2235 579 32738
 #
-name: Power-off
+name: POWER-off
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
@@ -163,7 +163,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 579 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 1683 579 579 579 1683 579 579 579 579 579 1683 579 579 579 1683 579 579 579 1683 579 579 579 1683 579 1683 579 579 579 39838 8993 2235 579 96006 8993 2235 579 32738
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/N/Niles/IRD-8.ir b/_Pronto_Converted_/N/Niles/IRD-8.ir
index db81a5e1..3427e43a 100644
--- a/_Pronto_Converted_/N/Niles/IRD-8.ir
+++ b/_Pronto_Converted_/N/Niles/IRD-8.ir
@@ -61,7 +61,7 @@ frequency: 41870
 duty_cycle: 0.330000
 data: 8885 4418 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1672 573 1672 573 573 573 1672 573 1672 573 1672 573 573 573 1672 573 573 573 573 573 1672 573 573 573 1672 573 1672 573 573 573 573 573 1672 573 1672 573 573 573 1672 573 573 573 573 573 1672 573 1672 573 573 573 782589
 #
-name: ON
+POWER
 type: raw
 frequency: 41870
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/ONG/The_Portal_Gold_Medialink.ir b/_Pronto_Converted_/O/ONG/The_Portal_Gold_Medialink.ir
index 8b759ee8..b7fdc1e8 100644
--- a/_Pronto_Converted_/O/ONG/The_Portal_Gold_Medialink.ir
+++ b/_Pronto_Converted_/O/ONG/The_Portal_Gold_Medialink.ir
@@ -139,13 +139,13 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 1736 1183 684 684 684 684 684 684 684 684 684 684 920 684 684 684 684 684 684 1183 684 684 684 684 920 684 684 684 684 684 684 259039 1736 1183 684 684 684 684 684 684 684 684 684 684 920 684 684 684 684 684 684 1183 684 684 920 684 684 684 684 684 684 1183 684 684
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 1736 1315 579 579 579 579 579 579 579 579 579 579 920 684 394 684 394 1315 920 1315 579 579 579 579 579 579 579 579 579 579 579 290489 1736 1315 579 579 579 579 579 579 579 579 579 579 920 684 394 684 394 1315 920 1315 920 1315 579 579 579 579 920 920
 #
-name: VOL_DOWN
+name: VOL-
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/Onkyo/DPC-5.1.ir b/_Pronto_Converted_/O/Onkyo/DPC-5.1.ir
index d12ec639..600b4291 100644
--- a/_Pronto_Converted_/O/Onkyo/DPC-5.1.ir
+++ b/_Pronto_Converted_/O/Onkyo/DPC-5.1.ir
@@ -139,7 +139,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4455 573 573 573 1641 573 573 573 573 573 1641 573 573 573 1641 573 1641 573 1641 573 1641 573 573 573 1641 573 573 573 1641 573 573 573 573 573 573 573 573 573 1641 573 573 573 1641 573 573 573 1641 573 573 573 1641 573 1641 573 573 573 1641 573 573 573 1641 573 573 573 1641 573 39421 8885 2215 573 94969
 #
-name: SUBTITLE-ON/OFF
+name: SUBTITLE-POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/Onkyo/DVC-503.ir b/_Pronto_Converted_/O/Onkyo/DVC-503.ir
index e97a30ca..5e27e52d 100644
--- a/_Pronto_Converted_/O/Onkyo/DVC-503.ir
+++ b/_Pronto_Converted_/O/Onkyo/DVC-503.ir
@@ -121,7 +121,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4497 552 552 552 1683 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 40022 8967 2235 552 95874
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/Onkyo/DVCP-500.ir b/_Pronto_Converted_/O/Onkyo/DVCP-500.ir
index 6e785e94..53534aa2 100644
--- a/_Pronto_Converted_/O/Onkyo/DVCP-500.ir
+++ b/_Pronto_Converted_/O/Onkyo/DVCP-500.ir
@@ -121,7 +121,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 552 552 552 1683 552 552 552 552 552 1683 552 552 552 1683 552 1683 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 552 552 552 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 1683 552 552 552 1683 552 552 552 1683 552 552 552 1683 552 40075 8967 2235 552 95979 8967 2235 552 552
 #
-name: SUBTITLE-ON/OFF
+name: SUBTITLE-POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/Onkyo/Recv_8.ir b/_Pronto_Converted_/O/Onkyo/Recv_8.ir
index 3f5c1fa2..6e9344f2 100644
--- a/_Pronto_Converted_/O/Onkyo/Recv_8.ir
+++ b/_Pronto_Converted_/O/Onkyo/Recv_8.ir
@@ -235,7 +235,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4418 552 552 552 1657 552 552 552 552 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 552 552 552 552 552 552 552 552 1657 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 1657 552 552 552 42652 8967 2183 552 95848
 #
-name: ON
+POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/Onkyo/T-4555.ir b/_Pronto_Converted_/O/Onkyo/T-4555.ir
index e0bb9770..a5dc026e 100644
--- a/_Pronto_Converted_/O/Onkyo/T-4555.ir
+++ b/_Pronto_Converted_/O/Onkyo/T-4555.ir
@@ -55,7 +55,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4481 547 547 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 41479 8911 2241 547 95516
 #
-name: Standby/On
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/Onkyo/TSXR-607.ir b/_Pronto_Converted_/O/Onkyo/TSXR-607.ir
index 9d16a923..d6fadc51 100644
--- a/_Pronto_Converted_/O/Onkyo/TSXR-607.ir
+++ b/_Pronto_Converted_/O/Onkyo/TSXR-607.ir
@@ -31,13 +31,13 @@ frequency: 30479
 duty_cycle: 0.330000
 data: 10926 5676 722 722 722 2100 722 722 722 722 722 2100 722 722 722 2100 722 2100 722 722 722 722 722 2100 722 2100 722 722 722 2100 722 722 722 722 722 722 722 2100 722 722 722 722 722 722 722 722 722 2100 722 722 722 2100 722 722 722 2100 722 2100 722 2100 722 2100 722 722 722 2100 722 50986 10926 5676 722 722 722 2100 722 722 722 722 722 2100 722 722 722 2100 722 2100 722 722 722 722 722 2100 722 2100 722 722 722 2100 722 722 722 722 722 722 722 2100 722 722 722 722 722 722 722 722 722 2100 722 722 722 2100 722 722 722 2100 722 2100 722 2100 722 2100 722 722 722 2100 722 722
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 32384
 duty_cycle: 0.330000
 data: 10561 5497 679 679 679 2131 679 679 679 679 679 2131 679 679 679 2131 679 2131 679 2131 679 679 679 2131 679 2131 679 679 679 2131 679 2131 679 679 679 679 679 2131 679 679 679 679 679 679 679 679 679 679 679 679 679 2131 679 679 679 2131 679 2131 679 2131 679 2131 679 2131 679 2131 679 48265 10561 5497 679 679 679 2131 679 679 679 679 679 2131 679 679 679 2131 679 2131 679 2131 679 679 679 2131 679 2131 679 679 679 2131 679 2131 679 679 679 679 679 2131 679 679 679 679 679 679 679 679 679 679 679 679 679 2131 679 679 679 2131
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 30705
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/Onkyo/TX-NR1009.ir b/_Pronto_Converted_/O/Onkyo/TX-NR1009.ir
index 77c63800..ae2cbe51 100644
Binary files a/_Pronto_Converted_/O/Onkyo/TX-NR1009.ir and b/_Pronto_Converted_/O/Onkyo/TX-NR1009.ir differ
diff --git a/_Pronto_Converted_/O/Onkyo/TX-NR3009.ir b/_Pronto_Converted_/O/Onkyo/TX-NR3009.ir
index 88121405..bfc7c32e 100644
Binary files a/_Pronto_Converted_/O/Onkyo/TX-NR3009.ir and b/_Pronto_Converted_/O/Onkyo/TX-NR3009.ir differ
diff --git a/_Pronto_Converted_/O/Onkyo/TX-NR609.ir b/_Pronto_Converted_/O/Onkyo/TX-NR609.ir
index 88121405..bfc7c32e 100644
Binary files a/_Pronto_Converted_/O/Onkyo/TX-NR609.ir and b/_Pronto_Converted_/O/Onkyo/TX-NR609.ir differ
diff --git a/_Pronto_Converted_/O/Onkyo/TX-NR809.ir b/_Pronto_Converted_/O/Onkyo/TX-NR809.ir
index 88121405..bfc7c32e 100644
Binary files a/_Pronto_Converted_/O/Onkyo/TX-NR809.ir and b/_Pronto_Converted_/O/Onkyo/TX-NR809.ir differ
diff --git a/_Pronto_Converted_/O/Onkyo/TX-NR_Series.ir b/_Pronto_Converted_/O/Onkyo/TX-NR_Series.ir
index bd9f2f40..ebd5f657 100644
Binary files a/_Pronto_Converted_/O/Onkyo/TX-NR_Series.ir and b/_Pronto_Converted_/O/Onkyo/TX-NR_Series.ir differ
diff --git a/_Pronto_Converted_/O/Onkyo/TX_NR709.ir b/_Pronto_Converted_/O/Onkyo/TX_NR709.ir
index 88ac0e3e..ba0ab5f4 100644
Binary files a/_Pronto_Converted_/O/Onkyo/TX_NR709.ir and b/_Pronto_Converted_/O/Onkyo/TX_NR709.ir differ
diff --git a/_Pronto_Converted_/O/Oppo/BDP-93.ir b/_Pronto_Converted_/O/Oppo/BDP-93.ir
index d39b167c..0b3efc37 100644
--- a/_Pronto_Converted_/O/Oppo/BDP-93.ir
+++ b/_Pronto_Converted_/O/Oppo/BDP-93.ir
@@ -315,13 +315,13 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4507 573 1667 573 573 573 573 573 1667 573 573 573 573 573 1667 573 573 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 1667 573 1667 573 573 573 1667 573 573 573 573 573 573 573 573 573 573 573 573 573 1667 573 573 573 1667 573 1667 573 1667 573 39629 8885 2267 573 95594
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4507 573 1667 573 573 573 573 573 1667 573 573 573 573 573 1667 573 573 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 1667 573 573 573 573 573 573 573 573 573 1667 573 573 573 573 573 573 573 1667 573 1667 573 1667 573 1667 573 573 573 1667 573 39629 8885 2267 573 95594
 #
-name: VOL_DOWN
+name: VOL-
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/O/Optoma/EH1060.ir b/_Pronto_Converted_/O/Optoma/EH1060.ir
index 2db3d8a7..77974ccb 100644
--- a/_Pronto_Converted_/O/Optoma/EH1060.ir
+++ b/_Pronto_Converted_/O/Optoma/EH1060.ir
@@ -37,7 +37,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 579 579 1657 579 579 579 579 579 579 579 1657 579 1657 579 579 579 1657 579 579 579 1657 579 1657 579 1657 579 579 579 579 579 39812 8993 2209 579 95822 8993 2209 579 579
 #
-name: MENU/KEY_2
+name: MENU/2
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
@@ -97,25 +97,25 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4470 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 1657 579 1657 579 1657 579 579 579 579 579 579 579 1657 579 579 579 579 579 579 579 579 579 1657 579 1657 579 1657 579 579 579 39812
 #
-name: AV_MUTE/KEY_6
+name: AV_MUTE/6
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 1630 579 579 579 579 579 1630 579 1630 579 579 579 579 579 1630 579 579 579 1630 579 1630 579 579 579 579 579 1630 579 1630 579 579 579 1630 579 579 579 1630 579 579 579 579 579 579 579 1630 579 1630 579 579 579 1630 579 579 579 1630 579 1630 579 1630 579 579 579 39812 8993 2235 579 95795 8993 2235 579 579
 #
-name: DVI-D|Y-Pb-Pr/KEY_1
+name: DVI-D|Y-Pb-Pr/1
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 1657 579 1657 579 579 579 579 579 579 579 579 579 1657 579 579 579 579 579 579 579 1657 579 1657 579 1657 579 1657 579 579 579 39812 8993 2235 579 95795 8993 2235 579 579
 #
-name: FREEZE/KEY_5
+name: FREEZE/5
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4470 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 1657 579 579 579 1657 579 579 579 579 579 579 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 1657 579 579 579 39812 8967 2235 579 95822 8967 2235 579 579
 #
-name: HDMI/KEY_4
+name: HDMI/4
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
@@ -133,25 +133,25 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4470 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 579 579 579 579 579 579 1657 579 1657 579 1657 579 579 579 1657 579 1657 579 1657 579 1657 579 579 579 39812
 #
-name: S-VIDEO/KEY_7
+name: S-VIDEO/7
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 1657 579 579 579 579 579 579 579 579 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 1657 579 1657 579 579 579 39812 8993 2209 579 95822 8993 2209 579 579
 #
-name: VGA/KEY_8
+name: VGA/8
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 1657 579 1657 579 1657 579 579 579 579 579 579 579 1657 579 1657 579 579 579 579 579 579 579 1657 579 1657 579 1657 579 579 579 39812 8993 2209 579 95822 8993 2209 579 579
 #
-name: VIDEO/KEY_9
+name: VIDEO/9
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 579 579 1657 579 1657 579 579 579 579 579 579 579 1657 579 579 579 1657 579 579 579 579 579 1657 579 1657 579 1657 579 579 579 39812 8993 2209 579 95822 8993 2209 579 579
 #
-name: ZOOM/KEY_3
+name: ZOOM/3
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/A-110.ir b/_Pronto_Converted_/P/Panasonic/A-110.ir
index 09437f11..ffdace2d 100644
--- a/_Pronto_Converted_/P/Panasonic/A-110.ir
+++ b/_Pronto_Converted_/P/Panasonic/A-110.ir
@@ -145,7 +145,7 @@ frequency: 37344
 duty_cycle: 0.330000
 data: 3454 1714 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 1285 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 73586
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37344
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/A310.ir b/_Pronto_Converted_/P/Panasonic/A310.ir
index b84fad18..05ff72a3 100644
--- a/_Pronto_Converted_/P/Panasonic/A310.ir
+++ b/_Pronto_Converted_/P/Panasonic/A310.ir
@@ -145,7 +145,7 @@ frequency: 37344
 duty_cycle: 0.330000
 data: 3454 1714 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 1285 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 73586
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37344
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/AGVP310.ir b/_Pronto_Converted_/P/Panasonic/AGVP310.ir
index b837cd42..89f1e407 100644
--- a/_Pronto_Converted_/P/Panasonic/AGVP310.ir
+++ b/_Pronto_Converted_/P/Panasonic/AGVP310.ir
@@ -79,7 +79,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 459 459 1270 459 1270 459 459 459 459 459 459 459 1270 459 459 459 459 459 1270 459 1270 459 459 459 459 459 1270 459 73980
 #
-name: CH_UP
+name: CH+
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
@@ -91,13 +91,13 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 1270 459 459 459 1270 459 1270 459 459 459 459 459 1270 459 459 459 1270 459 459 459 459 459 1270 459 459 459 1270 459 73980
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 459 459 459 459 459 459 459 459 459 459 459 459 1270 459 459 459 1270 459 73899
 #
-name: VOL_DOWN
+name: VOL-
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/DMR-EZ37VS.ir b/_Pronto_Converted_/P/Panasonic/DMR-EZ37VS.ir
index d0ef53f6..894a8085 100644
--- a/_Pronto_Converted_/P/Panasonic/DMR-EZ37VS.ir
+++ b/_Pronto_Converted_/P/Panasonic/DMR-EZ37VS.ir
@@ -157,7 +157,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3432 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 432 432 1297 432 1297 432 432 432 432 432 73305
 #
-name: tv_power
+name: tv_POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
@@ -169,13 +169,13 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3432 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 73305
 #
-name: chan_up
+name: CH+
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
 data: 3432 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 1297 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 73305
 #
-name: chan_down
+name: CH-
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/DVD-K510.ir b/_Pronto_Converted_/P/Panasonic/DVD-K510.ir
index e19d194c..7db4ffc8 100644
--- a/_Pronto_Converted_/P/Panasonic/DVD-K510.ir
+++ b/_Pronto_Converted_/P/Panasonic/DVD-K510.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/DVD.ir b/_Pronto_Converted_/P/Panasonic/DVD.ir
index a375cee1..96b98cb4 100644
--- a/_Pronto_Converted_/P/Panasonic/DVD.ir
+++ b/_Pronto_Converted_/P/Panasonic/DVD.ir
@@ -145,7 +145,7 @@ frequency: 37344
 duty_cycle: 0.330000
 data: 3454 1714 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 1285 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 1285 428 428 428 428 428 428 428 428 428 428 428 1285 428 428 428 428 428 73586
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37344
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/DVDA320.ir b/_Pronto_Converted_/P/Panasonic/DVDA320.ir
index 7481d3e6..1f27aa8a 100644
--- a/_Pronto_Converted_/P/Panasonic/DVDA320.ir
+++ b/_Pronto_Converted_/P/Panasonic/DVDA320.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Tv-power
+name: Tv-POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
@@ -31,7 +31,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 74412 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 74412 3459 27
 #
-name: DVD-power
+name: DVD-POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/DVD_Video_Recorder_DMR-E85H.ir b/_Pronto_Converted_/P/Panasonic/DVD_Video_Recorder_DMR-E85H.ir
index cc57b6cf..d798d5b1 100644
--- a/_Pronto_Converted_/P/Panasonic/DVD_Video_Recorder_DMR-E85H.ir
+++ b/_Pronto_Converted_/P/Panasonic/DVD_Video_Recorder_DMR-E85H.ir
@@ -133,7 +133,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 1297 432 1297 432 1297 432 1297 432 1297 432 1297 432 432 432 1297 432 1297 432 1297 432 1297 432 432 432 432 432 1297 432 1297 432 432
 #
-name: CH_UP
+name: CH+
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/PV8664.ir b/_Pronto_Converted_/P/Panasonic/PV8664.ir
index 6473acda..764183e2 100644
--- a/_Pronto_Converted_/P/Panasonic/PV8664.ir
+++ b/_Pronto_Converted_/P/Panasonic/PV8664.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/PV9451.ir b/_Pronto_Converted_/P/Panasonic/PV9451.ir
index 8888eb27..fe487913 100644
--- a/_Pronto_Converted_/P/Panasonic/PV9451.ir
+++ b/_Pronto_Converted_/P/Panasonic/PV9451.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 36683
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/PVS4680.ir b/_Pronto_Converted_/P/Panasonic/PVS4680.ir
index 3335d625..a7b70a0a 100644
--- a/_Pronto_Converted_/P/Panasonic/PVS4680.ir
+++ b/_Pronto_Converted_/P/Panasonic/PVS4680.ir
@@ -181,7 +181,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1675 432 432 432 1270 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1270 432 432 432 432 432 432 432 432 432 432 432 432 432 1270 432 432 432 432 432 1270 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1270 432 432 432 1270 432 432 432 432 432 1270 432 1270 432 1270 432 1270 432 432 432 1270 432 432 432 1270 432 1270 432 1270 432 432 432 73683
 #
-name: CH_UP
+name: CH+
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Panasonic/TV-4640.ir b/_Pronto_Converted_/P/Panasonic/TV-4640.ir
index 6b0a7f96..1b82fd86 100644
--- a/_Pronto_Converted_/P/Panasonic/TV-4640.ir
+++ b/_Pronto_Converted_/P/Panasonic/TV-4640.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 37683
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Parasound/AVC-1800.ir b/_Pronto_Converted_/P/Parasound/AVC-1800.ir
index ec9ab5af..e729225d 100644
--- a/_Pronto_Converted_/P/Parasound/AVC-1800.ir
+++ b/_Pronto_Converted_/P/Parasound/AVC-1800.ir
@@ -31,7 +31,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4497 552 1657 552 1657 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 1657 552 552 552 1657 552 552 552 552 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 42520 8967 2235 552 95716
 #
-name: ON
+POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Philips/PD-5029C_MONITOR.ir b/_Pronto_Converted_/P/Philips/PD-5029C_MONITOR.ir
index d4a481b3..cfde7581 100644
--- a/_Pronto_Converted_/P/Philips/PD-5029C_MONITOR.ir
+++ b/_Pronto_Converted_/P/Philips/PD-5029C_MONITOR.ir
@@ -199,7 +199,7 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 1776 1776 1776 888 888 888 89666
 #
-name: PIP-ON/OFF
+name: PIP-POWER
 type: raw
 frequency: 36045
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Philips/TP2784C101.ir b/_Pronto_Converted_/P/Philips/TP2784C101.ir
index 47e36706..975827c4 100644
--- a/_Pronto_Converted_/P/Philips/TP2784C101.ir
+++ b/_Pronto_Converted_/P/Philips/TP2784C101.ir
@@ -133,7 +133,7 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 923 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 896 896 896 896 90754 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 896 896 896 896 90754 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 896 896 896 896 90754 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 896 896 896 896 90754 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 896 896 896 896 46538
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 35734
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Pinnacle/Media_Star.ir b/_Pronto_Converted_/P/Pinnacle/Media_Star.ir
index bfad1a1a..c35d2684 100644
--- a/_Pronto_Converted_/P/Pinnacle/Media_Star.ir
+++ b/_Pronto_Converted_/P/Pinnacle/Media_Star.ir
@@ -139,7 +139,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 158 7389 158 4891 158 4891 158 4891 158 7389 158 4891 158 7389 158 7389 158 4891 158 7389 158 7389 158 50172
 #
-name: ON/OFF/QUIT
+name: POWER/QUIT
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Pioneer/BDP-41FD.ir b/_Pronto_Converted_/P/Pioneer/BDP-41FD.ir
index 0338140b..f6d812f8 100644
Binary files a/_Pronto_Converted_/P/Pioneer/BDP-41FD.ir and b/_Pronto_Converted_/P/Pioneer/BDP-41FD.ir differ
diff --git a/_Pronto_Converted_/P/Pioneer/BDP-43FD.ir b/_Pronto_Converted_/P/Pioneer/BDP-43FD.ir
index 0650f7a3..d200d564 100644
Binary files a/_Pronto_Converted_/P/Pioneer/BDP-43FD.ir and b/_Pronto_Converted_/P/Pioneer/BDP-43FD.ir differ
diff --git a/_Pronto_Converted_/P/Pioneer/BDP-95FD.ir b/_Pronto_Converted_/P/Pioneer/BDP-95FD.ir
index d8ed62ea..b4c41944 100644
--- a/_Pronto_Converted_/P/Pioneer/BDP-95FD.ir
+++ b/_Pronto_Converted_/P/Pioneer/BDP-95FD.ir
@@ -1,19 +1,19 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power_Toggle
+name: POWER_Toggle
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 8945 4473 547 1665 547 547 547 547 547 547 547 547 547 1665 547 547 547 1665 547 547 547 1665 547 1665 547 1665 547 1665 547 547 547 1665 547 547 547 1665 547 547 547 547 547 547 547 547 547 547 547 547 547 1665 547 547 547 1665 547 1665 547 1665 547 1665 547 1665 547 1665 547 547 547 43559 8945 4473 547 1665 547 1665 547 1665 547 1665 547 547 547 1665 547 547 547 1665 547 547 547 547 547 547 547 547 547 1665 547 547 547 1665 547 547 547 547 547 547 547 1665 547 1665 547 1665 547 1665 547 547 547 1665 547 1665 547 1665 547 547 547 547 547 547 547 547 547 1665 547 547 547 43559
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 8945 4473 547 1665 547 547 547 547 547 547 547 547 547 1665 547 547 547 1665 547 547 547 1665 547 1665 547 1665 547 1665 547 547 547 1665 547 547 547 1665 547 547 547 547 547 547 547 547 547 547 547 547 547 1665 547 547 547 1665 547 1665 547 1665 547 1665 547 1665 547 1665 547 547 547 43559 8945 4473 547 1665 547 1665 547 1665 547 1665 547 547 547 1665 547 547 547 1665 547 547 547 547 547 547 547 547 547 1665 547 547 547 1665 547 547 547 547 547 1665 547 547 547 1665 547 1665 547 1665 547 547 547 1665 547 1665 547 547 547 1665 547 547 547 547 547 547 547 1665 547 547 547 43559
 #
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Pioneer/CLD-0604.ir b/_Pronto_Converted_/P/Pioneer/CLD-0604.ir
index 45d3a862..4e69b977 100644
--- a/_Pronto_Converted_/P/Pioneer/CLD-0604.ir
+++ b/_Pronto_Converted_/P/Pioneer/CLD-0604.ir
@@ -235,13 +235,13 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 8473 4224 547 547 547 547 547 547 547 1590 547 547 547 1590 547 547 547 1590 547 1590 547 1590 547 1590 547 547 547 1590 547 547 547 1590 547 547 547 1590 547 547 547 1590 547 1590 547 1590 547 547 547 1590 547 547 547 547 547 1590 547 547 547 547 547 547 547 1590 547 547 547 1590 547 35210
 #
-name: KEY_CONTROL_B
+name: CONTROL_B
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 8473 4224 547 547 547 547 547 547 547 1590 547 547 547 1590 547 547 547 1590 547 1590 547 1590 547 1590 547 547 547 1590 547 547 547 1590 547 547 547 547 547 1590 547 547 547 1590 547 1590 547 1590 547 547 547 547 547 1590 547 547 547 1590 547 547 547 547 547 547 547 1590 547 1590 547 35136
 #
-name: KEY_CONTROL_#
+name: CONTROL_#
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Pioneer/CU-VXX115.ir b/_Pronto_Converted_/P/Pioneer/CU-VXX115.ir
index 8f2e2c77..21a2482f 100644
--- a/_Pronto_Converted_/P/Pioneer/CU-VXX115.ir
+++ b/_Pronto_Converted_/P/Pioneer/CU-VXX115.ir
@@ -31,13 +31,13 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 8448 4199 547 1565 547 547 547 1565 547 547 547 547 547 1565 547 547 547 1565 547 547 547 1565 547 547 547 1565 547 1565 547 547 547 1565 547 547 547 1565 547 1565 547 1565 547 547 547 547 547 547 547 1565 547 547 547 547 547 547 547 547 547 1565 547 1565 547 1565 547 547 547 1565 547 25171
 #
-name: Receiver-power
+name: Receiver-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 8448 4199 547 1565 547 547 547 1565 547 547 547 547 547 1565 547 547 547 1565 547 547 547 1565 547 547 547 1565 547 1565 547 547 547 1565 547 547 547 547 547 547 547 1565 547 1565 547 1565 547 547 547 547 547 547 547 1565 547 1565 547 547 547 547 547 547 547 1565 547 1565 547 1565 547 25171
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
@@ -91,7 +91,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 8448 4199 547 547 547 547 547 1565 547 547 547 547 547 1565 547 547 547 1565 547 1565 547 1565 547 547 547 1565 547 1565 547 547 547 1565 547 547 547 1565 547 547 547 547 547 547 547 1565 547 547 547 547 547 547 547 547 547 1565 547 1565 547 1565 547 547 547 1565 547 1565 547 1565 547 25171
 #
-name: R_power
+name: R_POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
@@ -163,13 +163,13 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 8448 4199 547 547 547 547 547 1565 547 547 547 547 547 1565 547 547 547 1565 547 1565 547 1565 547 547 547 1565 547 1565 547 547 547 1565 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 1565 547 547 547 1565 547 1565 547 1565 547 1565 547 1565 547 1565 547 547 547 1565 547 25171
 #
-name: LD-power
+name: LD-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 8448 4199 547 547 547 547 547 547 547 1565 547 547 547 1565 547 547 547 1565 547 1565 547 1565 547 1565 547 547 547 1565 547 547 547 1565 547 547 547 547 547 547 547 1565 547 1565 547 1565 547 547 547 547 547 547 547 1565 547 1565 547 547 547 547 547 547 547 1565 547 1565 547 1565 547 25171
 #
-name: Tv-power
+name: Tv-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Pioneer/DV-45A.ir b/_Pronto_Converted_/P/Pioneer/DV-45A.ir
index 125570cb..2631b684 100644
--- a/_Pronto_Converted_/P/Pioneer/DV-45A.ir
+++ b/_Pronto_Converted_/P/Pioneer/DV-45A.ir
@@ -247,7 +247,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 8473 4249 547 1565 547 1565 547 547 547 547 547 547 547 1565 547 547 547 1565 547 547 547 547 547 1565 547 1565 547 1565 547 547 547 1565 547 547 547 1565 547 547 547 547 547 1565 547 1565 547 547 547 547 547 1565 547 547 547 1565 547 1565 547 547 547 547 547 1565 547 1565 547 547 547 35409 8473 4249 547 1565 547 1565 547 1565 547 1565 547 547 547 1565 547 547 547 1565 547 547 547 547 547 547 547 547 547 1565 547 547 547 1565 547 547 547 1565 547 547 547 1565 547 547 547 547 547 1565 547 1565 547 1565 547 547 547 1565 547 547 547 1565 547 1565 547 547 547 547 547 547 547 547
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Pioneer/DVL919.ir b/_Pronto_Converted_/P/Pioneer/DVL919.ir
index 4eec6159..fd240b3d 100644
--- a/_Pronto_Converted_/P/Pioneer/DVL919.ir
+++ b/_Pronto_Converted_/P/Pioneer/DVL919.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Pioneer/PR0510.ir b/_Pronto_Converted_/P/Pioneer/PR0510.ir
index 7cefd602..96181a7d 100644
--- a/_Pronto_Converted_/P/Pioneer/PR0510.ir
+++ b/_Pronto_Converted_/P/Pioneer/PR0510.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: TV-power
+name: TV-POWER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
@@ -271,7 +271,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 8440 4208 541 1575 541 541 541 1575 541 541 541 541 541 1575 541 541 541 1575 541 541 541 1575 541 541 541 1575 541 1575 541 541 541 1575 541 541 541 1575 541 541 541 1575 541 541 541 1575 541 541 541 1575 541 541 541 541 541 1575 541 541 541 1575 541 541 541 1575 541 541 541 1575 541 25001
 #
-name: RECEIVER-power-2
+name: RECEIVER-POWER-2
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Polycom/VS-4000.ir b/_Pronto_Converted_/P/Polycom/VS-4000.ir
index 1a02e21e..26b8ff1b 100644
--- a/_Pronto_Converted_/P/Polycom/VS-4000.ir
+++ b/_Pronto_Converted_/P/Polycom/VS-4000.ir
@@ -79,7 +79,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 2555 2581 568 878 568 878 878 1187 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 59783 2581 2581 568 878 568 878 878 1187 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 59783 2581 2581 568 878 568 878 878 1187 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 878 878 1187 568 40733
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Polycom/ViewStation.ir b/_Pronto_Converted_/P/Polycom/ViewStation.ir
index d4849ba8..5d8f7260 100644
--- a/_Pronto_Converted_/P/Polycom/ViewStation.ir
+++ b/_Pronto_Converted_/P/Polycom/ViewStation.ir
@@ -91,7 +91,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 2555 2607 568 878 568 878 878 1187 878 1187 568 878 878 1187 568 878 878 1187 878 1187 878 1187 878 1187 878 1187 568 878 568 878 568 878 568 878 568 59680
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Proceed/PAV_W-DSD.ir b/_Pronto_Converted_/P/Proceed/PAV_W-DSD.ir
index b011e091..3a403e1e 100644
--- a/_Pronto_Converted_/P/Proceed/PAV_W-DSD.ir
+++ b/_Pronto_Converted_/P/Proceed/PAV_W-DSD.ir
@@ -85,61 +85,61 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 7389 158 4865 158 7389 158 7389 158 4865 158 7389 158 40837
 #
-name: VCR_1/KEY_1
+name: VCR_1/1
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 7389 158 4865 158 4865 158 7389 158 4865 158 45860
 #
-name: VCR_2/KEY_2
+name: VCR_2/2
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 7389 158 7389 158 4865 158 7389 158 4865 158 43362
 #
-name: LASER_DISC/KEY_3
+name: LASER_DISC/3
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 4865 158 4865 158 4865 158 7389 158 7389 158 45860
 #
-name: TV/AUX/KEY_4
+name: TV/AUX/4
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 4865 158 7389 158 4865 158 7389 158 7389 158 43362
 #
-name: CD_1/KEY_5
+name: CD_1/5
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 4865 158 4865 158 4865 158 4865 158 7389 158 48384
 #
-name: CD_2/KEY_6
+name: CD_2/6
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 4865 158 7389 158 4865 158 4865 158 7389 158 45860
 #
-name: TAPE_1/KEY_7
+name: TAPE_1/7
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 7389 158 4865 158 4865 158 4865 158 7389 158 45860
 #
-name: TAPE_2/KEY_8
+name: TAPE_2/8
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 7389 158 7389 158 4865 158 4865 158 7389 158 43362
 #
-name: BAL/AUX/KEY_9
+name: BAL/AUX/9
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 158 7363 158 4865 158 7389 158 4865 158 7389 158 4865 158 4865 158 4865 158 4865 158 7389 158 4865 158 48384
 #
-name: TUNER/KEY_0
+name: TUNER/0
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Proton/CABLE_BOX.ir b/_Pronto_Converted_/P/Proton/CABLE_BOX.ir
index ee0f87a1..8116f953 100644
--- a/_Pronto_Converted_/P/Proton/CABLE_BOX.ir
+++ b/_Pronto_Converted_/P/Proton/CABLE_BOX.ir
@@ -187,7 +187,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8388 4207 526 1578 526 1578 526 526 526 526 526 526 526 526 526 526 526 526 526 4207 526 526 526 1578 526 1578 526 526 526 1578 526 1578 526 526 526 526 526 21747
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/P/Proton/N-A.ir b/_Pronto_Converted_/P/Proton/N-A.ir
index be462b74..352e8a87 100644
Binary files a/_Pronto_Converted_/P/Proton/N-A.ir and b/_Pronto_Converted_/P/Proton/N-A.ir differ
diff --git a/_Pronto_Converted_/P/Proton/V-215R.ir b/_Pronto_Converted_/P/Proton/V-215R.ir
index 6bdcdb84..eae06a0a 100644
--- a/_Pronto_Converted_/P/Proton/V-215R.ir
+++ b/_Pronto_Converted_/P/Proton/V-215R.ir
@@ -187,7 +187,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8415 4207 526 1578 526 1578 526 526 526 526 526 526 526 526 526 526 526 526 526 4207 526 526 526 1578 526 1578 526 526 526 1578 526 1578 526 526 526 526 526 21773
 #
-name: PIP-ON/OFF
+name: PIP-POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/R/RCA/RC-5200P.ir b/_Pronto_Converted_/R/RCA/RC-5200P.ir
index a7afe430..2909ae08 100644
--- a/_Pronto_Converted_/R/RCA/RC-5200P.ir
+++ b/_Pronto_Converted_/R/RCA/RC-5200P.ir
@@ -139,7 +139,7 @@ frequency: 57571
 duty_cycle: 0.330000
 data: 3978 3978 486 990 486 1998 486 990 486 1998 486 990 486 1998 486 1998 486 1998 486 1998 486 990 486 990 486 990 486 1998 486 990 486 1998 486 990 486 1998 486 990 486 990 486 990 486 990 486 1998 486 1998 486 1998 486 7955
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 57571
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/R/RCA/VR730HF.ir b/_Pronto_Converted_/R/RCA/VR730HF.ir
index 47e34302..6c995961 100644
--- a/_Pronto_Converted_/R/RCA/VR730HF.ir
+++ b/_Pronto_Converted_/R/RCA/VR730HF.ir
@@ -163,7 +163,7 @@ frequency: 58382
 duty_cycle: 0.330000
 data: 3888 3837 480 1953 480 1953 480 1953 480 925 480 925 480 1953 480 925 480 1953 480 925 480 1953 480 1953 480 1953 480 925 480 925 480 925 480 1953 480 1953 480 925 480 1953 480 925 480 1953 480 925 480 925 480 925 480 8102
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 58382
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/R/ReQuest_Video/Video_Request.ir b/_Pronto_Converted_/R/ReQuest_Video/Video_Request.ir
index 9d4a45fe..d51805d4 100644
--- a/_Pronto_Converted_/R/ReQuest_Video/Video_Request.ir
+++ b/_Pronto_Converted_/R/ReQuest_Video/Video_Request.ir
@@ -13,7 +13,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 1626 800 4956 1626 800 800 1626 1626 2452 2452 800 1626 4956 2452 3304 1626 2452 2452
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/R/Real-Fyre/No_model.ir b/_Pronto_Converted_/R/Real-Fyre/No_model.ir
index febaf802..83404cfa 100644
--- a/_Pronto_Converted_/R/Real-Fyre/No_model.ir
+++ b/_Pronto_Converted_/R/Real-Fyre/No_model.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/R/Rotel/RR950.ir b/_Pronto_Converted_/R/Rotel/RR950.ir
index a8845e60..59d31819 100644
--- a/_Pronto_Converted_/R/Rotel/RR950.ir
+++ b/_Pronto_Converted_/R/Rotel/RR950.ir
@@ -19,7 +19,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 131 15146 131 15146 131 15146 131 9913 131 15146 131 30187
 #
-name: CHAN_UP
+name: CH+
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/R/Rotel/RT-1084.ir b/_Pronto_Converted_/R/Rotel/RT-1084.ir
index c5f5b3d2..433a15e9 100644
--- a/_Pronto_Converted_/R/Rotel/RT-1084.ir
+++ b/_Pronto_Converted_/R/Rotel/RT-1084.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 43433 8937 2189 547 96193
 #
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -109,61 +109,61 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_0
+name: 0
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_1
+name: 1
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_2
+name: 2
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_3
+name: 3
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_4
+name: 4
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_5
+name: 5
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_6
+name: 6
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_7
+name: 7
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_8
+name: 8
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 43433 8937 2189 547 96193
 #
-name: Key_9
+name: 9
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/R/Runco/DVP-940.ir b/_Pronto_Converted_/R/Runco/DVP-940.ir
index d950ae8d..d8995e04 100644
--- a/_Pronto_Converted_/R/Runco/DVP-940.ir
+++ b/_Pronto_Converted_/R/Runco/DVP-940.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power-on
+name: POWER-on
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4497 579 579 579 579 579 579 579 1683 579 1683 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 579 579 1683 579 1683 579 1683 579 1683 579 579 579 579 579 579 579 1683 579 579 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 579 579 1683 579 1683 579 1683 579 1683 579 38681 8993 2235 579 95874 8993 2235 579 34237
 #
-name: Power-off
+name: POWER-off
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
@@ -103,13 +103,13 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8993 4470 579 579 579 579 579 579 579 1683 579 1683 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 579 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 1683 579 38681 8967 2261 579 95900 8967 2261 579 34237
 #
-name: PIC-Mute
+name: PIC-MUTE
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8967 4497 579 579 579 579 579 579 579 1683 579 1683 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 579 579 579 579 1683 579 579 579 579 579 579 579 579 579 1683 579 1683 579 1683 579 579 579 1683 579 38681 8993 2235 579 95874 8993 2235 579 34237
 #
-name: sound-Mute
+name: sound-MUTE
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/R/Runco/VX3C.ir b/_Pronto_Converted_/R/Runco/VX3C.ir
index 666f1ba5..3a0cf063 100644
--- a/_Pronto_Converted_/R/Runco/VX3C.ir
+++ b/_Pronto_Converted_/R/Runco/VX3C.ir
@@ -91,7 +91,7 @@ frequency: 345429
 duty_cycle: 0.330000
 data: 362 2904 362 362 362 6 362 735 362 6 362 735 362 362 362 362 362 362 362 362 362 6 362 735 362 6 362 735 362 362 362 362 362 362 362 29071
 #
-name: VOLUME
+name: VOL+
 type: raw
 frequency: 345429
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Samsung/BD-P1000.ir b/_Pronto_Converted_/S/Samsung/BD-P1000.ir
index c416cb82..4d70d222 100644
--- a/_Pronto_Converted_/S/Samsung/BD-P1000.ir
+++ b/_Pronto_Converted_/S/Samsung/BD-P1000.ir
@@ -73,7 +73,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 4455 4455 495 495 495 495 495 495 495 495 495 495 495 1459 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 4455 495 1459 495 1459 495 1459 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 1459 495 1459 495 1459 495 1459 495 1459 495 1459 495 1459 495 1459 495 56747 4455 4455 495 495 495 495 495 495 495 495 495 495 495 1459 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 4455 495 1459 495 1459 495 1459 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 1459 495 1459 495 1459 495 1459 495 1459 495 1459 495 1459 495 1459 495 56747 4455 4455 495 495 495 495 495 495 495 495 495 495 495 1459 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 365 365
 #
-name: TV_Power
+name: TV_POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -139,13 +139,13 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 4455 4455 495 495 495 495 495 495 495 495 495 495 495 1459 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 4455 495 1459 495 1459 495 1459 495 495 495 495 495 495 495 1459 495 495 495 1459 495 495 495 495 495 495 495 1459 495 1459 495 495 495 1459 495 495 495 1459 495 1459 495 1459 495 56747 4455 4455 495 495 495 495 495 495 495 495 495 495 495 1459 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 4455 495 1459 495 1459 495 1459 495 495 495 495 495 495 495 1459 495 495 495 1459 495 495 495 495 495 495 495 1459 495 1459 495 495 495 1459 495 495 495 1459 495 1459 495 1459 495 56747 4455 4455 495 495 495 495 495 495 495 495 495 495 495 1459 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 495 339 339
 #
-name: Volume_+
+name: VOL+
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 4403 4403 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 1641 573 1641 573 45778 4403 4403 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 1641 573 1641 573 45778 4403 4403 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 1641 573 1641 573 1641 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573
 #
-name: Volume_-
+name: VOL-
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Samsung/HLN_Series_Discretes.ir b/_Pronto_Converted_/S/Samsung/HLN_Series_Discretes.ir
index 3f4c1df2..bece74f9 100644
--- a/_Pronto_Converted_/S/Samsung/HLN_Series_Discretes.ir
+++ b/_Pronto_Converted_/S/Samsung/HLN_Series_Discretes.ir
@@ -73,13 +73,13 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 4481 4481 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 43589
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 4481 4481 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 43589
 #
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Samsung/PLH-403WC.ir b/_Pronto_Converted_/S/Samsung/PLH-403WC.ir
index 8e36304e..4936601b 100644
--- a/_Pronto_Converted_/S/Samsung/PLH-403WC.ir
+++ b/_Pronto_Converted_/S/Samsung/PLH-403WC.ir
@@ -115,25 +115,25 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 4403 4403 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 547 547 1641 547 547 547 1641 547 1641 547 547 547 547 547 547 547 1641 547 547 547 1641 547 547 547 547 547 1641 547 1641 547 1641 547 47211
 #
-name: CH_UP
+name: CH+
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 4403 4403 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 547 547 1641 547 547 547 547 547 1641 547 547 547 547 547 547 547 1641 547 547 547 1641 547 1641 547 547 547 1641 547 1641 547 1641 547 47211
 #
-name: CH_DWN
+name: CH-
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 4403 4403 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 1641 547 547 547 547 547 547 547 1641 547 1641 547 1641 547 1641 547 547 547 1641 547 1641 547 1641 547 47237
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 4403 4403 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 1641 547 1641 547 1641 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 1641 547 1641 547 1641 547 1641 547 1641 547 47211
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Scientific_Atlanta/3250HD.ir b/_Pronto_Converted_/S/Scientific_Atlanta/3250HD.ir
index c738f47b..7093bb0e 100644
--- a/_Pronto_Converted_/S/Scientific_Atlanta/3250HD.ir
+++ b/_Pronto_Converted_/S/Scientific_Atlanta/3250HD.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 57571
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Scientific_Atlanta/8300HD_(DVR),_8540HD_(DVR).ir b/_Pronto_Converted_/S/Scientific_Atlanta/8300HD_(DVR),_8540HD_(DVR).ir
index 4d5b3147..c79949f3 100644
--- a/_Pronto_Converted_/S/Scientific_Atlanta/8300HD_(DVR),_8540HD_(DVR).ir
+++ b/_Pronto_Converted_/S/Scientific_Atlanta/8300HD_(DVR),_8540HD_(DVR).ir
@@ -343,7 +343,7 @@ frequency: 58382
 duty_cycle: 0.330000
 data: 3272 3272 822 2535 822 2535 822 822 822 2535 822 2535 822 2535 822 822 822 822 822 822 822 2535 822 2535 822 822 822 822 822 2535 822 822 822 822 822 822 822 2535 822 2535 822 2535 822 822 822 822 822 37169
 #
-name: PIP-ON/OFF
+name: PIP-POWER
 type: raw
 frequency: 58382
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Scientific_Atlanta/DCT4540_4200HD.ir b/_Pronto_Converted_/S/Scientific_Atlanta/DCT4540_4200HD.ir
index 8b4637e8..95989651 100644
--- a/_Pronto_Converted_/S/Scientific_Atlanta/DCT4540_4200HD.ir
+++ b/_Pronto_Converted_/S/Scientific_Atlanta/DCT4540_4200HD.ir
@@ -343,7 +343,7 @@ frequency: 58382
 duty_cycle: 0.330000
 data: 3272 3272 822 2535 822 2535 822 822 822 2535 822 2535 822 2535 822 822 822 822 822 822 822 2535 822 2535 822 822 822 822 822 2535 822 822 822 822 822 822 822 2535 822 2535 822 2535 822 822 822 822 822 37169
 #
-name: PIP-ON/OFF
+name: PIP-POWER
 type: raw
 frequency: 58382
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sharp/LC-20VM2.ir b/_Pronto_Converted_/S/Sharp/LC-20VM2.ir
index 00756d5f..4fde5baa 100644
--- a/_Pronto_Converted_/S/Sharp/LC-20VM2.ir
+++ b/_Pronto_Converted_/S/Sharp/LC-20VM2.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sharp/LC-46D82U.ir b/_Pronto_Converted_/S/Sharp/LC-46D82U.ir
index 9c8c527b..1a98a4a9 100644
--- a/_Pronto_Converted_/S/Sharp/LC-46D82U.ir
+++ b/_Pronto_Converted_/S/Sharp/LC-46D82U.ir
@@ -187,13 +187,13 @@ frequency: 37344
 duty_cycle: 0.330000
 data: 268 1848 268 777 268 777 268 777 268 1848 268 777 268 777 268 777 268 777 268 1848 268 777 268 1848 268 777 268 1848 268 777 268 41747 268 1848 268 777 268 777 268 777 268 1848 268 1848 268 1848 268 1848 268 1848 268 777 268 1848 268 777 268 1848 268 777 268 1848 268 41747 268 1848 268 777 268 777 268 777 268 1848 268 777 268 777 268 777 268 777 268 1848 268 777 268 1848 268 777 268 1848 268 777 268 41747 268 1848 268 777 268 777 268 777 268 1848 268 1848 268 1848 268 1848 268 1848 268 777
 #
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 37344
 duty_cycle: 0.330000
 data: 268 1821 268 777 268 777 268 777 268 1821 268 1821 268 1821 268 777 268 1821 268 777 268 777 268 1821 268 777 268 1821 268 777 268 43943 268 1821 268 777 268 777 268 777 268 1821 268 777 268 777 268 1821 268 777 268 1821 268 1821 268 777 268 1821 268 777 268 1821 268 43943 268 1821 268 777 268 777 268 777 268 1821 268 1821 268 1821 268 777 268 1821 268 777 268 777 268 1821 268 777 268 1821 268 777 268 43943 268 1821 268 777 268 777 268 777 268 1821 268 777 268 777 268 1821 268 777 268 1821 268 1821 268 777
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 37344
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sharp/PG-D100U.ir b/_Pronto_Converted_/S/Sharp/PG-D100U.ir
index 43174e22..95d09bc5 100644
--- a/_Pronto_Converted_/S/Sharp/PG-D100U.ir
+++ b/_Pronto_Converted_/S/Sharp/PG-D100U.ir
@@ -25,7 +25,7 @@ frequency: 39105
 duty_cycle: 0.330000
 data: 256 1764 256 767 256 1764 256 1764 256 767 256 1764 256 767 256 1764 256 767 256 1764 256 767 256 767 256 767 256 1764 256 767 256 42143 256 1764 256 767 256 1764 256 1764 256 767 256 767 256 1764 256 767 256 1764 256 767 256 1764 256 1764 256 1764 256 767 256 1764 256 42143
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sharp/SharpTV_4.ir b/_Pronto_Converted_/S/Sharp/SharpTV_4.ir
index e6a45a04..8c6bb6a6 100644
--- a/_Pronto_Converted_/S/Sharp/SharpTV_4.ir
+++ b/_Pronto_Converted_/S/Sharp/SharpTV_4.ir
@@ -97,7 +97,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 284 1807 284 774 284 1807 284 1807 284 774 284 774 284 1807 284 1807 284 774 284 1807 284 1807 284 774 284 774 284 1807 284 774 284 42437 284 1807 284 774 284 1807 284 1807 284 774 284 1807 284 774 284 774 284 1807 284 774 284 774 284 1807 284 1807 284 774 284 1807 284 42437
 #
-name: KEY_S
+name: S
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sharp/VC-A588U.ir b/_Pronto_Converted_/S/Sharp/VC-A588U.ir
index 69457c72..eaf71adf 100644
--- a/_Pronto_Converted_/S/Sharp/VC-A588U.ir
+++ b/_Pronto_Converted_/S/Sharp/VC-A588U.ir
@@ -25,13 +25,13 @@ frequency: 41870
 duty_cycle: 0.330000
 data: 263 1720 263 1720 263 740 263 740 263 740 263 1720 263 740 263 1720 263 1720 263 740 263 740 263 740 263 1720 263 1720 263 740 263 40912 263 1720 263 1720 263 740 263 740 263 740 263 740 263 1720 263 740 263 740 263 1720 263 1720 263 1720 263 740 263 740 263 1720 263 40912
 #
-name: CH_DWN
+name: CH-
 type: raw
 frequency: 41870
 duty_cycle: 0.330000
 data: 263 1720 263 1720 263 740 263 740 263 740 263 740 263 1720 263 740 263 740 263 1720 263 740 263 740 263 740 263 1720 263 740 263 46907 263 1720 263 1720 263 740 263 740 263 740 263 1720 263 740 263 1720 263 1720 263 740 263 1720 263 1720 263 1720 263 740 263 1720 263 38930
 #
-name: CH_UP
+name: CH+
 type: raw
 frequency: 41870
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sharp/VC-NX1.ir b/_Pronto_Converted_/S/Sharp/VC-NX1.ir
index 5d42d787..aa5e9003 100644
--- a/_Pronto_Converted_/S/Sharp/VC-NX1.ir
+++ b/_Pronto_Converted_/S/Sharp/VC-NX1.ir
@@ -289,7 +289,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 263 1841 263 789 263 789 263 789 263 789 263 789 263 1841 263 789 263 789 263 1841 263 789 263 789 263 789 263 1841 263 789 263 45045 263 1841 263 789 263 789 263 789 263 789 263 1841 263 789 263 1841 263 1841 263 789 263 1841 263 1841 263 1841 263 789 263 1841 263 45045
 #
-name: SHUTTLE-ON/OFF
+name: SHUTTLE-POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sharp/XG-NV5XU.ir b/_Pronto_Converted_/S/Sharp/XG-NV5XU.ir
index 40372513..4628181c 100644
--- a/_Pronto_Converted_/S/Sharp/XG-NV5XU.ir
+++ b/_Pronto_Converted_/S/Sharp/XG-NV5XU.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: raw
 frequency: 39105
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sonance/iPort.ir b/_Pronto_Converted_/S/Sonance/iPort.ir
index 7a4acdea..4b5b7b99 100644
--- a/_Pronto_Converted_/S/Sonance/iPort.ir
+++ b/_Pronto_Converted_/S/Sonance/iPort.ir
@@ -1,13 +1,13 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power_Off
+name: POWER_Off
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 547 1667 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 40854 8937 2241 547 95620
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -49,7 +49,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4481 573 1667 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 573 1667 573 1667 573 1667 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 573 573 573 573 573 573 1667 573 573 573 573 573 1667 573 573 573 1667 573 1667 573 1667 573 573 573 1667 573 1667 573 40854 8937 2241 573 95620
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/BDPS1.ir b/_Pronto_Converted_/S/Sony/BDPS1.ir
index 9c687e5c..bbbcecf2 100644
--- a/_Pronto_Converted_/S/Sony/BDPS1.ir
+++ b/_Pronto_Converted_/S/Sony/BDPS1.ir
@@ -145,7 +145,7 @@ frequency: 39857
 duty_cycle: 0.330000
 data: 2384 602 1204 602 602 602 602 602 1204 602 602 602 1204 602 1204 602 602 602 1204 602 602 602 1204 602 1204 602 602 602 1204 602 602 602 602 602 602 602 1204 602 1204 602 1204 12093
 #
-name: TV_Power
+name: TV_POWER
 type: raw
 frequency: 39857
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/CD_CDV_LD_PLAYER.ir b/_Pronto_Converted_/S/Sony/CD_CDV_LD_PLAYER.ir
index 65337e44..c0448343 100644
--- a/_Pronto_Converted_/S/Sony/CD_CDV_LD_PLAYER.ir
+++ b/_Pronto_Converted_/S/Sony/CD_CDV_LD_PLAYER.ir
@@ -235,13 +235,13 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2361 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 1193 596 596 596 596 24351
 #
-name: KEY_CONTROL_#
+name: CONTROL_#
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 596 596 596 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 1193 596 596 596 596 25519
 #
-name: KEY_CONTROL_B
+name: CONTROL_B
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/DISCREET_CODES.ir b/_Pronto_Converted_/S/Sony/DISCREET_CODES.ir
index 32178d78..94738958 100644
--- a/_Pronto_Converted_/S/Sony/DISCREET_CODES.ir
+++ b/_Pronto_Converted_/S/Sony/DISCREET_CODES.ir
@@ -235,7 +235,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2362 591 1181 591 591 591 591 591 1181 591 591 591 591 591 1181 591 1181 591 591 591 591 591 591 591 591 25444
 #
-name: TV-INTERIOR-SPEAKERS-ON/OFF
+name: TV-INTERIOR-SPEAKERS-POWER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/DVP-S400D.ir b/_Pronto_Converted_/S/Sony/DVP-S400D.ir
index 03a6a547..953e67ac 100644
--- a/_Pronto_Converted_/S/Sony/DVP-S400D.ir
+++ b/_Pronto_Converted_/S/Sony/DVP-S400D.ir
@@ -259,7 +259,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 1193 596 596 596 1193 596 1193 596 1193 596 1193 596 596 596 1193 596 596 596 1193 596 1193 596 1193 596 596 596 596 596 1193 596 596 596 596 596 1193 596 596 11356
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/DVP-S7700.ir b/_Pronto_Converted_/S/Sony/DVP-S7700.ir
index c50931da..bd089120 100644
--- a/_Pronto_Converted_/S/Sony/DVP-S7700.ir
+++ b/_Pronto_Converted_/S/Sony/DVP-S7700.ir
@@ -145,7 +145,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2410 572 1193 572 1193 572 572 572 572 572 572 572 1193 572 1193 572 572 572 1193 572 572 572 1193 572 1193 572 1193 572 572 572 572 572 1193 572 572 572 572 572 1193 572 572 12499
 #
-name: SUBTITLE-ON/OFF
+name: SUBTITLE-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/EV-S3000.ir b/_Pronto_Converted_/S/Sony/EV-S3000.ir
index 95f08e84..5ad75386 100644
--- a/_Pronto_Converted_/S/Sony/EV-S3000.ir
+++ b/_Pronto_Converted_/S/Sony/EV-S3000.ir
@@ -13,7 +13,7 @@ frequency: 43633
 duty_cycle: 0.330000
 data: 2315 665 1192 665 1192 665 665 665 665 665 665 665 1192 665 1192 665 665 665 1192 665 665 665 665 665 665 25164
 #
-name: TIMER-REC-ON/OFF
+name: TIMER-REC-POWER
 type: raw
 frequency: 43633
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/HVR-M15U.ir b/_Pronto_Converted_/S/Sony/HVR-M15U.ir
index 1597ed94..b2c9acdc 100644
--- a/_Pronto_Converted_/S/Sony/HVR-M15U.ir
+++ b/_Pronto_Converted_/S/Sony/HVR-M15U.ir
@@ -7,7 +7,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 1193 596 596 596 596 596 1193 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 1193 596 596 596 596 13070
 #
-name: power
+name: POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/MDP-455.ir b/_Pronto_Converted_/S/Sony/MDP-455.ir
index c7925c3a..11753fea 100644
--- a/_Pronto_Converted_/S/Sony/MDP-455.ir
+++ b/_Pronto_Converted_/S/Sony/MDP-455.ir
@@ -7,7 +7,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 596 24973
 #
-name: Power
+name: POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
@@ -205,7 +205,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 596 596 1193 596 596 596 596 596 1193 596 596 596 1193 596 596 596 596 596 596 596 596 25569
 #
-name: Tv-power
+name: Tv-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/PFM-42B2.ir b/_Pronto_Converted_/S/Sony/PFM-42B2.ir
index 9263a3ba..9e628041 100644
--- a/_Pronto_Converted_/S/Sony/PFM-42B2.ir
+++ b/_Pronto_Converted_/S/Sony/PFM-42B2.ir
@@ -127,7 +127,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2362 591 591 591 1181 591 1181 591 1181 591 1181 591 1181 591 1181 591 1181 591 1181 591 1181 591 591 591 1181 591 1181 591 1181 591 591 17126
 #
-name: ON
+POWER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/PSM500A1WU.ir b/_Pronto_Converted_/S/Sony/PSM500A1WU.ir
index 1c35624e..997b901b 100644
--- a/_Pronto_Converted_/S/Sony/PSM500A1WU.ir
+++ b/_Pronto_Converted_/S/Sony/PSM500A1WU.ir
@@ -199,7 +199,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 596 596 1193 596 596 596 1193 596 1193 596 1193 596 1193 596 596 596 596 596 596 596 596 24451
 #
-name: ON
+POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/PfM-W500A.ir b/_Pronto_Converted_/S/Sony/PfM-W500A.ir
index 1c35624e..997b901b 100644
--- a/_Pronto_Converted_/S/Sony/PfM-W500A.ir
+++ b/_Pronto_Converted_/S/Sony/PfM-W500A.ir
@@ -199,7 +199,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 596 596 1193 596 596 596 1193 596 1193 596 1193 596 1193 596 596 596 596 596 596 596 596 24451
 #
-name: ON
+POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/RDR-VX530.ir b/_Pronto_Converted_/S/Sony/RDR-VX530.ir
index 20df441f..da251c47 100644
--- a/_Pronto_Converted_/S/Sony/RDR-VX530.ir
+++ b/_Pronto_Converted_/S/Sony/RDR-VX530.ir
@@ -205,7 +205,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2362 566 1181 566 566 566 566 566 566 566 1181 566 566 566 566 566 566 566 1181 566 566 566 1181 566 1181 566 1181 566 1181 566 566 566 1181 566 566 566 566 566 566 566 566 13903
 #
-name: power
+name: POWER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SAT-T60.ir b/_Pronto_Converted_/S/Sony/SAT-T60.ir
index d12deb61..8a246c1e 100644
--- a/_Pronto_Converted_/S/Sony/SAT-T60.ir
+++ b/_Pronto_Converted_/S/Sony/SAT-T60.ir
@@ -211,7 +211,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 1193 596 596 596 1193 596 1193 596 596 596 1193 596 1193 596 1193 596 1193 596 596 596 1193 596 1193 596 596 596 1193 18462
 #
-name: REC-ON/OFF
+name: REC-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SAT_B55.ir b/_Pronto_Converted_/S/Sony/SAT_B55.ir
index e3812ede..962f0af5 100644
--- a/_Pronto_Converted_/S/Sony/SAT_B55.ir
+++ b/_Pronto_Converted_/S/Sony/SAT_B55.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Satellite-power
+name: Satellite-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SLV-640HF.ir b/_Pronto_Converted_/S/Sony/SLV-640HF.ir
index b921d64a..fabe18f8 100644
--- a/_Pronto_Converted_/S/Sony/SLV-640HF.ir
+++ b/_Pronto_Converted_/S/Sony/SLV-640HF.ir
@@ -211,7 +211,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 1193 596 1193 596 596 596 1193 596 596 23929
 #
-name: TIMER/REC-ON/OFF
+name: TIMER/REC-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SLV-705_ETC.ir b/_Pronto_Converted_/S/Sony/SLV-705_ETC.ir
index df349728..2af26141 100644
--- a/_Pronto_Converted_/S/Sony/SLV-705_ETC.ir
+++ b/_Pronto_Converted_/S/Sony/SLV-705_ETC.ir
@@ -313,7 +313,7 @@ frequency: 39857
 duty_cycle: 0.330000
 data: 2409 652 1204 652 1204 652 652 652 652 652 652 652 1204 652 1204 652 1204 652 1204 652 652 652 1204 652 652 23158
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 39857
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SLV-BL100.ir b/_Pronto_Converted_/S/Sony/SLV-BL100.ir
index f0ae51ef..bbd3b5d1 100644
--- a/_Pronto_Converted_/S/Sony/SLV-BL100.ir
+++ b/_Pronto_Converted_/S/Sony/SLV-BL100.ir
@@ -253,7 +253,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2387 591 591 591 1206 591 591 591 591 591 591 591 1206 591 1206 591 591 591 1206 591 591 591 1206 591 1206 591 1206 591 1206 591 591 591 591 591 1206 591 591 591 1206 591 591 12131
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SLV-D500P.ir b/_Pronto_Converted_/S/Sony/SLV-D500P.ir
index 03cfdef2..b5c0aa12 100644
--- a/_Pronto_Converted_/S/Sony/SLV-D500P.ir
+++ b/_Pronto_Converted_/S/Sony/SLV-D500P.ir
@@ -259,7 +259,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2362 591 591 591 1206 591 591 591 591 591 591 591 1206 591 1206 591 591 591 1206 591 591 591 1206 591 1206 591 1206 591 1206 591 591 591 591 591 1206 591 591 591 1206 591 591 12107
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SLV-D500P_1.ir b/_Pronto_Converted_/S/Sony/SLV-D500P_1.ir
index 6a2e9324..45f1b888 100644
--- a/_Pronto_Converted_/S/Sony/SLV-D500P_1.ir
+++ b/_Pronto_Converted_/S/Sony/SLV-D500P_1.ir
@@ -259,7 +259,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2387 591 591 591 1206 591 591 591 591 591 591 591 1206 591 1206 591 591 591 1206 591 591 591 1206 591 1206 591 1206 591 1206 591 591 591 591 591 1206 591 591 591 1206 591 591 12131
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SLV700HF.ir b/_Pronto_Converted_/S/Sony/SLV700HF.ir
index 4d4dc445..00aa59a8 100644
--- a/_Pronto_Converted_/S/Sony/SLV700HF.ir
+++ b/_Pronto_Converted_/S/Sony/SLV700HF.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SLVD-300P.ir b/_Pronto_Converted_/S/Sony/SLVD-300P.ir
index 22b505bf..2008aa4a 100644
--- a/_Pronto_Converted_/S/Sony/SLVD-300P.ir
+++ b/_Pronto_Converted_/S/Sony/SLVD-300P.ir
@@ -253,7 +253,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2387 591 591 591 1206 591 591 591 591 591 591 591 1206 591 1206 591 591 591 1206 591 591 591 1206 591 1206 591 1206 591 1206 591 591 591 591 591 1206 591 591 591 1206 591 591 12131
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SLVR-1000.ir b/_Pronto_Converted_/S/Sony/SLVR-1000.ir
index 4b60b21c..aa49af9f 100644
--- a/_Pronto_Converted_/S/Sony/SLVR-1000.ir
+++ b/_Pronto_Converted_/S/Sony/SLVR-1000.ir
@@ -79,7 +79,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 24799 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 24799 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 24799 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 24799 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 24799 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 18164
 #
-name: TIMER-RECORD-ON/OFF
+name: TIMER-RECORD-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/STR-3070.ir b/_Pronto_Converted_/S/Sony/STR-3070.ir
index 8881c746..f099d9c3 100644
--- a/_Pronto_Converted_/S/Sony/STR-3070.ir
+++ b/_Pronto_Converted_/S/Sony/STR-3070.ir
@@ -55,13 +55,13 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2361 596 1193 596 596 596 596 596 1193 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 596 1193 24351
 #
-name: On-screen--On/off
+name: On-screen--POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 2361 596 1193 596 1193 596 596 596 596 596 1193 596 596 596 1193 596 596 596 596 596 596 596 596 596 1193 24948
 #
-name: Titler-on/off
+name: Titler-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
@@ -133,7 +133,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2361 596 1193 596 596 596 1193 596 596 596 1193 596 596 596 1193 596 596 596 1193 596 596 596 596 596 1193 24351
 #
-name: On/off
+name: POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
@@ -151,7 +151,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2361 596 596 596 1193 596 596 596 1193 596 596 596 596 596 1193 596 596 596 1193 596 596 596 596 596 1193 24948
 #
-name: EQ-On/Off
+name: EQ-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
@@ -229,7 +229,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2361 596 596 596 596 596 1193 596 596 596 596 596 596 596 1193 596 596 596 596 596 596 596 596 596 1193 26141
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/STR-BE695.ir b/_Pronto_Converted_/S/Sony/STR-BE695.ir
index 803b2969..777897ba 100644
--- a/_Pronto_Converted_/S/Sony/STR-BE695.ir
+++ b/_Pronto_Converted_/S/Sony/STR-BE695.ir
@@ -295,7 +295,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 596 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 1193 596 1193 596 596 596 1193 596 596 24525
 #
-name: KEY_ENTER
+name: ENTER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/STR-DE505_(RECEIVER_AND_TUNER_ONLY).ir b/_Pronto_Converted_/S/Sony/STR-DE505_(RECEIVER_AND_TUNER_ONLY).ir
index b1375428..83c29641 100644
--- a/_Pronto_Converted_/S/Sony/STR-DE505_(RECEIVER_AND_TUNER_ONLY).ir
+++ b/_Pronto_Converted_/S/Sony/STR-DE505_(RECEIVER_AND_TUNER_ONLY).ir
@@ -127,7 +127,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 621 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 24898
 #
-name: SURR-ON/OFF
+name: SURR-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/STR-GA8ES_RECEIVER_FNX.ir b/_Pronto_Converted_/S/Sony/STR-GA8ES_RECEIVER_FNX.ir
index 702224c4..e6598d49 100644
--- a/_Pronto_Converted_/S/Sony/STR-GA8ES_RECEIVER_FNX.ir
+++ b/_Pronto_Converted_/S/Sony/STR-GA8ES_RECEIVER_FNX.ir
@@ -97,7 +97,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 596 596 596 596 1193 596 596 596 1193 596 596 596 596 596 596 596 596 596 596 596 596 596 1193 26364
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/STS-200E.ir b/_Pronto_Converted_/S/Sony/STS-200E.ir
index 0e03bd05..8c90731c 100644
--- a/_Pronto_Converted_/S/Sony/STS-200E.ir
+++ b/_Pronto_Converted_/S/Sony/STS-200E.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
@@ -247,7 +247,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 596 596 596 596 1193 596 596 596 1193 596 1193 596 1193 596 596 596 596 596 1193 596 1193 596 596 24451
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SVO-1620.ir b/_Pronto_Converted_/S/Sony/SVO-1620.ir
index 93af6e84..c14e1e7a 100644
--- a/_Pronto_Converted_/S/Sony/SVO-1620.ir
+++ b/_Pronto_Converted_/S/Sony/SVO-1620.ir
@@ -157,7 +157,7 @@ frequency: 121916
 duty_cycle: 0.330000
 data: 2362 591 1181 591 1181 591 591 591 591 591 591 591 1181 591 1181 591 1181 591 1181 591 591 591 1181 591 591 23672
 #
-name: REC-ON/OFF
+name: REC-POWER
 type: raw
 frequency: 121916
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SVO-1620_1.ir b/_Pronto_Converted_/S/Sony/SVO-1620_1.ir
index 1abc3e0f..58f319fd 100644
--- a/_Pronto_Converted_/S/Sony/SVO-1620_1.ir
+++ b/_Pronto_Converted_/S/Sony/SVO-1620_1.ir
@@ -13,7 +13,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 596 596 1193 596 596 596 1193 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 596 24451
 #
-name: TIMER-REC-ON/OFF
+name: TIMER-REC-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SonyDVD.ir b/_Pronto_Converted_/S/Sony/SonyDVD.ir
index 705f38b5..a98b5f33 100644
--- a/_Pronto_Converted_/S/Sony/SonyDVD.ir
+++ b/_Pronto_Converted_/S/Sony/SonyDVD.ir
@@ -463,7 +463,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2362 591 591 591 591 591 591 591 1181 591 1181 591 1181 591 591 591 1181 591 591 591 591 591 591 591 591 25567
 #
-name: TV-INTERIOR-SPEAKERS-ON/OFF
+name: TV-INTERIOR-SPEAKERS-POWER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/SonyTV_7.ir b/_Pronto_Converted_/S/Sony/SonyTV_7.ir
index 936ccd73..a23fc96c 100644
--- a/_Pronto_Converted_/S/Sony/SonyTV_7.ir
+++ b/_Pronto_Converted_/S/Sony/SonyTV_7.ir
@@ -85,13 +85,13 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2338 591 591 591 1181 591 591 591 591 591 1181 591 591 591 591 591 1181 591 591 591 591 591 591 591 591 26009
 #
-name: Power_On
+name: POWER_On
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
 data: 2338 591 591 591 1181 591 1181 591 1181 591 591 591 1181 591 591 591 1181 591 591 591 591 591 591 591 591 24828
 #
-name: Power_OFF
+name: POWER_OFF
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/Sony_RDR-VX515.ir b/_Pronto_Converted_/S/Sony/Sony_RDR-VX515.ir
index ee9d91f4..deacfa53 100644
--- a/_Pronto_Converted_/S/Sony/Sony_RDR-VX515.ir
+++ b/_Pronto_Converted_/S/Sony/Sony_RDR-VX515.ir
@@ -163,13 +163,13 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 596 596 596 596 596 596 1193 596 596 596 596 596 1193 596 596 596 596 596 596 596 596 26414
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 596 596 1193 596 596 596 596 596 1193 596 596 596 596 596 1193 596 596 596 596 596 596 596 596 26414
 #
-name: VOL_DOWN
+name: VOL-
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/TBD_1.ir b/_Pronto_Converted_/S/Sony/TBD_1.ir
index 3a44d962..92639f00 100644
--- a/_Pronto_Converted_/S/Sony/TBD_1.ir
+++ b/_Pronto_Converted_/S/Sony/TBD_1.ir
@@ -85,13 +85,13 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 596 596 596 596 596 596 1193 596 596 596 596 596 1193 596 596 596 596 596 596 596 596 26215
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 596 596 1193 596 596 596 596 596 1193 596 596 596 596 596 1193 596 596 596 596 596 596 596 596 26215
 #
-name: VOL_DOWN
+name: VOL-
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/TU_1041_TV_TUNER.ir b/_Pronto_Converted_/S/Sony/TU_1041_TV_TUNER.ir
index 3ab9a54b..fdcbbd8f 100644
--- a/_Pronto_Converted_/S/Sony/TU_1041_TV_TUNER.ir
+++ b/_Pronto_Converted_/S/Sony/TU_1041_TV_TUNER.ir
@@ -187,7 +187,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 596 1193 596 596 596 596 596 596 596 596 25619
 #
-name: ON
+POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/VCR_SLV-940HE_COMMAND_MODE_VTR-1.ir b/_Pronto_Converted_/S/Sony/VCR_SLV-940HE_COMMAND_MODE_VTR-1.ir
index 50734cda..9d06da86 100644
--- a/_Pronto_Converted_/S/Sony/VCR_SLV-940HE_COMMAND_MODE_VTR-1.ir
+++ b/_Pronto_Converted_/S/Sony/VCR_SLV-940HE_COMMAND_MODE_VTR-1.ir
@@ -235,7 +235,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 596 596 1193 596 596 596 596 596 596 25097
 #
-name: REC-ON/OFF
+name: REC-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/VCR_SLV-940HE_COMMAND_MODE_VTR-2.ir b/_Pronto_Converted_/S/Sony/VCR_SLV-940HE_COMMAND_MODE_VTR-2.ir
index cefb4ffb..45eedb85 100644
--- a/_Pronto_Converted_/S/Sony/VCR_SLV-940HE_COMMAND_MODE_VTR-2.ir
+++ b/_Pronto_Converted_/S/Sony/VCR_SLV-940HE_COMMAND_MODE_VTR-2.ir
@@ -193,7 +193,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 2385 596 1193 596 1193 596 596 596 596 596 596 596 1193 596 1193 596 1193 596 1193 596 1193 596 596 596 596 23904
 #
-name: REC-ON/OFF
+name: REC-POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/VPH-G90U.ir b/_Pronto_Converted_/S/Sony/VPH-G90U.ir
index 403efd94..a18c9e8a 100644
--- a/_Pronto_Converted_/S/Sony/VPH-G90U.ir
+++ b/_Pronto_Converted_/S/Sony/VPH-G90U.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: ON
+POWER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/VPL-500Q.ir b/_Pronto_Converted_/S/Sony/VPL-500Q.ir
index 51ef4970..c7efc7d6 100644
--- a/_Pronto_Converted_/S/Sony/VPL-500Q.ir
+++ b/_Pronto_Converted_/S/Sony/VPL-500Q.ir
@@ -31,13 +31,13 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2387 591 1181 591 1181 591 591 591 1181 591 1181 591 1181 591 1181 591 591 591 591 591 1181 591 591 591 1181 591 591 591 1181 591 591 18972
 #
-name: VOLUME_+
+name: VOL+
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
 data: 2387 591 591 591 1181 591 591 591 591 591 1181 591 591 591 591 591 591 591 591 591 1181 591 591 591 1181 591 591 591 1181 591 591 21359
 #
-name: VOLUME_-
+name: VOL-
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/VPL-X2000U.ir b/_Pronto_Converted_/S/Sony/VPL-X2000U.ir
index 5d561235..85657640 100644
--- a/_Pronto_Converted_/S/Sony/VPL-X2000U.ir
+++ b/_Pronto_Converted_/S/Sony/VPL-X2000U.ir
@@ -205,7 +205,7 @@ frequency: 40639
 duty_cycle: 0.330000
 data: 2387 591 1206 591 1206 591 1206 591 1206 591 591 591 1206 591 591 591 591 591 591 591 1206 591 591 591 1206 591 591 591 1206 591 591 19341
 #
-name: ON
+POWER
 type: raw
 frequency: 40639
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/Sony/VPL-X2000U_1.ir b/_Pronto_Converted_/S/Sony/VPL-X2000U_1.ir
index 0aad3e5b..deb2de90 100644
--- a/_Pronto_Converted_/S/Sony/VPL-X2000U_1.ir
+++ b/_Pronto_Converted_/S/Sony/VPL-X2000U_1.ir
@@ -205,7 +205,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 10098 2524 5049 2524 5049 2524 5049 2524 5049 2524 2524 2524 5049 2524 2524 2524 2524 2524 2524 2524 5049 2524 2524 2524 5049 2524 2524 2524 5049 2524 2524 82674
 #
-name: ON
+POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/S/SunBriteTV/3220HD_-_2310HD.ir b/_Pronto_Converted_/S/SunBriteTV/3220HD_-_2310HD.ir
index aadf0bb3..55093915 100644
--- a/_Pronto_Converted_/S/SunBriteTV/3220HD_-_2310HD.ir
+++ b/_Pronto_Converted_/S/SunBriteTV/3220HD_-_2310HD.ir
@@ -91,25 +91,25 @@ frequency: 32133
 duty_cycle: 0.330000
 data: 3174 778 1556 778 778 778 778 778 1556 778 778 778 778 778 778 778 1556 778 778 778 778 778 778 778 778 32459
 #
-name: CHAN_UP
+name: CH+
 type: raw
 frequency: 31403
 duty_cycle: 0.330000
 data: 3089 764 764 764 764 764 764 764 764 764 1624 764 764 764 764 764 1624 764 764 764 764 764 764 764 764 32927
 #
-name: CHAN_DOWN
+name: CH-
 type: raw
 frequency: 30037
 duty_cycle: 0.330000
 data: 3263 766 1565 766 766 766 766 766 766 766 1565 766 766 766 766 766 1565 766 766 766 766 766 766 766 766 33059
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 32133
 duty_cycle: 0.330000
 data: 2988 778 778 778 1556 778 778 778 778 778 1556 778 778 778 778 778 1556 778 778 778 778 778 778 778 778 32397
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 33429
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/TASCAM/CD-450_(WIRED).ir b/_Pronto_Converted_/T/TASCAM/CD-450_(WIRED).ir
index c89d500f..0214c000 100644
--- a/_Pronto_Converted_/T/TASCAM/CD-450_(WIRED).ir
+++ b/_Pronto_Converted_/T/TASCAM/CD-450_(WIRED).ir
@@ -91,7 +91,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8937 4455 573 1694 573 573 573 573 573 573 573 573 573 573 573 573 573 1667 573 573 573 573 573 1667 573 1667 573 573 573 1667 573 573 573 573 573 1667 573 573 573 573 573 573 573 573 573 573 573 1667 573 573 573 573 573 1667 573 1667 573 1667 573 1667 573 1667 573 573 573 1667 573 42990 8963 2241 573 95516 8963 2241 573 95516 8963 2241 573 95516 8963 2241 573 95516 8963 2241 573 95516
 #
-name: PITCH-ON/OFF
+name: PITCH-POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_TV.ir b/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_TV.ir
index 867ab594..020072a5 100644
--- a/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_TV.ir
+++ b/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_TV.ir
@@ -163,7 +163,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 1297 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 432 432 432 432 1297 432 74169
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_VCR.ir b/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_VCR.ir
index 99decd35..50d77d96 100644
--- a/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_VCR.ir
+++ b/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_VCR.ir
@@ -163,7 +163,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 1297 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 432 432 432 432 1297 432 74169
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_VDP.ir b/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_VDP.ir
index c7b2f3b0..bd323a60 100644
--- a/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_VDP.ir
+++ b/_Pronto_Converted_/T/Technics/AUDIO_REMOTE_FOR_VDP.ir
@@ -151,7 +151,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 1297 432 432 432 432 432 432 432 1297 432 432 432 432 432 1297 432 432 432 432 432 1297 432 74169
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Technics/SA-AX610.ir b/_Pronto_Converted_/T/Technics/SA-AX610.ir
index f1aaf496..83fd1530 100644
--- a/_Pronto_Converted_/T/Technics/SA-AX610.ir
+++ b/_Pronto_Converted_/T/Technics/SA-AX610.ir
@@ -109,7 +109,7 @@ frequency: 37344
 duty_cycle: 0.330000
 data: 3481 1714 428 428 428 1312 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1312 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1312 428 428 428 1312 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1312 428 428 428 428 428 1312 428 1312 428 1312 428 428 428 428 428 1312 428 428 428 428 428 1312 428 1312 428 428 428 428 428 1312 428 74041
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37344
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Technics/SA-AX710.ir b/_Pronto_Converted_/T/Technics/SA-AX710.ir
index 08eb3a58..e71abc38 100644
--- a/_Pronto_Converted_/T/Technics/SA-AX710.ir
+++ b/_Pronto_Converted_/T/Technics/SA-AX710.ir
@@ -109,7 +109,7 @@ frequency: 37344
 duty_cycle: 0.330000
 data: 3481 1714 428 428 428 1312 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1312 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1312 428 428 428 1312 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 428 1312 428 428 428 428 428 1312 428 1312 428 1312 428 428 428 428 428 1312 428 428 428 428 428 1312 428 1312 428 428 428 428 428 1312 428 74041
 #
-name: OFF/ON
+name: POWER
 type: raw
 frequency: 37344
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Technics/SAAX530.ir b/_Pronto_Converted_/T/Technics/SAAX530.ir
index 6c479be5..a7a97834 100644
--- a/_Pronto_Converted_/T/Technics/SAAX530.ir
+++ b/_Pronto_Converted_/T/Technics/SAAX530.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
@@ -199,7 +199,7 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 1297 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 1297 432 1297 432 1297 432 432 432 432 432 71332 3459 1729 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 432 432 432 432 1297 432 432 432 432 432 432 432 432 432 1297 432 432 432 1297 432 432 432 1297 432 432 432 432 432 1297 432 1297 432 432 432 1297 432 1297 432 1297 432 1297 432 432 432 432 432 71332
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 37010
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Technics/SLPD8.ir b/_Pronto_Converted_/T/Technics/SLPD8.ir
index 54b1c5ad..8b2717bf 100644
--- a/_Pronto_Converted_/T/Technics/SLPD8.ir
+++ b/_Pronto_Converted_/T/Technics/SLPD8.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 36683
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Toshiba/HDA2.ir b/_Pronto_Converted_/T/Toshiba/HDA2.ir
index 8bf86f42..378688cf 100644
--- a/_Pronto_Converted_/T/Toshiba/HDA2.ir
+++ b/_Pronto_Converted_/T/Toshiba/HDA2.ir
@@ -67,13 +67,13 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4481 573 1667 573 573 573 1667 573 573 573 573 573 573 573 1667 573 573 573 1667 573 573 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 573 573 573 573 1667 573 573 573 573 573 573 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 39890 8911 2215 573 95698
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4481 573 1667 573 573 573 1667 573 573 573 573 573 573 573 1667 573 573 573 1667 573 573 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 573 573 1667 573 573 573 573 573 1667 573 573 573 573 573 573 573 1667 573 573 573 1667 573 1667 573 573 573 1667 573 1667 573 1667 573 39890 8911 2215 573 95698
 #
-name: TV_Power
+name: TV_POWER
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
@@ -97,13 +97,13 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 8957 4491 568 568 568 568 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 1678 568 1678 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 568 1678 568 1678 568 1678 568 39210 8957 2220 568 95586
 #
-name: TV_Volume_+
+name: TV_VOL+
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
 data: 8957 4491 568 568 568 568 568 568 568 568 568 568 568 568 568 1678 568 568 568 1678 568 1678 568 1678 568 1678 568 1678 568 1678 568 568 568 1678 568 568 568 1678 568 568 568 1678 568 1678 568 568 568 568 568 568 568 1678 568 568 568 1678 568 568 568 568 568 1678 568 1678 568 1678 568 39210 8957 2220 568 95586
 #
-name: TV_Volume_-
+name: TV_VOL-
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/Toshiba/SE-R3006_(SAME_AS_MERIDIAN_586)_1.ir b/_Pronto_Converted_/T/Toshiba/SE-R3006_(SAME_AS_MERIDIAN_586)_1.ir
index 9428038a..41722ffb 100644
--- a/_Pronto_Converted_/T/Toshiba/SE-R3006_(SAME_AS_MERIDIAN_586)_1.ir
+++ b/_Pronto_Converted_/T/Toshiba/SE-R3006_(SAME_AS_MERIDIAN_586)_1.ir
@@ -97,7 +97,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 8802 4440 568 1652 568 568 568 1652 568 568 568 568 568 568 568 1652 568 568 568 568 568 1652 568 568 568 1652 568 1652 568 1652 568 568 568 1652 568 568 568 568 568 1652 568 568 568 568 568 568 568 568 568 1652 568 1652 568 1652 568 568 568 1652 568 1652 568 1652 568 1652 568 568 568 39236 8802 2220 568 94528
 #
-name: CH_UP
+name: CH+
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/T/tvONE/1T-SW8x1CVR.ir b/_Pronto_Converted_/T/tvONE/1T-SW8x1CVR.ir
index 7bf8c6a0..1b354157 100644
--- a/_Pronto_Converted_/T/tvONE/1T-SW8x1CVR.ir
+++ b/_Pronto_Converted_/T/tvONE/1T-SW8x1CVR.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/V/Velodyne/DEQ_Series.ir b/_Pronto_Converted_/V/Velodyne/DEQ_Series.ir
index 0f42611d..3058157b 100644
--- a/_Pronto_Converted_/V/Velodyne/DEQ_Series.ir
+++ b/_Pronto_Converted_/V/Velodyne/DEQ_Series.ir
@@ -49,13 +49,13 @@ frequency: 28198
 duty_cycle: 0.330000
 data: 12129 6064 745 745 745 745 745 745 745 745 745 745 745 745 745 745 745 745 745 2270 745 2270 745 2270 745 2270 745 2270 745 2270 745 2270 745 2270 745 745 745 745 745 745 745 2270 745 745 745 745 745 745 745 745 745 2270 745 2270 745 2270 745 745 745 2270 745 2270 745 2270 745 2270 745 53408 12129 3085 745 745
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 28987
 duty_cycle: 0.330000
 data: 11764 5899 759 759 759 759 759 759 759 759 759 759 759 759 759 759 759 759 759 2346 759 2346 759 2346 759 2346 759 2346 759 2346 759 2346 759 2346 759 2346 759 2346 759 759 759 2346 759 759 759 759 759 759 759 759 759 759 759 759 759 2346 759 759 759 2346 759 2346 759 2346 759 2346 759 57060 11764 3243 759 759
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 28008
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/V/Velodyne/DLSR_Series.ir b/_Pronto_Converted_/V/Velodyne/DLSR_Series.ir
index 0d00d5c1..4746a2d5 100644
--- a/_Pronto_Converted_/V/Velodyne/DLSR_Series.ir
+++ b/_Pronto_Converted_/V/Velodyne/DLSR_Series.ir
@@ -43,13 +43,13 @@ frequency: 27634
 duty_cycle: 0.330000
 data: 12412 6260 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 796 796 796 796 796 796 2352 796 796 796 796 796 796 796 796 796 2352 796 2352 796 2352 796 796 796 2352 796 2352 796 2352 796 2352 796 55982 12412 3148 796 796
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 27634
 duty_cycle: 0.330000
 data: 12340 6260 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 2352 796 796 796 2352 796 796 796 796 796 796 796 796 796 796 796 796 796 2352 796 796 796 2352 796 2352 796 2352 796 2352 796 55294 12340 3076 796 796
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 27634
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/V/Velodyne/Digital_Drive_Series.ir b/_Pronto_Converted_/V/Velodyne/Digital_Drive_Series.ir
index 2717152b..e3c0c00b 100644
--- a/_Pronto_Converted_/V/Velodyne/Digital_Drive_Series.ir
+++ b/_Pronto_Converted_/V/Velodyne/Digital_Drive_Series.ir
@@ -91,13 +91,13 @@ frequency: 27271
 duty_cycle: 0.330000
 data: 293 1430 293 1430 293 1100 293 3997 293 2640 293 1100 293 1100 293 3227 293 114297 293 1430 293 3227 293 1100 293 3997 293 2640 293 2640 293 1100 293 3227 293 293
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 27634
 duty_cycle: 0.330000
 data: 289 1230 289 1230 289 1049 289 3546 289 2569 289 1049 289 1049 289 3546 289 110914 289 1230 289 2569 289 1049 289 3546 289 2569 289 2569 289 1049 289 3546 289 289
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 27451
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/V/Velodyne/Optimum_Series.ir b/_Pronto_Converted_/V/Velodyne/Optimum_Series.ir
index 43140c9e..843f688a 100644
--- a/_Pronto_Converted_/V/Velodyne/Optimum_Series.ir
+++ b/_Pronto_Converted_/V/Velodyne/Optimum_Series.ir
@@ -49,13 +49,13 @@ frequency: 30705
 duty_cycle: 0.330000
 data: 11171 5569 716 716 716 716 716 716 716 716 716 716 716 716 716 716 716 716 716 2215 716 2215 716 2215 716 2215 716 2215 716 2215 716 2215 716 2215 716 716 716 716 716 716 716 2215 716 716 716 716 716 716 716 716 716 2215 716 2215 716 2215 716 716 716 2215 716 2215 716 2215 716 2215 716 55528 12734 3224 716 716
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 27451
 duty_cycle: 0.330000
 data: 11912 6302 801 801 801 801 801 801 801 801 801 801 801 801 801 801 801 801 801 2368 801 2368 801 2368 801 2368 801 2368 801 2368 801 2368 801 2368 801 2368 801 2368 801 801 801 2368 801 801 801 801 801 801 801 801 801 801 801 801 801 2368 801 801 801 2368 801 2368 801 2368 801 2368 801 54497 11912 2987 801 801
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 28008
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/V/Velodyne/SE_and_SPLR_Series.ir b/_Pronto_Converted_/V/Velodyne/SE_and_SPLR_Series.ir
index 0774792d..0dc9d915 100644
--- a/_Pronto_Converted_/V/Velodyne/SE_and_SPLR_Series.ir
+++ b/_Pronto_Converted_/V/Velodyne/SE_and_SPLR_Series.ir
@@ -49,13 +49,13 @@ frequency: 29398
 duty_cycle: 0.330000
 data: 11055 5919 748 748 748 748 748 748 748 748 748 748 748 748 748 748 748 748 748 2245 748 2245 748 2245 748 2245 748 2245 748 2245 748 2245 748 2245 748 748 748 748 748 748 748 2245 748 748 748 748 748 748 748 748 748 2245 748 2245 748 2245 748 748 748 2245 748 2245 748 2245 748 2245 748 51364 11055 2755 748 748
 #
-name: VOL_UP
+name: VOL+
 type: raw
 frequency: 30479
 duty_cycle: 0.330000
 data: 11286 5676 755 755 755 755 755 755 755 755 755 755 755 755 755 755 755 755 755 2264 755 2264 755 2264 755 2264 755 2264 755 2264 755 2264 755 2264 755 2264 755 2264 755 755 755 2264 755 755 755 755 755 755 755 755 755 755 755 755 755 2264 755 755 755 2264
 #
-name: VOL_DWN
+name: VOL-
 type: raw
 frequency: 27451
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/X/X-10/X-10.ir b/_Pronto_Converted_/X/X-10/X-10.ir
index 080b54f5..19202d9c 100644
--- a/_Pronto_Converted_/X/X-10/X-10.ir
+++ b/_Pronto_Converted_/X/X-10/X-10.ir
@@ -73,7 +73,7 @@ frequency: 38740
 duty_cycle: 0.330000
 data: 4259 3743 1187 6479 1187 6479 1187 6479 1187 6479 3743 3743 3743 3743 3743 3743 3743 3743 3743 3743 1187 6479 11590 3743
 #
-name: ON
+POWER
 type: raw
 frequency: 38740
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/Y/Yamaha/DVD-S2700.ir b/_Pronto_Converted_/Y/Yamaha/DVD-S2700.ir
index 4fd8ead5..a8773cc3 100644
--- a/_Pronto_Converted_/Y/Yamaha/DVD-S2700.ir
+++ b/_Pronto_Converted_/Y/Yamaha/DVD-S2700.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
@@ -55,67 +55,67 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_1
+name: 1
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_2
+name: 2
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_3
+name: 3
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_4
+name: 4
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_5
+name: 5
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_6
+name: 6
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_7
+name: 7
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_8
+name: 8
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_9
+name: 9
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_Clear
+name: Clear
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
 data: 8911 4455 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 39212 8911 2215 547 94995
 #
-name: Key_0
+name: 0
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/Y/Yamaha/LASER_DISC.ir b/_Pronto_Converted_/Y/Yamaha/LASER_DISC.ir
index 9f24c36a..2b041148 100644
--- a/_Pronto_Converted_/Y/Yamaha/LASER_DISC.ir
+++ b/_Pronto_Converted_/Y/Yamaha/LASER_DISC.ir
@@ -37,13 +37,13 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8914 4470 579 579 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 1683 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 579 579 1683 579 579 579 1683 579 1683 579 579 579 1683 579 579 579 1683 579 579 579 1683 579 579 579 579 579 1683 579 579 579 1683 579 39654 8941 2235 579 95506
 #
-name: KEY_CTRL_FLAT
+name: CTRL_FLAT
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
 data: 8914 4470 579 579 579 579 579 1683 579 1683 579 1683 579 1683 579 1683 579 579 579 1683 579 1683 579 579 579 579 579 579 579 579 579 579 579 1683 579 1683 579 579 579 1683 579 579 579 579 579 1683 579 1683 579 579 579 579 579 1683 579 579 579 1683 579 1683 579 579 579 579 579 1683 579 39654 8941 2235 579 95506
 #
-name: KEY_CTRL_#
+name: CTRL_#
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/Y/Yamaha/RECEIVER.ir b/_Pronto_Converted_/Y/Yamaha/RECEIVER.ir
index 1889814f..21b8a33a 100644
--- a/_Pronto_Converted_/Y/Yamaha/RECEIVER.ir
+++ b/_Pronto_Converted_/Y/Yamaha/RECEIVER.ir
@@ -367,7 +367,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8888 4444 552 552 552 1630 552 552 552 1630 552 1630 552 1630 552 1630 552 552 552 1630 552 552 552 1630 552 552 552 552 552 552 552 552 552 1630 552 552 552 552 552 1630 552 1630 552 1630 552 552 552 552 552 552 552 1630 552 1630 552 552 552 552 552 552 552 1630 552 1630 552 1630 552 39680 8888 2209 552 95085
 #
-name: ON/OFF
+name: POWER
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/Y/Yamaha/RX-V667.ir b/_Pronto_Converted_/Y/Yamaha/RX-V667.ir
index b5af69f4..7e6d5900 100644
--- a/_Pronto_Converted_/Y/Yamaha/RX-V667.ir
+++ b/_Pronto_Converted_/Y/Yamaha/RX-V667.ir
@@ -187,7 +187,7 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 8941 4444 579 579 579 1657 579 579 579 1657 579 1657 579 1657 579 1657 579 579 579 1657 579 579 579 1657 579 579 579 579 579 579 579 579 579 1657 579 579 579 579 579 1657 579 579 579 1657 579 579 579 579 579 579 579 1657 579 1657 579 579 579 1657 579 579 579 1657 579 1657 579 1657 579 39444 8941 2209 579 95322
 #
-name: Power_RCVR
+name: POWER_RCVR
 type: raw
 frequency: 38029
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/Z/Zenith/P42W24.ir b/_Pronto_Converted_/Z/Zenith/P42W24.ir
index e9b9b9f3..a86b1b0b 100644
--- a/_Pronto_Converted_/Z/Zenith/P42W24.ir
+++ b/_Pronto_Converted_/Z/Zenith/P42W24.ir
@@ -61,7 +61,7 @@ frequency: 38381
 duty_cycle: 0.330000
 data: 8885 4455 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 547 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 1667 547 547 547 1667 547 1667 547 1667 547 1667 547 547 547 547 547 547 547 1667 547 547 547 547 547 547 547 547 547 1667 547 39421 8885 2241 547 94969
 #
-name: KEY_LOCK
+name: LOCK
 type: raw
 frequency: 38381
 duty_cycle: 0.330000
diff --git a/_Pronto_Converted_/Z/Zenith/VRC-421.ir b/_Pronto_Converted_/Z/Zenith/VRC-421.ir
index 130b47ab..348a6939 100644
--- a/_Pronto_Converted_/Z/Zenith/VRC-421.ir
+++ b/_Pronto_Converted_/Z/Zenith/VRC-421.ir
@@ -1,7 +1,7 @@
 Filetype: IR signals file
 Version: 1
 #
-name: Power
+name: POWER
 type: raw
 frequency: 40244
 duty_cycle: 0.330000
@@ -43,7 +43,7 @@ frequency: 40244
 duty_cycle: 0.330000
 data: 522 4970 497 497 497 3976 497 4970 497 497 497 3976 497 4970 497 497 497 3976 497 4970 497 4970 497 497 497 3976 497 4970 497 497 497 3976 497 4970 497 497 497 3976 497 4970 497 497 497 97903 497 4970 497 497 497 3976 497 4970 497 497 497 3976 497 4970 497 497 497 3976 497 4970 497 4970 497 497 497 3976 497 4970 497 497 497 3976 497 4970 497 497 497 3976 497 4970 497 497 497 6908
 #
-name: Mute
+name: MUTE
 type: raw
 frequency: 40244
 duty_cycle: 0.330000