Updates after annotation class/row changes (singular/plural).

6 files changed, 106 insertions, 106 deletions

diff --git a/decoder/test/sda2506/blaupunkt-enter-wrong-code.output b/decoder/test/sda2506/blaupunkt-enter-wrong-code.output
index 385af3a..3c4e927 100644
--- a/decoder/test/sda2506/blaupunkt-enter-wrong-code.output
+++ b/decoder/test/sda2506/blaupunkt-enter-wrong-code.output
@@ -14,12 +14,12 @@
 1060-1072 sda2506: cmdbit: "1"
 1097-1109 sda2506: cmdbit: "1"
 1133-1146 sda2506: cmdbit: "1"
-837-1109 sda2506: data: "addr: 66"
-1133-1146 sda2506: data: "CB: 01"
+837-1109 sda2506: databyte: "addr: 66"
+1133-1146 sda2506: databyte: "CB: 01"
 1168-14329 sda2506: cmd: "Erase: 66"
-837-1109 sda2506: data: "addr: 66"
-1133-1146 sda2506: data: "CB: 01"
-464-775 sda2506: data: "data: 5C"
+837-1109 sda2506: databyte: "addr: 66"
+1133-1146 sda2506: databyte: "CB: 01"
+464-775 sda2506: databyte: "data: 5C"
 14339-27517 sda2506: cmd: "Write to 66: 5C"
 27711-27723 sda2506: cmdbit: "1"
 27750-27762 sda2506: cmdbit: "0"
@@ -29,9 +29,9 @@
 27936-27949 sda2506: cmdbit: "1"
 27973-27985 sda2506: cmdbit: "1"
 28012-28025 sda2506: cmdbit: "0"
-27711-27985 sda2506: data: "addr: 65"
-28012-28025 sda2506: data: "CB: 00"
-27711-27985 sda2506: data: "read: 65"
+27711-27985 sda2506: databyte: "addr: 65"
+28012-28025 sda2506: databyte: "CB: 00"
+27711-27985 sda2506: databyte: "read: 65"
 27711-28052 sda2506: cmd: "read"
 28081-28120 sda2506: databit: "1"
 28128-28167 sda2506: databit: "1"
@@ -41,7 +41,7 @@
 28314-28353 sda2506: databit: "1"
 28361-28400 sda2506: databit: "0"
 28407-28446 sda2506: databit: "0"
-28081-28446 sda2506: data: "37"
+28081-28446 sda2506: databyte: "37"
 28670-28682 sda2506: cmdbit: "0"
 28706-28719 sda2506: cmdbit: "1"
 28743-28755 sda2506: cmdbit: "1"
@@ -50,9 +50,9 @@
 28893-28905 sda2506: cmdbit: "1"
 28930-28942 sda2506: cmdbit: "1"
 28969-28981 sda2506: cmdbit: "0"
-28670-28942 sda2506: data: "addr: 66"
-28969-28981 sda2506: data: "CB: 00"
-28670-28942 sda2506: data: "read: 66"
+28670-28942 sda2506: databyte: "addr: 66"
+28969-28981 sda2506: databyte: "CB: 00"
+28670-28942 sda2506: databyte: "read: 66"
 28670-29008 sda2506: cmd: "read"
 29037-29077 sda2506: databit: "0"
 29084-29123 sda2506: databit: "0"
@@ -62,7 +62,7 @@
 29270-29310 sda2506: databit: "0"
 29317-29356 sda2506: databit: "1"
 29364-29403 sda2506: databit: "0"
-29037-29403 sda2506: data: "5C"
+29037-29403 sda2506: databyte: "5C"
 29896-29908 sda2506: cmdbit: "1"
 29932-29945 sda2506: cmdbit: "1"
 29969-29982 sda2506: cmdbit: "1"
@@ -71,9 +71,9 @@
 30119-30131 sda2506: cmdbit: "1"
 30156-30168 sda2506: cmdbit: "1"
 30195-30207 sda2506: cmdbit: "0"
-29896-30168 sda2506: data: "addr: 67"
-30195-30207 sda2506: data: "CB: 00"
-29896-30168 sda2506: data: "read: 67"
+29896-30168 sda2506: databyte: "addr: 67"
+30195-30207 sda2506: databyte: "CB: 00"
+29896-30168 sda2506: databyte: "read: 67"
 29896-30234 sda2506: cmd: "read"
 30263-30303 sda2506: databit: "1"
 30310-30349 sda2506: databit: "1"
@@ -83,7 +83,7 @@
 30496-30536 sda2506: databit: "0"
 30543-30582 sda2506: databit: "0"
 30590-30629 sda2506: databit: "0"
-30263-30629 sda2506: data: "13"
+30263-30629 sda2506: databyte: "13"
 30923-30935 sda2506: cmdbit: "0"
 30962-30975 sda2506: cmdbit: "0"
 31002-31014 sda2506: cmdbit: "0"
@@ -92,9 +92,9 @@
 31149-31161 sda2506: cmdbit: "1"
 31185-31198 sda2506: cmdbit: "1"
 31225-31237 sda2506: cmdbit: "0"
-30923-31198 sda2506: data: "addr: 68"
-31225-31237 sda2506: data: "CB: 00"
-30923-31198 sda2506: data: "read: 68"
+30923-31198 sda2506: databyte: "addr: 68"
+31225-31237 sda2506: databyte: "CB: 00"
+30923-31198 sda2506: databyte: "read: 68"
 30923-31264 sda2506: cmd: "read"
 31293-31333 sda2506: databit: "1"
 31340-31379 sda2506: databit: "0"
@@ -104,4 +104,4 @@
 31526-31566 sda2506: databit: "0"
 31573-31612 sda2506: databit: "0"
 31620-31659 sda2506: databit: "1"
-31293-31659 sda2506: data: "81"
+31293-31659 sda2506: databyte: "81"
diff --git a/decoder/test/sda2506/blaupunkt-enter-wrong-code2.output b/decoder/test/sda2506/blaupunkt-enter-wrong-code2.output
index 3b4ab60..d44fad4 100644
--- a/decoder/test/sda2506/blaupunkt-enter-wrong-code2.output
+++ b/decoder/test/sda2506/blaupunkt-enter-wrong-code2.output
@@ -14,12 +14,12 @@
 2491-2516 sda2506: cmdbit: "1"
 2565-2590 sda2506: cmdbit: "1"
 2639-2663 sda2506: cmdbit: "1"
-2045-2590 sda2506: data: "addr: 66"
-2639-2663 sda2506: data: "CB: 01"
+2045-2590 sda2506: databyte: "addr: 66"
+2639-2663 sda2506: databyte: "CB: 01"
 2707-29028 sda2506: cmd: "Erase: 66"
-2045-2590 sda2506: data: "addr: 66"
-2639-2663 sda2506: data: "CB: 01"
-1295-1923 sda2506: data: "data: 62"
+2045-2590 sda2506: databyte: "addr: 66"
+2639-2663 sda2506: databyte: "CB: 01"
+1295-1923 sda2506: databyte: "data: 62"
 29048-55404 sda2506: cmd: "Write to 66: 62"
 55791-55816 sda2506: cmdbit: "1"
 55870-55894 sda2506: cmdbit: "0"
@@ -29,9 +29,9 @@
 56242-56267 sda2506: cmdbit: "1"
 56316-56340 sda2506: cmdbit: "1"
 56394-56419 sda2506: cmdbit: "0"
-55791-56340 sda2506: data: "addr: 65"
-56394-56419 sda2506: data: "CB: 00"
-55791-56340 sda2506: data: "read: 65"
+55791-56340 sda2506: databyte: "addr: 65"
+56394-56419 sda2506: databyte: "CB: 00"
+55791-56340 sda2506: databyte: "read: 65"
 55791-56473 sda2506: cmd: "read"
 56532-56610 sda2506: databit: "1"
 56625-56703 sda2506: databit: "1"
@@ -41,7 +41,7 @@
 56998-57076 sda2506: databit: "1"
 57091-57169 sda2506: databit: "0"
 57184-57262 sda2506: databit: "0"
-56532-57262 sda2506: data: "37"
+56532-57262 sda2506: databyte: "37"
 57709-57733 sda2506: cmdbit: "0"
 57782-57807 sda2506: cmdbit: "1"
 57856-57880 sda2506: cmdbit: "1"
@@ -50,9 +50,9 @@
 58155-58179 sda2506: cmdbit: "1"
 58228-58253 sda2506: cmdbit: "1"
 58307-58331 sda2506: cmdbit: "0"
-57709-58253 sda2506: data: "addr: 66"
-58307-58331 sda2506: data: "CB: 00"
-57709-58253 sda2506: data: "read: 66"
+57709-58253 sda2506: databyte: "addr: 66"
+58307-58331 sda2506: databyte: "CB: 00"
+57709-58253 sda2506: databyte: "read: 66"
 57709-58385 sda2506: cmd: "read"
 58444-58523 sda2506: databit: "0"
 58537-58616 sda2506: databit: "1"
@@ -62,7 +62,7 @@
 58910-58989 sda2506: databit: "1"
 59003-59082 sda2506: databit: "1"
 59096-59175 sda2506: databit: "0"
-58444-59175 sda2506: data: "62"
+58444-59175 sda2506: databyte: "62"
 60156-60180 sda2506: cmdbit: "1"
 60229-60254 sda2506: cmdbit: "1"
 60303-60327 sda2506: cmdbit: "1"
@@ -71,9 +71,9 @@
 60602-60627 sda2506: cmdbit: "1"
 60676-60700 sda2506: cmdbit: "1"
 60754-60779 sda2506: cmdbit: "0"
-60156-60700 sda2506: data: "addr: 67"
-60754-60779 sda2506: data: "CB: 00"
-60156-60700 sda2506: data: "read: 67"
+60156-60700 sda2506: databyte: "addr: 67"
+60754-60779 sda2506: databyte: "CB: 00"
+60156-60700 sda2506: databyte: "read: 67"
 60156-60833 sda2506: cmd: "read"
 60891-60970 sda2506: databit: "1"
 60985-61063 sda2506: databit: "1"
@@ -83,7 +83,7 @@
 61357-61436 sda2506: databit: "0"
 61450-61529 sda2506: databit: "0"
 61544-61622 sda2506: databit: "0"
-60891-61622 sda2506: data: "13"
+60891-61622 sda2506: databyte: "13"
 62211-62235 sda2506: cmdbit: "0"
 62289-62314 sda2506: cmdbit: "0"
 62367-62392 sda2506: cmdbit: "0"
@@ -92,9 +92,9 @@
 62662-62686 sda2506: cmdbit: "1"
 62735-62760 sda2506: cmdbit: "1"
 62814-62838 sda2506: cmdbit: "0"
-62211-62760 sda2506: data: "addr: 68"
-62814-62838 sda2506: data: "CB: 00"
-62211-62760 sda2506: data: "read: 68"
+62211-62760 sda2506: databyte: "addr: 68"
+62814-62838 sda2506: databyte: "CB: 00"
+62211-62760 sda2506: databyte: "read: 68"
 62211-62892 sda2506: cmd: "read"
 62951-63029 sda2506: databit: "1"
 63044-63123 sda2506: databit: "0"
@@ -104,4 +104,4 @@
 63417-63495 sda2506: databit: "0"
 63510-63589 sda2506: databit: "0"
 63603-63682 sda2506: databit: "1"
-62951-63682 sda2506: data: "81"
+62951-63682 sda2506: databyte: "81"
diff --git a/decoder/test/sda2506/blaupunkt-start-after-wrongcode2.output b/decoder/test/sda2506/blaupunkt-start-after-wrongcode2.output
index 06e49dc..67c5dd5 100644
--- a/decoder/test/sda2506/blaupunkt-start-after-wrongcode2.output
+++ b/decoder/test/sda2506/blaupunkt-start-after-wrongcode2.output
@@ -7,9 +7,9 @@
 509967-509992 sda2506: cmdbit: "1"
 510041-510065 sda2506: cmdbit: "1"
 510119-510144 sda2506: cmdbit: "0"
-509516-510065 sda2506: data: "addr: 65"
-510119-510144 sda2506: data: "CB: 00"
-509516-510065 sda2506: data: "read: 65"
+509516-510065 sda2506: databyte: "addr: 65"
+510119-510144 sda2506: databyte: "CB: 00"
+509516-510065 sda2506: databyte: "read: 65"
 509516-510198 sda2506: cmd: "read"
 510257-510335 sda2506: databit: "1"
 510350-510428 sda2506: databit: "1"
@@ -19,7 +19,7 @@
 510722-510801 sda2506: databit: "1"
 510816-510894 sda2506: databit: "0"
 510909-510987 sda2506: databit: "0"
-510257-510987 sda2506: data: "37"
+510257-510987 sda2506: databyte: "37"
 511434-511458 sda2506: cmdbit: "0"
 511507-511532 sda2506: cmdbit: "1"
 511581-511605 sda2506: cmdbit: "1"
@@ -28,9 +28,9 @@
 511880-511904 sda2506: cmdbit: "1"
 511953-511978 sda2506: cmdbit: "1"
 512032-512056 sda2506: cmdbit: "0"
-511434-511978 sda2506: data: "addr: 66"
-512032-512056 sda2506: data: "CB: 00"
-511434-511978 sda2506: data: "read: 66"
+511434-511978 sda2506: databyte: "addr: 66"
+512032-512056 sda2506: databyte: "CB: 00"
+511434-511978 sda2506: databyte: "read: 66"
 511434-512110 sda2506: cmd: "read"
 512169-512248 sda2506: databit: "0"
 512262-512341 sda2506: databit: "1"
@@ -40,7 +40,7 @@
 512635-512714 sda2506: databit: "1"
 512728-512807 sda2506: databit: "1"
 512821-512900 sda2506: databit: "0"
-512169-512900 sda2506: data: "62"
+512169-512900 sda2506: databyte: "62"
 513356-513381 sda2506: cmdbit: "1"
 513430-513454 sda2506: cmdbit: "1"
 513503-513528 sda2506: cmdbit: "1"
@@ -49,9 +49,9 @@
 513802-513827 sda2506: cmdbit: "1"
 513876-513900 sda2506: cmdbit: "1"
 513954-513979 sda2506: cmdbit: "0"
-513356-513900 sda2506: data: "addr: 67"
-513954-513979 sda2506: data: "CB: 00"
-513356-513900 sda2506: data: "read: 67"
+513356-513900 sda2506: databyte: "addr: 67"
+513954-513979 sda2506: databyte: "CB: 00"
+513356-513900 sda2506: databyte: "read: 67"
 513356-514033 sda2506: cmd: "read"
 514092-514170 sda2506: databit: "1"
 514185-514263 sda2506: databit: "1"
@@ -61,7 +61,7 @@
 514558-514636 sda2506: databit: "0"
 514651-514729 sda2506: databit: "0"
 514744-514822 sda2506: databit: "0"
-514092-514822 sda2506: data: "13"
+514092-514822 sda2506: databyte: "13"
 515852-515877 sda2506: cmdbit: "0"
 515931-515955 sda2506: cmdbit: "0"
 516009-516034 sda2506: cmdbit: "0"
@@ -70,9 +70,9 @@
 516304-516328 sda2506: cmdbit: "1"
 516377-516402 sda2506: cmdbit: "1"
 516456-516480 sda2506: cmdbit: "0"
-515852-516402 sda2506: data: "addr: 68"
-516456-516480 sda2506: data: "CB: 00"
-515852-516402 sda2506: data: "read: 68"
+515852-516402 sda2506: databyte: "addr: 68"
+516456-516480 sda2506: databyte: "CB: 00"
+515852-516402 sda2506: databyte: "read: 68"
 515852-516534 sda2506: cmd: "read"
 516593-516671 sda2506: databit: "1"
 516686-516765 sda2506: databit: "0"
@@ -82,4 +82,4 @@
 517059-517137 sda2506: databit: "0"
 517152-517231 sda2506: databit: "0"
 517245-517324 sda2506: databit: "1"
-516593-517324 sda2506: data: "81"
+516593-517324 sda2506: databyte: "81"
diff --git a/decoder/test/sda2506/blaupunkt-start-locked.output b/decoder/test/sda2506/blaupunkt-start-locked.output
index 98aa775..9a8e4b2 100644
--- a/decoder/test/sda2506/blaupunkt-start-locked.output
+++ b/decoder/test/sda2506/blaupunkt-start-locked.output
@@ -8,9 +8,9 @@
 258088-258100 sda2506: cmdbit: "1"
 258125-258137 sda2506: cmdbit: "1"
 258164-258176 sda2506: cmdbit: "0"
-257862-258137 sda2506: data: "addr: 65"
-258164-258176 sda2506: data: "CB: 00"
-257862-258137 sda2506: data: "read: 65"
+257862-258137 sda2506: databyte: "addr: 65"
+258164-258176 sda2506: databyte: "CB: 00"
+257862-258137 sda2506: databyte: "read: 65"
 257862-258203 sda2506: cmd: "read"
 258232-258272 sda2506: databit: "1"
 258279-258318 sda2506: databit: "1"
@@ -20,7 +20,7 @@
 258465-258505 sda2506: databit: "1"
 258512-258551 sda2506: databit: "0"
 258558-258598 sda2506: databit: "0"
-258232-258598 sda2506: data: "37"
+258232-258598 sda2506: databyte: "37"
 258821-258833 sda2506: cmdbit: "0"
 258858-258870 sda2506: cmdbit: "1"
 258894-258907 sda2506: cmdbit: "1"
@@ -29,9 +29,9 @@
 259044-259056 sda2506: cmdbit: "1"
 259081-259093 sda2506: cmdbit: "1"
 259120-259132 sda2506: cmdbit: "0"
-258821-259093 sda2506: data: "addr: 66"
-259120-259132 sda2506: data: "CB: 00"
-258821-259093 sda2506: data: "read: 66"
+258821-259093 sda2506: databyte: "addr: 66"
+259120-259132 sda2506: databyte: "CB: 00"
+258821-259093 sda2506: databyte: "read: 66"
 258821-259159 sda2506: cmd: "read"
 259189-259228 sda2506: databit: "0"
 259235-259274 sda2506: databit: "1"
@@ -41,7 +41,7 @@
 259421-259461 sda2506: databit: "0"
 259468-259507 sda2506: databit: "1"
 259515-259554 sda2506: databit: "0"
-259189-259554 sda2506: data: "56"
+259189-259554 sda2506: databyte: "56"
 259782-259794 sda2506: cmdbit: "1"
 259819-259831 sda2506: cmdbit: "1"
 259855-259868 sda2506: cmdbit: "1"
@@ -50,9 +50,9 @@
 260005-260017 sda2506: cmdbit: "1"
 260042-260054 sda2506: cmdbit: "1"
 260081-260093 sda2506: cmdbit: "0"
-259782-260054 sda2506: data: "addr: 67"
-260081-260093 sda2506: data: "CB: 00"
-259782-260054 sda2506: data: "read: 67"
+259782-260054 sda2506: databyte: "addr: 67"
+260081-260093 sda2506: databyte: "CB: 00"
+259782-260054 sda2506: databyte: "read: 67"
 259782-260120 sda2506: cmd: "read"
 260150-260189 sda2506: databit: "1"
 260196-260235 sda2506: databit: "1"
@@ -62,7 +62,7 @@
 260383-260422 sda2506: databit: "0"
 260429-260468 sda2506: databit: "0"
 260476-260515 sda2506: databit: "0"
-260150-260515 sda2506: data: "13"
+260150-260515 sda2506: databyte: "13"
 261013-261025 sda2506: cmdbit: "0"
 261052-261064 sda2506: cmdbit: "0"
 261091-261104 sda2506: cmdbit: "0"
@@ -71,9 +71,9 @@
 261238-261251 sda2506: cmdbit: "1"
 261275-261287 sda2506: cmdbit: "1"
 261314-261327 sda2506: cmdbit: "0"
-261013-261287 sda2506: data: "addr: 68"
-261314-261327 sda2506: data: "CB: 00"
-261013-261287 sda2506: data: "read: 68"
+261013-261287 sda2506: databyte: "addr: 68"
+261314-261327 sda2506: databyte: "CB: 00"
+261013-261287 sda2506: databyte: "read: 68"
 261013-261354 sda2506: cmd: "read"
 261383-261422 sda2506: databit: "1"
 261430-261469 sda2506: databit: "0"
@@ -83,4 +83,4 @@
 261616-261655 sda2506: databit: "0"
 261663-261702 sda2506: databit: "0"
 261709-261748 sda2506: databit: "1"
-261383-261748 sda2506: data: "81"
+261383-261748 sda2506: databyte: "81"
diff --git a/decoder/test/sda2506/blaupunkt-start-unknown.output b/decoder/test/sda2506/blaupunkt-start-unknown.output
index 15f78b1..bd32851 100644
--- a/decoder/test/sda2506/blaupunkt-start-unknown.output
+++ b/decoder/test/sda2506/blaupunkt-start-unknown.output
@@ -7,9 +7,9 @@
 255852-255864 sda2506: cmdbit: "1"
 255889-255901 sda2506: cmdbit: "1"
 255928-255940 sda2506: cmdbit: "0"
-255627-255901 sda2506: data: "addr: 65"
-255928-255940 sda2506: data: "CB: 00"
-255627-255901 sda2506: data: "read: 65"
+255627-255901 sda2506: databyte: "addr: 65"
+255928-255940 sda2506: databyte: "CB: 00"
+255627-255901 sda2506: databyte: "read: 65"
 255627-255967 sda2506: cmd: "read"
 255997-256036 sda2506: databit: "1"
 256043-256083 sda2506: databit: "1"
@@ -19,7 +19,7 @@
 256230-256269 sda2506: databit: "1"
 256276-256316 sda2506: databit: "0"
 256323-256362 sda2506: databit: "0"
-255997-256362 sda2506: data: "37"
+255997-256362 sda2506: databyte: "37"
 256585-256598 sda2506: cmdbit: "0"
 256622-256634 sda2506: cmdbit: "1"
 256659-256671 sda2506: cmdbit: "1"
@@ -28,9 +28,9 @@
 256809-256821 sda2506: cmdbit: "1"
 256845-256858 sda2506: cmdbit: "1"
 256885-256897 sda2506: cmdbit: "0"
-256585-256858 sda2506: data: "addr: 66"
-256885-256897 sda2506: data: "CB: 00"
-256585-256858 sda2506: data: "read: 66"
+256585-256858 sda2506: databyte: "addr: 66"
+256885-256897 sda2506: databyte: "CB: 00"
+256585-256858 sda2506: databyte: "read: 66"
 256585-256924 sda2506: cmd: "read"
 256953-256992 sda2506: databit: "0"
 257000-257039 sda2506: databit: "1"
@@ -40,7 +40,7 @@
 257186-257225 sda2506: databit: "0"
 257233-257272 sda2506: databit: "1"
 257279-257319 sda2506: databit: "0"
-256953-257319 sda2506: data: "4A"
+256953-257319 sda2506: databyte: "4A"
 257547-257559 sda2506: cmdbit: "1"
 257583-257596 sda2506: cmdbit: "1"
 257620-257633 sda2506: cmdbit: "1"
@@ -49,9 +49,9 @@
 257770-257782 sda2506: cmdbit: "1"
 257807-257819 sda2506: cmdbit: "1"
 257846-257858 sda2506: cmdbit: "0"
-257547-257819 sda2506: data: "addr: 67"
-257846-257858 sda2506: data: "CB: 00"
-257547-257819 sda2506: data: "read: 67"
+257547-257819 sda2506: databyte: "addr: 67"
+257846-257858 sda2506: databyte: "CB: 00"
+257547-257819 sda2506: databyte: "read: 67"
 257547-257885 sda2506: cmd: "read"
 257915-257954 sda2506: databit: "1"
 257961-258000 sda2506: databit: "1"
@@ -61,7 +61,7 @@
 258147-258187 sda2506: databit: "0"
 258194-258233 sda2506: databit: "0"
 258241-258280 sda2506: databit: "0"
-257915-258280 sda2506: data: "13"
+257915-258280 sda2506: databyte: "13"
 258778-258790 sda2506: cmdbit: "0"
 258817-258829 sda2506: cmdbit: "0"
 258856-258869 sda2506: cmdbit: "0"
@@ -70,9 +70,9 @@
 259003-259016 sda2506: cmdbit: "1"
 259040-259052 sda2506: cmdbit: "1"
 259079-259092 sda2506: cmdbit: "0"
-258778-259052 sda2506: data: "addr: 68"
-259079-259092 sda2506: data: "CB: 00"
-258778-259052 sda2506: data: "read: 68"
+258778-259052 sda2506: databyte: "addr: 68"
+259079-259092 sda2506: databyte: "CB: 00"
+258778-259052 sda2506: databyte: "read: 68"
 258778-259119 sda2506: cmd: "read"
 259148-259187 sda2506: databit: "1"
 259195-259234 sda2506: databit: "0"
@@ -82,4 +82,4 @@
 259381-259420 sda2506: databit: "0"
 259428-259467 sda2506: databit: "0"
 259474-259513 sda2506: databit: "1"
-259148-259513 sda2506: data: "81"
+259148-259513 sda2506: databyte: "81"
diff --git a/decoder/test/sda2506/blaupunkt-start-wrongcode.output b/decoder/test/sda2506/blaupunkt-start-wrongcode.output
index f713fde..17595fb 100644
--- a/decoder/test/sda2506/blaupunkt-start-wrongcode.output
+++ b/decoder/test/sda2506/blaupunkt-start-wrongcode.output
@@ -7,9 +7,9 @@
 270204-270216 sda2506: cmdbit: "1"
 270240-270253 sda2506: cmdbit: "1"
 270280-270292 sda2506: cmdbit: "0"
-269978-270253 sda2506: data: "addr: 65"
-270280-270292 sda2506: data: "CB: 00"
-269978-270253 sda2506: data: "read: 65"
+269978-270253 sda2506: databyte: "addr: 65"
+270280-270292 sda2506: databyte: "CB: 00"
+269978-270253 sda2506: databyte: "read: 65"
 269978-270319 sda2506: cmd: "read"
 270348-270388 sda2506: databit: "1"
 270395-270434 sda2506: databit: "1"
@@ -19,7 +19,7 @@
 270581-270621 sda2506: databit: "1"
 270628-270667 sda2506: databit: "0"
 270674-270714 sda2506: databit: "0"
-270348-270714 sda2506: data: "37"
+270348-270714 sda2506: databyte: "37"
 270937-270949 sda2506: cmdbit: "0"
 270974-270986 sda2506: cmdbit: "1"
 271010-271023 sda2506: cmdbit: "1"
@@ -28,9 +28,9 @@
 271160-271172 sda2506: cmdbit: "1"
 271197-271209 sda2506: cmdbit: "1"
 271236-271248 sda2506: cmdbit: "0"
-270937-271209 sda2506: data: "addr: 66"
-271236-271248 sda2506: data: "CB: 00"
-270937-271209 sda2506: data: "read: 66"
+270937-271209 sda2506: databyte: "addr: 66"
+271236-271248 sda2506: databyte: "CB: 00"
+270937-271209 sda2506: databyte: "read: 66"
 270937-271275 sda2506: cmd: "read"
 271305-271344 sda2506: databit: "0"
 271351-271390 sda2506: databit: "1"
@@ -40,7 +40,7 @@
 271538-271577 sda2506: databit: "0"
 271584-271623 sda2506: databit: "1"
 271631-271670 sda2506: databit: "0"
-271305-271670 sda2506: data: "56"
+271305-271670 sda2506: databyte: "56"
 271898-271910 sda2506: cmdbit: "1"
 271935-271947 sda2506: cmdbit: "1"
 271971-271984 sda2506: cmdbit: "1"
@@ -49,9 +49,9 @@
 272121-272133 sda2506: cmdbit: "1"
 272158-272170 sda2506: cmdbit: "1"
 272197-272209 sda2506: cmdbit: "0"
-271898-272170 sda2506: data: "addr: 67"
-272197-272209 sda2506: data: "CB: 00"
-271898-272170 sda2506: data: "read: 67"
+271898-272170 sda2506: databyte: "addr: 67"
+272197-272209 sda2506: databyte: "CB: 00"
+271898-272170 sda2506: databyte: "read: 67"
 271898-272236 sda2506: cmd: "read"
 272266-272305 sda2506: databit: "1"
 272312-272352 sda2506: databit: "1"
@@ -61,7 +61,7 @@
 272499-272538 sda2506: databit: "0"
 272545-272584 sda2506: databit: "0"
 272592-272631 sda2506: databit: "0"
-272266-272631 sda2506: data: "13"
+272266-272631 sda2506: databyte: "13"
 273146-273158 sda2506: cmdbit: "0"
 273185-273197 sda2506: cmdbit: "0"
 273224-273237 sda2506: cmdbit: "0"
@@ -70,9 +70,9 @@
 273371-273384 sda2506: cmdbit: "1"
 273408-273421 sda2506: cmdbit: "1"
 273447-273460 sda2506: cmdbit: "0"
-273146-273421 sda2506: data: "addr: 68"
-273447-273460 sda2506: data: "CB: 00"
-273146-273421 sda2506: data: "read: 68"
+273146-273421 sda2506: databyte: "addr: 68"
+273447-273460 sda2506: databyte: "CB: 00"
+273146-273421 sda2506: databyte: "read: 68"
 273146-273487 sda2506: cmd: "read"
 273516-273555 sda2506: databit: "1"
 273563-273602 sda2506: databit: "0"
@@ -82,4 +82,4 @@
 273749-273788 sda2506: databit: "0"
 273796-273835 sda2506: databit: "0"
 273842-273881 sda2506: databit: "1"
-273516-273881 sda2506: data: "81"
+273516-273881 sda2506: databyte: "81"