All PDs: Consistently use singular/plural for annotation classes/rows.

79 files changed, 233 insertions, 233 deletions

diff --git a/decoders/ac97/pd.py b/decoders/ac97/pd.py
index 68eb955..adec12b 100644
--- a/decoders/ac97/pd.py
+++ b/decoders/ac97/pd.py
@@ -71,8 +71,8 @@ class Decoder(srd.Decoder):
         {'id': 'rst', 'name': 'RESET#', 'desc': 'Reset line'},
     )
     annotations = (
-        ('bit-out', 'Output bits'),
-        ('bit-in', 'Input bits'),
+        ('bit-out', 'Output bit'),
+        ('bit-in', 'Input bit'),
         ('slot-out-raw', 'Output raw value'),
         ('slot-out-tag', 'Output TAG'),
         ('slot-out-cmd-addr', 'Output command address'),
diff --git a/decoders/ade77xx/pd.py b/decoders/ade77xx/pd.py
index 5a24a25..5421cf4 100644
--- a/decoders/ade77xx/pd.py
+++ b/decoders/ade77xx/pd.py
@@ -36,13 +36,13 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['Analog/digital', 'IC', 'Sensor']
     annotations = (
-        ('read', 'Register read commands'),
-        ('write', 'Register write commands'),
-        ('warning', 'Warnings'),
+        ('read', 'Register read'),
+        ('write', 'Register write'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
-        ('read', 'Read', (0,)),
-        ('write', 'Write', (1,)),
+        ('reads', 'Reads', (0,)),
+        ('writes', 'Writes', (1,)),
         ('warnings', 'Warnings', (2,)),
     )
 
diff --git a/decoders/adf435x/pd.py b/decoders/adf435x/pd.py
index f6c6e6e..c60ed4e 100644
--- a/decoders/adf435x/pd.py
+++ b/decoders/adf435x/pd.py
@@ -99,10 +99,10 @@ class Decoder(srd.Decoder):
     tags = ['Clock/timing', 'IC', 'Wireless/RF']
     annotations = (
         # Sent from the host to the chip.
-        ('register', 'Register written to the device'),
+        ('write', 'Register write'),
     )
     annotation_rows = (
-        ('registers', 'Register writes', (ANN_REG,)),
+        ('writes', 'Register writes', (ANN_REG,)),
     )
 
     def __init__(self):
diff --git a/decoders/adns5020/pd.py b/decoders/adns5020/pd.py
index 9ac778e..b03fcaa 100644
--- a/decoders/adns5020/pd.py
+++ b/decoders/adns5020/pd.py
@@ -49,13 +49,13 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['IC', 'PC', 'Sensor']
     annotations = (
-        ('read', 'Register read commands'),
-        ('write', 'Register write commands'),
-        ('warning', 'Warnings'),
+        ('read', 'Register read'),
+        ('write', 'Register write'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
-        ('read', 'Read', (0,)),
-        ('write', 'Write', (1,)),
+        ('reads', 'Reads', (0,)),
+        ('writes', 'Writes', (1,)),
         ('warnings', 'Warnings', (2,)),
     )
 
diff --git a/decoders/am230x/pd.py b/decoders/am230x/pd.py
index fbc68d3..eedf942 100644
--- a/decoders/am230x/pd.py
+++ b/decoders/am230x/pd.py
@@ -56,8 +56,8 @@ class Decoder(srd.Decoder):
         ('bit', 'Bit'),
         ('end', 'End'),
         ('byte', 'Byte'),
-        ('humidity', 'Relative humidity in percent'),
-        ('temperature', 'Temperature in degrees Celsius'),
+        ('humidity', 'Relative humidity'),
+        ('temperature', 'Temperature'),
         ('checksum', 'Checksum'),
     )
     annotation_rows = (
diff --git a/decoders/arm_etmv3/pd.py b/decoders/arm_etmv3/pd.py
index 6649b46..a0bbd94 100644
--- a/decoders/arm_etmv3/pd.py
+++ b/decoders/arm_etmv3/pd.py
@@ -138,26 +138,26 @@ class Decoder(srd.Decoder):
     tags = ['Debug/trace']
     annotations = (
         ('trace', 'Trace info'),
-        ('branch', 'Branches'),
-        ('exception', 'Exceptions'),
+        ('branch', 'Branch'),
+        ('exception', 'Exception'),
         ('execution', 'Instruction execution'),
         ('data', 'Data access'),
         ('pc', 'Program counter'),
-        ('instr_e', 'Executed instructions'),
-        ('instr_n', 'Not executed instructions'),
+        ('instr_e', 'Executed instruction'),
+        ('instr_n', 'Not executed instruction'),
         ('source', 'Source code'),
         ('location', 'Current location'),
         ('function', 'Current function'),
     )
     annotation_rows = (
-        ('trace', 'Trace info', (0,)),
+        ('traces', 'Trace info', (0,)),
         ('flow', 'Code flow', (1, 2, 3,)),
-        ('data', 'Data access', (4,)),
-        ('pc', 'Program counter', (5,)),
-        ('instruction', 'Instructions', (6, 7,)),
-        ('source', 'Source code', (8,)),
-        ('location', 'Current location', (9,)),
-        ('function', 'Current function', (10,)),
+        ('data-vals', 'Data access', (4,)),
+        ('pc-vals', 'Program counters', (5,)),
+        ('instructions', 'Instructions', (6, 7,)),
+        ('sources', 'Source code', (8,)),
+        ('locations', 'Current locations', (9,)),
+        ('functions', 'Current functions', (10,)),
     )
     options = (
         {'id': 'objdump', 'desc': 'objdump path',
diff --git a/decoders/arm_itm/pd.py b/decoders/arm_itm/pd.py
index 6414978..8ceeac4 100644
--- a/decoders/arm_itm/pd.py
+++ b/decoders/arm_itm/pd.py
@@ -55,7 +55,7 @@ class Decoder(srd.Decoder):
             'default': ''},
     )
     annotations = (
-        ('trace', 'Trace information'),
+        ('trace', 'Trace info'),
         ('timestamp', 'Timestamp'),
         ('software', 'Software message'),
         ('dwt_event', 'DWT event'),
@@ -69,15 +69,15 @@ class Decoder(srd.Decoder):
         ('function', 'Current function'),
     )
     annotation_rows = (
-        ('trace', 'Trace information', (0, 1)),
-        ('software', 'Software trace', (2,)),
-        ('dwt_event', 'DWT event', (3,)),
-        ('dwt_watchpoint', 'DWT watchpoint', (4,)),
-        ('dwt_exc', 'Exception trace', (5,)),
-        ('dwt_pc', 'Program counter', (6,)),
-        ('mode', 'Current mode', (7, 8, 9)),
-        ('location', 'Current location', (10,)),
-        ('function', 'Current function', (11,)),
+        ('traces', 'Trace info', (0, 1)),
+        ('softwares', 'Software traces', (2,)),
+        ('dwt_events', 'DWT events', (3,)),
+        ('dwt_watchpoints', 'DWT watchpoints', (4,)),
+        ('dwt_excs', 'Exception traces', (5,)),
+        ('dwt_pcs', 'Program counters', (6,)),
+        ('modes', 'Current modes', (7, 8, 9)),
+        ('locations', 'Current locations', (10,)),
+        ('functions', 'Current functions', (11,)),
     )
 
     def __init__(self):
diff --git a/decoders/arm_tpiu/pd.py b/decoders/arm_tpiu/pd.py
index 29b4605..eac932f 100644
--- a/decoders/arm_tpiu/pd.py
+++ b/decoders/arm_tpiu/pd.py
@@ -38,8 +38,8 @@ class Decoder(srd.Decoder):
         ('data', 'Stream data'),
     )
     annotation_rows = (
-        ('stream', 'Current stream', (0,)),
-        ('data', 'Stream data', (1,)),
+        ('streams', 'Current streams', (0,)),
+        ('data-vals', 'Stream data', (1,)),
     )
 
     def __init__(self):
diff --git a/decoders/atsha204a/pd.py b/decoders/atsha204a/pd.py
index c666332..9f66c85 100644
--- a/decoders/atsha204a/pd.py
+++ b/decoders/atsha204a/pd.py
@@ -114,8 +114,8 @@ class Decoder(srd.Decoder):
         ('warning', 'Warning'),
     )
     annotation_rows = (
-        ('frame', 'Frame', (0, 1, 2, 3, 4, 5, 6)),
-        ('status', 'Status', (7,)),
+        ('frame', 'Frames', (0, 1, 2, 3, 4, 5, 6)),
+        ('status-vals', 'Status', (7,)),
         ('warnings', 'Warnings', (8,)),
     )
 
diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index a0719b7..bb52bb6 100644
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -41,14 +41,14 @@ class Decoder(srd.Decoder):
         ('rfb', 'Read fuse bits'),
         ('rhfb', 'Read high fuse bits'),
         ('refb', 'Read extended fuse bits'),
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
         ('dev', 'Device'),
     )
     annotation_rows = (
         ('bits', 'Bits', ()),
         ('commands', 'Commands', tuple(range(7 + 1))),
         ('warnings', 'Warnings', (8,)),
-        ('dev', 'Device', (9,)),
+        ('devs', 'Devices', (9,)),
     )
 
     def __init__(self):
diff --git a/decoders/avr_pdi/pd.py b/decoders/avr_pdi/pd.py
index 164b992..0b3008f 100644
--- a/decoders/avr_pdi/pd.py
+++ b/decoders/avr_pdi/pd.py
@@ -148,7 +148,7 @@ class Decoder(srd.Decoder):
             Ann.PARITY_ERR, Ann.STOP_OK, Ann.STOP_ERR, Ann.BREAK)),
         ('pdi_fields', 'PDI fields', (Ann.OPCODE, Ann.DATA_PROG, Ann.DATA_DEV,
             Ann.PDI_BREAK)),
-        ('pdi_cmds', 'PDI Cmds', (Ann.ENABLE, Ann.DISABLE, Ann.COMMAND)),
+        ('pdi_cmds', 'PDI commands', (Ann.ENABLE, Ann.DISABLE, Ann.COMMAND)),
     )
     binary = (
         ('bytes', 'PDI protocol bytes'),
diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 5d45c56..3dbadc0 100644
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -45,7 +45,7 @@ class Decoder(srd.Decoder):
         {'id': 'sample_point', 'desc': 'Sample point (%)', 'default': 70.0},
     )
     annotations = (
-        ('data', 'CAN payload data'),
+        ('data', 'Payload data'),
         ('sof', 'Start of frame'),
         ('eof', 'End of frame'),
         ('id', 'Identifier'),
@@ -61,7 +61,7 @@ class Decoder(srd.Decoder):
         ('ack-slot', 'ACK slot'),
         ('ack-delimiter', 'ACK delimiter'),
         ('stuff-bit', 'Stuff bit'),
-        ('warnings', 'Human-readable warnings'),
+        ('warning', 'Warning'),
         ('bit', 'Bit'),
     )
     annotation_rows = (
diff --git a/decoders/cc1101/pd.py b/decoders/cc1101/pd.py
index 156d4ce..9893280 100644
--- a/decoders/cc1101/pd.py
+++ b/decoders/cc1101/pd.py
@@ -43,11 +43,11 @@ class Decoder(srd.Decoder):
         ('single_write', 'Single register write'),
         ('burst_read', 'Burst register read'),
         ('burst_write', 'Burst register write'),
-        ('status', 'Status register'),
+        ('status_reg', 'Status register'),
         ('warning', 'Warning'),
     )
     annotation_rows = (
-        ('cmd', 'Commands', (ANN_STROBE,)),
+        ('cmds', 'Commands', (ANN_STROBE,)),
         ('data', 'Data', (ANN_SINGLE_READ, ANN_SINGLE_WRITE, ANN_BURST_READ,
                             ANN_BURST_WRITE, ANN_STATUS_READ)),
         ('status', 'Status register', (ANN_STATUS,)),
diff --git a/decoders/cec/pd.py b/decoders/cec/pd.py
index b12633e..84166eb 100644
--- a/decoders/cec/pd.py
+++ b/decoders/cec/pd.py
@@ -66,11 +66,11 @@ class Decoder(srd.Decoder):
         ('eom-1', 'Message continued'),
         ('nack', 'ACK not set'),
         ('ack', 'ACK set'),
-        ('bits', 'Bits'),
-        ('bytes', 'Bytes'),
-        ('frames', 'Frames'),
-        ('sections', 'Sections'),
-        ('warnings', 'Warnings')
+        ('bit', 'Bit'),
+        ('byte', 'Byte'),
+        ('frame', 'Frame'),
+        ('section', 'Section'),
+        ('warning', 'Warning')
     )
     annotation_rows = (
         ('bits', 'Bits', (0, 1, 2, 3, 4, 5)),
diff --git a/decoders/dali/pd.py b/decoders/dali/pd.py
index 8be494a..419e364 100644
--- a/decoders/dali/pd.py
+++ b/decoders/dali/pd.py
@@ -42,7 +42,7 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         ('bit', 'Bit'),
-        ('startbit', 'Startbit'),
+        ('startbit', 'Start bit'),
         ('sbit', 'Select bit'),
         ('ybit', 'Individual or group'),
         ('address', 'Address'),
@@ -52,7 +52,7 @@ class Decoder(srd.Decoder):
     )
     annotation_rows = (
         ('bits', 'Bits', (0,)),
-        ('raw', 'Raw data', (7,)),
+        ('raw-data', 'Raw data', (7,)),
         ('fields', 'Fields', (1, 2, 3, 4, 5, 6)),
     )
 
diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
index 7365134..acb6bda 100644
--- a/decoders/dcf77/pd.py
+++ b/decoders/dcf77/pd.py
@@ -39,7 +39,7 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         ('start-of-minute', 'Start of minute'),
-        ('special-bits', 'Special bits (civil warnings, weather forecast)'),
+        ('special-bit', 'Special bit (civil warnings, weather forecast)'),
         ('call-bit', 'Call bit'),
         ('summer-time', 'Summer time announcement'),
         ('cest', 'CEST bit'),
@@ -55,9 +55,9 @@ class Decoder(srd.Decoder):
         ('month', 'Month'),
         ('year', 'Year'),
         ('date-parity', 'Date parity bit'),
-        ('raw-bits', 'Raw bits'),
-        ('unknown-bits', 'Unknown bits'),
-        ('warnings', 'Human-readable warnings'),
+        ('raw-bit', 'Raw bit'),
+        ('unknown-bit', 'Unknown bit'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('bits', 'Bits', (17, 18)),
diff --git a/decoders/dmx512/pd.py b/decoders/dmx512/pd.py
index 3fd2aba..9ef82d7 100644
--- a/decoders/dmx512/pd.py
+++ b/decoders/dmx512/pd.py
@@ -37,7 +37,7 @@ class Decoder(srd.Decoder):
         ('break', 'Break'),
         ('mab', 'Mark after break'),
         ('startbit', 'Start bit'),
-        ('stopbits', 'Stop bit'),
+        ('stopbit', 'Stop bit'),
         ('startcode', 'Start code'),
         ('channel', 'Channel'),
         ('interframe', 'Interframe'),
@@ -47,8 +47,8 @@ class Decoder(srd.Decoder):
     )
     annotation_rows = (
         ('bits', 'Bits', (0, 3, 4)),
-        ('data', 'Data', (9,)),
-        ('name', 'Logical', (1, 2, 5, 6, 7, 8)),
+        ('data-vals', 'Data', (9,)),
+        ('logical-vals', 'Logical', (1, 2, 5, 6, 7, 8)),
         ('errors', 'Errors', (10,)),
     )
 
diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py
index f8ebe19..c6a2e34 100644
--- a/decoders/ds1307/pd.py
+++ b/decoders/ds1307/pd.py
@@ -66,7 +66,7 @@ class Decoder(srd.Decoder):
         ('write-datetime', 'Write date/time'),
         ('reg-read', 'Register read'),
         ('reg-write', 'Register write'),
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('bits', 'Bits', tuple(range(9, 24))),
diff --git a/decoders/ds2408/pd.py b/decoders/ds2408/pd.py
index 33f2873..97fb650 100644
--- a/decoders/ds2408/pd.py
+++ b/decoders/ds2408/pd.py
@@ -40,7 +40,7 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['Embedded/industrial', 'IC']
     annotations = (
-        ('text', 'Human-readable text'),
+        ('text', 'Text'),
     )
 
     def __init__(self):
diff --git a/decoders/ds243x/pd.py b/decoders/ds243x/pd.py
index 7f9f666..0fbdcdf 100644
--- a/decoders/ds243x/pd.py
+++ b/decoders/ds243x/pd.py
@@ -71,7 +71,7 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['IC', 'Memory']
     annotations = (
-        ('text', 'Human-readable text'),
+        ('text', 'Text'),
     )
     binary = (
         ('mem_read', 'Data read from memory'),
diff --git a/decoders/ds28ea00/pd.py b/decoders/ds28ea00/pd.py
index 9a57844..39290b4 100644
--- a/decoders/ds28ea00/pd.py
+++ b/decoders/ds28ea00/pd.py
@@ -45,7 +45,7 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['IC', 'Sensor']
     annotations = (
-        ('text', 'Human-readable text'),
+        ('text', 'Text'),
     )
 
     def __init__(self):
diff --git a/decoders/dsi/pd.py b/decoders/dsi/pd.py
index c7cab80..b5faf6f 100644
--- a/decoders/dsi/pd.py
+++ b/decoders/dsi/pd.py
@@ -47,7 +47,7 @@ class Decoder(srd.Decoder):
     )
     annotation_rows = (
         ('bits', 'Bits', (0,)),
-        ('raw', 'Raw data', (3,)),
+        ('raw-vals', 'Raw data', (3,)),
         ('fields', 'Fields', (1, 2)),
     )
 
diff --git a/decoders/edid/pd.py b/decoders/edid/pd.py
index e2e7fee..fc932e2 100644
--- a/decoders/edid/pd.py
+++ b/decoders/edid/pd.py
@@ -83,8 +83,8 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['Display', 'Memory', 'PC']
     annotations = (
-        ('fields', 'EDID structure fields'),
-        ('sections', 'EDID structure sections'),
+        ('field', 'Field'),
+        ('section', 'Section'),
     )
     annotation_rows = (
         ('fields', 'Fields', (0,)),
diff --git a/decoders/eeprom24xx/pd.py b/decoders/eeprom24xx/pd.py
index 033a44b..549ee2d 100644
--- a/decoders/eeprom24xx/pd.py
+++ b/decoders/eeprom24xx/pd.py
@@ -38,7 +38,7 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         # Warnings
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
         # Bits/bytes
         ('control-code', 'Control code'),
         ('address-pin', 'Address pin (A0/A1/A2)'),
diff --git a/decoders/flexray/pd.py b/decoders/flexray/pd.py
index e13f2d4..c348bdd 100644
--- a/decoders/flexray/pd.py
+++ b/decoders/flexray/pd.py
@@ -78,7 +78,7 @@ class Decoder(srd.Decoder):
         ('frame-crc', 'Frame CRC'),
         ('cid-delimiter', 'Channel idle delimiter'),
         ('bss', 'Byte start sequence'),
-        ('warnings', 'Human-readable warnings'),
+        ('warning', 'Warning'),
         ('bit', 'Bit'),
         ('cid', 'Channel idle delimiter'),
         ('dts', 'Dynamic trailing sequence'),
diff --git a/decoders/graycode/pd.py b/decoders/graycode/pd.py
index 055908c..f3d45ab 100644
--- a/decoders/graycode/pd.py
+++ b/decoders/graycode/pd.py
@@ -94,12 +94,12 @@ class Decoder(srd.Decoder):
         ('phase', 'Phase'),
         ('increment', 'Increment'),
         ('count', 'Count'),
-        ('turns', 'Turns'),
+        ('turn', 'Turn'),
         ('interval', 'Interval'),
         ('average', 'Average'),
         ('rpm', 'Rate'),
     )
-    annotation_rows = tuple((u, v, (i,)) for i, (u, v) in enumerate(annotations))
+    annotation_rows = tuple((u + 's', v + 's', (i,)) for i, (u, v) in enumerate(annotations))
 
     def __init__(self):
         self.reset()
diff --git a/decoders/hdcp/pd.py b/decoders/hdcp/pd.py
index 2d000dc..157b23a 100644
--- a/decoders/hdcp/pd.py
+++ b/decoders/hdcp/pd.py
@@ -73,11 +73,11 @@ class Decoder(srd.Decoder):
     annotations = \
         tuple(('message-0x%02X' % i, 'Message 0x%02X' % i) for i in range(18)) + (
         ('summary', 'Summary'),
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('messages', 'Messages', tuple(range(18))),
-        ('summary', 'Summary', (18,)),
+        ('summaries', 'Summaries', (18,)),
         ('warnings', 'Warnings', (19,)),
     )
 
diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py
index f31e33e..8297662 100644
--- a/decoders/i2c/pd.py
+++ b/decoders/i2c/pd.py
@@ -90,11 +90,11 @@ class Decoder(srd.Decoder):
         ('address-write', 'Address write'),
         ('data-read', 'Data read'),
         ('data-write', 'Data write'),
-        ('warnings', 'Human-readable warnings'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('bits', 'Bits', (5,)),
-        ('addr-data', 'Address/Data', (0, 1, 2, 3, 4, 6, 7, 8, 9)),
+        ('addr-data', 'Address/data', (0, 1, 2, 3, 4, 6, 7, 8, 9)),
         ('warnings', 'Warnings', (10,)),
     )
     binary = (
diff --git a/decoders/ieee488/pd.py b/decoders/ieee488/pd.py
index e39ecc5..4531cb3 100644
--- a/decoders/ieee488/pd.py
+++ b/decoders/ieee488/pd.py
@@ -300,7 +300,7 @@ class Decoder(srd.Decoder):
         ('eoi', 'EOI'),
         ('text', 'Talker text'),
         ('periph', 'IEC bus peripherals'),
-        ('warn', 'Warning'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('bits', 'IEC bits', (ANN_RAW_BIT,)),
@@ -309,7 +309,7 @@ class Decoder(srd.Decoder):
         ('eois', 'EOI', (ANN_EOI,)),
         ('texts', 'Talker texts', (ANN_TEXT,)),
         ('periphs', 'IEC peripherals', (ANN_IEC_PERIPH,)),
-        ('warns', 'Warnings', (ANN_WARN,)),
+        ('warnings', 'Warnings', (ANN_WARN,)),
     )
     binary = (
         ('raw', 'Raw bytes'),
diff --git a/decoders/ir_nec/pd.py b/decoders/ir_nec/pd.py
index 096ffc9..3ee3716 100644
--- a/decoders/ir_nec/pd.py
+++ b/decoders/ir_nec/pd.py
@@ -54,12 +54,12 @@ class Decoder(srd.Decoder):
         ('cmd-inv', 'Command#'),
         ('repeat-code', 'Repeat code'),
         ('remote', 'Remote'),
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('bits', 'Bits', (0, 1, 2, 3, 4)),
         ('fields', 'Fields', (5, 6, 7, 8, 9, 10)),
-        ('remote', 'Remote', (11,)),
+        ('remote-vals', 'Remote', (11,)),
         ('warnings', 'Warnings', (12,)),
     )
 
diff --git a/decoders/jitter/pd.py b/decoders/jitter/pd.py
index 5343fbf..220790e 100644
--- a/decoders/jitter/pd.py
+++ b/decoders/jitter/pd.py
@@ -51,13 +51,13 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         ('jitter', 'Jitter value'),
-        ('clk_missed', 'Clock missed'),
-        ('sig_missed', 'Signal missed'),
+        ('clk_miss', 'Clock miss'),
+        ('sig_miss', 'Signal miss'),
     )
     annotation_rows = (
-        ('jitter', 'Jitter values', (0,)),
-        ('clk_missed', 'Clock missed', (1,)),
-        ('sig_missed', 'Signal missed', (2,)),
+        ('jitter_vals', 'Jitter values', (0,)),
+        ('clk_misses', 'Clock misses', (1,)),
+        ('sig_misses', 'Signal misses', (2,)),
     )
     binary = (
         ('ascii-float', 'Jitter values as newline-separated ASCII floats'),
diff --git a/decoders/jtag/pd.py b/decoders/jtag/pd.py
index 618613e..2bbe9a4 100644
--- a/decoders/jtag/pd.py
+++ b/decoders/jtag/pd.py
@@ -83,8 +83,8 @@ class Decoder(srd.Decoder):
     annotation_rows = (
         ('bits-tdi', 'Bits (TDI)', (16,)),
         ('bits-tdo', 'Bits (TDO)', (17,)),
-        ('bitstrings-tdi', 'Bitstring (TDI)', (18,)),
-        ('bitstrings-tdo', 'Bitstring (TDO)', (19,)),
+        ('bitstrings-tdi', 'Bitstrings (TDI)', (18,)),
+        ('bitstrings-tdo', 'Bitstrings (TDO)', (19,)),
         ('states', 'States', tuple(range(15 + 1))),
     )
 
diff --git a/decoders/jtag_ejtag/pd.py b/decoders/jtag_ejtag/pd.py
index 5a537c9..e2bf0a5 100644
--- a/decoders/jtag_ejtag/pd.py
+++ b/decoders/jtag_ejtag/pd.py
@@ -210,7 +210,7 @@ class Decoder(srd.Decoder):
         ('control_fields_in', 'Control fields in', (10,)),
         ('control_fields_out', 'Control fields out', (11,)),
         ('regs', 'Registers', regs_items['rows_range']),
-        ('pracc', 'PrAcc', (12,)),
+        ('pracc-vals', 'PrAcc', (12,)),
     )
 
     def __init__(self):
diff --git a/decoders/lin/pd.py b/decoders/lin/pd.py
index a8b1998..11495d1 100644
--- a/decoders/lin/pd.py
+++ b/decoders/lin/pd.py
@@ -73,12 +73,12 @@ class Decoder(srd.Decoder):
     annotations = (
         ('data', 'LIN data'),
         ('control', 'Protocol info'),
-        ('error', 'Error descriptions'),
-        ('inline_error', 'Protocol violations and errors'),
+        ('error', 'Error description'),
+        ('inline_error', 'Protocol violation or error'),
     )
     annotation_rows = (
-        ('data', 'Data', (0, 1, 3)),
-        ('error', 'Error', (2,)),
+        ('data_vals', 'Data', (0, 1, 3)),
+        ('errors', 'Errors', (2,)),
     )
 
     def __init__(self):
diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py
index 14df1b5..d59fa5f 100644
--- a/decoders/lm75/pd.py
+++ b/decoders/lm75/pd.py
@@ -55,11 +55,11 @@ class Decoder(srd.Decoder):
             'values': (9, 10, 11, 12)},
     )
     annotations = (
-        ('celsius', 'Temperature in degrees Celsius'),
-        ('kelvin', 'Temperature in Kelvin'),
-        ('text-verbose', 'Human-readable text (verbose)'),
-        ('text', 'Human-readable text'),
-        ('warnings', 'Human-readable warnings'),
+        ('celsius', 'Temperature / °C'),
+        ('kelvin', 'Temperature / Kelvin'),
+        ('text-verbose', 'Text (verbose)'),
+        ('text', 'Text'),
+        ('warning', 'Warning'),
     )
 
     def __init__(self):
diff --git a/decoders/lpc/pd.py b/decoders/lpc/pd.py
index 095c8b5..cf1707f 100644
--- a/decoders/lpc/pd.py
+++ b/decoders/lpc/pd.py
@@ -122,7 +122,7 @@ class Decoder(srd.Decoder):
         {'id': 'lsmi',   'name': 'LSMI#',   'desc': 'System Management Interrupt'},
     )
     annotations = (
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
         ('start', 'Start'),
         ('cycle-type', 'Cycle-type/direction'),
         ('addr', 'Address'),
@@ -132,7 +132,7 @@ class Decoder(srd.Decoder):
         ('tar2', 'Turn-around cycle 2'),
     )
     annotation_rows = (
-        ('data', 'Data', (1, 2, 3, 4, 5, 6, 7)),
+        ('data-vals', 'Data', (1, 2, 3, 4, 5, 6, 7)),
         ('warnings', 'Warnings', (0,)),
     )
 
diff --git a/decoders/max7219/pd.py b/decoders/max7219/pd.py
index 53067a6..eb26e10 100644
--- a/decoders/max7219/pd.py
+++ b/decoders/max7219/pd.py
@@ -51,9 +51,9 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['Display']
     annotations = (
-        ('register', 'Registers written to the device'),
-        ('digit', 'Digits displayed on the device'),
-        ('warnings', 'Human-readable warnings'),
+        ('register', 'Register write'),
+        ('digit', 'Digit displayed'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('commands', 'Commands', (ann_reg, ann_digit)),
diff --git a/decoders/mdio/pd.py b/decoders/mdio/pd.py
index 1d060b0..b52f58f 100644
--- a/decoders/mdio/pd.py
+++ b/decoders/mdio/pd.py
@@ -55,11 +55,11 @@ class Decoder(srd.Decoder):
         ('decode', 'Decode'),
     )
     annotation_rows = (
-        ('bit-val', 'Bit value', (0,)),
-        ('bit-num', 'Bit number', (1,)),
-        ('frame', 'Frame', (2, 3)),
-        ('frame-error', 'Frame error', (4,)),
-        ('decode', 'Decode', (5,)),
+        ('bit-vals', 'Bit values', (0,)),
+        ('bit-nums', 'Bit numbers', (1,)),
+        ('frames', 'Frames', (2, 3)),
+        ('frame-errors', 'Frame errors', (4,)),
+        ('decode-vals', 'Decode', (5,)),
     )
 
     def __init__(self):
diff --git a/decoders/midi/pd.py b/decoders/midi/pd.py
index ae35e12..60bfd2e 100644
--- a/decoders/midi/pd.py
+++ b/decoders/midi/pd.py
@@ -35,9 +35,9 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['Audio', 'PC']
     annotations = (
-        ('text-verbose', 'Human-readable text (verbose)'),
-        ('text-sysreal-verbose', 'Human-readable SysReal text (verbose)'),
-        ('text-error', 'Human-readable Error text'),
+        ('text-verbose', 'Text (verbose)'),
+        ('text-sysreal-verbose', 'SysReal text (verbose)'),
+        ('text-error', 'Error text'),
     )
     annotation_rows = (
         ('normal', 'Normal', (0, 2)),
diff --git a/decoders/miller/pd.py b/decoders/miller/pd.py
index 90c7c19..33214b1 100644
--- a/decoders/miller/pd.py
+++ b/decoders/miller/pd.py
@@ -51,7 +51,7 @@ class Decoder(srd.Decoder):
         ('bit', 'Bit'),
         ('bitstring', 'Bitstring'),
     )
-    annotation_rows = tuple((u, v, (i,)) for i, (u, v) in enumerate(annotations))
+    annotation_rows = tuple((u + 's', v + 's', (i,)) for i, (u, v) in enumerate(annotations))
     binary = (
         ('raw', 'Raw binary'),
     )
diff --git a/decoders/modbus/pd.py b/decoders/modbus/pd.py
index 1d012e4..83ffbb2 100644
--- a/decoders/modbus/pd.py
+++ b/decoders/modbus/pd.py
@@ -841,7 +841,7 @@ class Decoder(srd.Decoder):
     annotation_rows = (
         ('sc', 'Server->client', (0, 1, 2, 3, 4, 5, 6)),
         ('cs', 'Client->server', (7, 8, 9, 10, 11, 12, 13)),
-        ('error-indicator', 'Errors in frame', (14,)),
+        ('error-indicators', 'Errors in frame', (14,)),
     )
     options = (
         {'id': 'scchannel', 'desc': 'Server -> client channel',
diff --git a/decoders/morse/pd.py b/decoders/morse/pd.py
index f6ff718..f768b3a 100644
--- a/decoders/morse/pd.py
+++ b/decoders/morse/pd.py
@@ -130,12 +130,12 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         ('time', 'Time'),
-        ('units', 'Units'),
+        ('unit', 'Unit'),
         ('symbol', 'Symbol'),
         ('letter', 'Letter'),
         ('word', 'Word'),
     )
-    annotation_rows = tuple((u, v, (i,)) for i, (u, v) in enumerate(annotations))
+    annotation_rows = tuple((u + 's', v + 's', (i,)) for i, (u, v) in enumerate(annotations))
 
     def __init__(self):
         self.reset()
diff --git a/decoders/mrf24j40/pd.py b/decoders/mrf24j40/pd.py
index db3ca98..87022dd 100644
--- a/decoders/mrf24j40/pd.py
+++ b/decoders/mrf24j40/pd.py
@@ -33,11 +33,11 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['IC', 'Wireless/RF']
     annotations = (
-        ('sread', 'Short register read commands'),
-        ('swrite', 'Short register write commands'),
-        ('lread', 'Long register read commands'),
-        ('lwrite', 'Long register write commands'),
-        ('warning', 'Warnings'),
+        ('sread', 'Short register read'),
+        ('swrite', 'Short register write'),
+        ('lread', 'Long register read'),
+        ('lwrite', 'Long register write'),
+        ('warning', 'Warning'),
         ('tx-frame', 'TX frame'),
         ('rx-frame', 'RX frame'),
         ('tx-retry-1', '1x TX retry'),
@@ -47,8 +47,8 @@ class Decoder(srd.Decoder):
         ('ccafail', 'CCAFAIL (channel busy)'),
     )
     annotation_rows = (
-        ('read', 'Read', (0, 2)),
-        ('write', 'Write', (1, 3)),
+        ('reads', 'Reads', (0, 2)),
+        ('writes', 'Writes', (1, 3)),
         ('warnings', 'Warnings', (4,)),
         ('tx-frames', 'TX frames', (5,)),
         ('rx-frames', 'RX frames', (6,)),
diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
index e961778..c8ff2cc 100644
--- a/decoders/mxc6225xu/pd.py
+++ b/decoders/mxc6225xu/pd.py
@@ -69,7 +69,7 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['IC', 'Sensor']
     annotations = (
-        ('text', 'Human-readable text'),
+        ('text', 'Text'),
     )
 
     def __init__(self):
diff --git a/decoders/nes_gamepad/pd.py b/decoders/nes_gamepad/pd.py
index 17c57ca..b276e5d 100644
--- a/decoders/nes_gamepad/pd.py
+++ b/decoders/nes_gamepad/pd.py
@@ -36,14 +36,14 @@ class Decoder(srd.Decoder):
             'default': 'Standard gamepad', 'values': ('Standard gamepad',)},
     )
     annotations = (
-        ('button', 'Button states'),
+        ('button', 'Button state'),
         ('no-press', 'No button press'),
         ('not-connected', 'Gamepad unconnected')
     )
     annotation_rows = (
         ('buttons', 'Button states', (0,)),
-        ('no-press', 'No button press', (1,)),
-        ('not-connected', 'Gamepad unconnected', (2,)),
+        ('no-presses', 'No button presses', (1,)),
+        ('not-connected-vals', 'Gamepad unconnected', (2,)),
     )
 
     def __init__(self):
diff --git a/decoders/nrf24l01/pd.py b/decoders/nrf24l01/pd.py
index 64fe577..06755ff 100644
--- a/decoders/nrf24l01/pd.py
+++ b/decoders/nrf24l01/pd.py
@@ -74,14 +74,14 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         # Sent from the host to the chip.
-        ('cmd', 'Commands sent to the device'),
-        ('tx-data', 'Payload sent to the device'),
+        ('cmd', 'Command'),
+        ('tx-data', 'Payload'),
 
         # Returned by the chip.
-        ('register', 'Registers read from the device'),
-        ('rx-data', 'Payload read from the device'),
+        ('register', 'Register read'),
+        ('rx-data', 'Payload read'),
 
-        ('warning', 'Warnings'),
+        ('warning', 'Warning'),
     )
     ann_cmd = 0
     ann_tx = 1
diff --git a/decoders/nunchuk/pd.py b/decoders/nunchuk/pd.py
index 59b1028..9f1388f 100644
--- a/decoders/nunchuk/pd.py
+++ b/decoders/nunchuk/pd.py
@@ -39,11 +39,11 @@ class Decoder(srd.Decoder):
         ('nunchuk-write', 'Nunchuk write'),
         ('cmd-init', 'Init command'),
         ('summary', 'Summary'),
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('regs', 'Registers', tuple(range(13))),
-        ('summary', 'Summary', (13,)),
+        ('summaries', 'Summaries', (13,)),
         ('warnings', 'Warnings', (14,)),
     )
 
diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index 564d6f0..6ad2802 100644
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -107,10 +107,10 @@ class Decoder(srd.Decoder):
     )
     annotations = (
         ('bit', 'Bit'),
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
         ('reset', 'Reset'),
         ('presence', 'Presence'),
-        ('overdrive', 'Overdrive speed notifications'),
+        ('overdrive', 'Overdrive speed notification'),
     )
     annotation_rows = (
         ('bits', 'Bits', (0, 2, 3)),
diff --git a/decoders/onewire_network/pd.py b/decoders/onewire_network/pd.py
index ef302ae..f07110b 100644
--- a/decoders/onewire_network/pd.py
+++ b/decoders/onewire_network/pd.py
@@ -44,7 +44,7 @@ class Decoder(srd.Decoder):
     outputs = ['onewire_network']
     tags = ['Embedded/industrial']
     annotations = (
-        ('text', 'Human-readable text'),
+        ('text', 'Text'),
     )
 
     def __init__(self):
diff --git a/decoders/ook/pd.py b/decoders/ook/pd.py
index 5fc8d01..03157f9 100644
--- a/decoders/ook/pd.py
+++ b/decoders/ook/pd.py
@@ -63,16 +63,16 @@ class Decoder(srd.Decoder):
         ('info', 'Info'),
         ('1111', '1111'),
         ('1010', '1010'),
-        ('diffman', 'Diff Man'),
+        ('diffman', 'Diff man'),
         ('nrz', 'NRZ'),
     )
     annotation_rows = (
-        ('frame', 'Framing',(0,)),
-        ('info', 'Info', (1,)),
+        ('frames', 'Framing', (0,)),
+        ('info-vals', 'Info', (1,)),
         ('man1111', 'Man 1111', (2,)),
         ('man1010', 'Man 1010', (3,)),
-        ('diffman', 'Diff Man', (4,)),
-        ('nrz', 'NRZ', (5,)),
+        ('diffmans', 'Diff man', (4,)),
+        ('nrz-vals', 'NRZ', (5,)),
     )
     binary = (
         ('pulse-lengths', 'Pulse lengths'),
diff --git a/decoders/ook_oregon/pd.py b/decoders/ook_oregon/pd.py
index 225f598..4c0c461 100644
--- a/decoders/ook_oregon/pd.py
+++ b/decoders/ook_oregon/pd.py
@@ -45,7 +45,7 @@ class Decoder(srd.Decoder):
     annotation_rows = (
         ('bits', 'Bits', (0,)),
         ('fields', 'Fields', (1, 3, 4)),
-        ('l2', 'Level 2', (2,)),
+        ('l2vals', 'Level 2', (2,)),
     )
     binary = (
         ('data-hex', 'Hex data'),
diff --git a/decoders/ook_vis/pd.py b/decoders/ook_vis/pd.py
index f985b96..1645ceb 100644
--- a/decoders/ook_vis/pd.py
+++ b/decoders/ook_vis/pd.py
@@ -43,8 +43,8 @@ class Decoder(srd.Decoder):
         ('compare', 'Compare', (1,)),
         ('fields', 'Fields', (2,)),
         ('ref_fields', 'Ref fields', (3,)),
-        ('level2', 'L2', (4,)),
-        ('ref_level2', 'Ref L2', (5,)),
+        ('level2_vals', 'L2', (4,)),
+        ('ref_level2_vals', 'Ref L2', (5,)),
     )
     options = (
         {'id': 'displayas', 'desc': 'Display as', 'default': 'Nibble - Hex',
diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
index 6c93114..0dd8e90 100644
--- a/decoders/pan1321/pd.py
+++ b/decoders/pan1321/pd.py
@@ -34,9 +34,9 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['Wireless/RF']
     annotations = (
-        ('text-verbose', 'Human-readable text (verbose)'),
-        ('text', 'Human-readable text'),
-        ('warnings', 'Human-readable warnings'),
+        ('text-verbose', 'Text (verbose)'),
+        ('text', 'Text'),
+        ('warning', 'Warning'),
     )
 
     def __init__(self):
diff --git a/decoders/parallel/pd.py b/decoders/parallel/pd.py
index 405cdeb..8f23aa8 100644
--- a/decoders/parallel/pd.py
+++ b/decoders/parallel/pd.py
@@ -86,8 +86,8 @@ class Decoder(srd.Decoder):
             'default': 'little', 'values': ('little', 'big')},
     )
     annotations = (
-        ('items', 'Items'),
-        ('words', 'Words'),
+        ('item', 'Item'),
+        ('word', 'Word'),
     )
     annotation_rows = (
         ('items', 'Items', (0,)),
diff --git a/decoders/pca9571/pd.py b/decoders/pca9571/pd.py
index df309e9..e27f215 100644
--- a/decoders/pca9571/pd.py
+++ b/decoders/pca9571/pd.py
@@ -36,7 +36,7 @@ class Decoder(srd.Decoder):
     annotations = (
         ('register', 'Register type'),
         ('value', 'Register value'),
-        ('warning', 'Warning messages'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('regs', 'Registers', (0, 1)),
diff --git a/decoders/pwm/pd.py b/decoders/pwm/pd.py
index d8626ee..2eda02c 100644
--- a/decoders/pwm/pd.py
+++ b/decoders/pwm/pd.py
@@ -45,8 +45,8 @@ class Decoder(srd.Decoder):
         ('period', 'Period'),
     )
     annotation_rows = (
-         ('duty-cycle', 'Duty cycle', (0,)),
-         ('period', 'Period', (1,)),
+         ('duty-cycle-vals', 'Duty cycles', (0,)),
+         ('periods', 'Periods', (1,)),
     )
     binary = (
         ('raw', 'RAW file'),
diff --git a/decoders/qi/pd.py b/decoders/qi/pd.py
index b750d9c..ab9c5fa 100644
--- a/decoders/qi/pd.py
+++ b/decoders/qi/pd.py
@@ -58,14 +58,14 @@ class Decoder(srd.Decoder):
         {'id': 'qi', 'name': 'Qi', 'desc': 'Demodulated Qi data line'},
     )
     annotations = (
-        ('bits', 'Bits'),
-        ('bytes-errors', 'Bit errors'),
-        ('bytes-start', 'Start bits'),
-        ('bytes-info', 'Info bits'),
-        ('bytes-data', 'Data bytes'),
-        ('packets-data', 'Packet data'),
-        ('packets-checksum-ok', 'Packet checksum'),
-        ('packets-checksum-err', 'Packet checksum'),
+        ('bit', 'Bit'),
+        ('byte-error', 'Bit error'),
+        ('byte-start', 'Start bit'),
+        ('byte-info', 'Info bit'),
+        ('byte-data', 'Data byte'),
+        ('packet-data', 'Packet data'),
+        ('packet-checksum-ok', 'Packet checksum OK'),
+        ('packet-checksum-err', 'Packet checksum error'),
     )
     annotation_rows = (
         ('bits', 'Bits', (0,)),
diff --git a/decoders/rfm12/pd.py b/decoders/rfm12/pd.py
index d3df13a..3f25b32 100644
--- a/decoders/rfm12/pd.py
+++ b/decoders/rfm12/pd.py
@@ -31,16 +31,16 @@ class Decoder(srd.Decoder):
     tags = ['Wireless/RF']
     annotations = (
         ('cmd', 'Command'),
-        ('params', 'Command parameters'),
-        ('disabled', 'Disabled bits'),
-        ('return', 'Returned values'),
-        ('disabled_return', 'Disabled returned values'),
+        ('param', 'Command parameter'),
+        ('disabled', 'Disabled bit'),
+        ('return', 'Returned value'),
+        ('disabled_return', 'Disabled returned value'),
         ('interpretation', 'Interpretation'),
     )
     annotation_rows = (
         ('commands', 'Commands', (0, 1, 2)),
-        ('return', 'Return', (3, 4)),
-        ('interpretation', 'Interpretation', (5,)),
+        ('returns', 'Returns', (3, 4)),
+        ('interpretations', 'Interpretations', (5,)),
     )
 
     def __init__(self):
diff --git a/decoders/rgb_led_spi/pd.py b/decoders/rgb_led_spi/pd.py
index ee94c6b..82877b3 100644
--- a/decoders/rgb_led_spi/pd.py
+++ b/decoders/rgb_led_spi/pd.py
@@ -30,7 +30,7 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['Display']
     annotations = (
-        ('rgb', 'RGB values'),
+        ('rgb', 'RGB value'),
     )
 
     def __init__(self):
diff --git a/decoders/rgb_led_ws281x/pd.py b/decoders/rgb_led_ws281x/pd.py
index adf68eb..bf181b6 100644
--- a/decoders/rgb_led_ws281x/pd.py
+++ b/decoders/rgb_led_ws281x/pd.py
@@ -42,8 +42,8 @@ class Decoder(srd.Decoder):
         ('rgb', 'RGB'),
     )
     annotation_rows = (
-        ('bit', 'Bits', (0, 1)),
-        ('rgb', 'RGB', (2,)),
+        ('bits', 'Bits', (0, 1)),
+        ('rgb-vals', 'RGB values', (2,)),
     )
 
     def __init__(self):
diff --git a/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py
index b57fae6..d71e62b 100644
--- a/decoders/rtc8564/pd.py
+++ b/decoders/rtc8564/pd.py
@@ -48,7 +48,7 @@ class Decoder(srd.Decoder):
     )
     annotation_rows = (
         ('bits', 'Bits', tuple(range(0, 8 + 1)) + (11, 12, 13)),
-        ('regs', 'Register access', (14, 15)),
+        ('regs', 'Register accesses', (14, 15)),
         ('date-time', 'Date/time', (9, 10)),
     )
 
diff --git a/decoders/sda2506/pd.py b/decoders/sda2506/pd.py
index 9ae5c01..5b071d8 100644
--- a/decoders/sda2506/pd.py
+++ b/decoders/sda2506/pd.py
@@ -41,8 +41,8 @@ class Decoder(srd.Decoder):
         ('cmdbit', 'Command bit'),
         ('databit', 'Data bit'),
         ('cmd', 'Command'),
-        ('data', 'Data byte'),
-        ('warnings', 'Human-readable warnings'),
+        ('databyte', 'Data byte'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('bits', 'Bits', (ann_cmdbit, ann_databit)),
diff --git a/decoders/sdcard_sd/pd.py b/decoders/sdcard_sd/pd.py
index 66fa502..f5d6834 100644
--- a/decoders/sdcard_sd/pd.py
+++ b/decoders/sdcard_sd/pd.py
@@ -43,22 +43,22 @@ class Decoder(srd.Decoder):
     annotations = \
         tuple(('cmd%d' % i, 'CMD%d' % i) for i in range(64)) + \
         tuple(('acmd%d' % i, 'ACMD%d' % i) for i in range(64)) + ( \
-        ('bits', 'Bits'),
+        ('bit', 'Bit'),
         ('field-start', 'Start bit'),
         ('field-transmission', 'Transmission bit'),
         ('field-cmd', 'Command'),
         ('field-arg', 'Argument'),
         ('field-crc', 'CRC'),
         ('field-end', 'End bit'),
-        ('decoded-bits', 'Decoded bits'),
-        ('decoded-fields', 'Decoded fields'),
+        ('decoded-bit', 'Decoded bit'),
+        ('decoded-field', 'Decoded field'),
     )
     annotation_rows = (
         ('raw-bits', 'Raw bits', (128,)),
         ('decoded-bits', 'Decoded bits', (135,)),
         ('decoded-fields', 'Decoded fields', (136,)),
         ('fields', 'Fields', tuple(range(129, 135))),
-        ('cmd', 'Commands', tuple(range(128))),
+        ('commands', 'Commands', tuple(range(128))),
     )
 
     def __init__(self):
diff --git a/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py
index 5bb446a..5b34209 100644
--- a/decoders/sdcard_spi/pd.py
+++ b/decoders/sdcard_spi/pd.py
@@ -38,12 +38,12 @@ class Decoder(srd.Decoder):
         ('r2', 'R2 reply'),
         ('r3', 'R3 reply'),
         ('r7', 'R7 reply'),
-        ('bits', 'Bits'),
-        ('bit-warnings', 'Bit warnings'),
+        ('bit', 'Bit'),
+        ('bit-warning', 'Bit warning'),
     )
     annotation_rows = (
         ('bits', 'Bits', (133, 134)),
-        ('cmd-reply', 'Commands/replies', tuple(range(133))),
+        ('commands-replies', 'Commands/replies', tuple(range(133))),
     )
 
     def __init__(self):
diff --git a/decoders/signature/pd.py b/decoders/signature/pd.py
index aebd5b4..946b2da 100644
--- a/decoders/signature/pd.py
+++ b/decoders/signature/pd.py
@@ -71,11 +71,11 @@ class Decoder(srd.Decoder):
         ('bit1', 'Bit1'),
         ('start', 'START'),
         ('stop', 'STOP'),
-        ('sig', 'Sig')
+        ('signature', 'Signature')
     )
     annotation_rows = (
         ('bits', 'Bits', (0, 1, 2, 3)),
-        ('sig', 'Sig', (4,))
+        ('signatures', 'Signatures', (4,))
     )
 
     def __init__(self):
diff --git a/decoders/spdif/pd.py b/decoders/spdif/pd.py
index bec28cf..126a027 100644
--- a/decoders/spdif/pd.py
+++ b/decoders/spdif/pd.py
@@ -38,9 +38,9 @@ class Decoder(srd.Decoder):
     annotations = (
         ('bitrate', 'Bitrate / baudrate'),
         ('preamble', 'Preamble'),
-        ('bits', 'Bits'),
-        ('aux', 'Auxillary-audio-databits'),
-        ('samples', 'Audio Samples'),
+        ('bit', 'Bit'),
+        ('aux', 'Auxillary-audio-databit'),
+        ('sample', 'Audio Sample'),
         ('validity', 'Data Valid'),
         ('subcode', 'Subcode data'),
         ('chan_stat', 'Channnel Status'),
diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 5f18d72..fd9a78f 100644
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -105,19 +105,19 @@ class Decoder(srd.Decoder):
     annotations = (
         ('miso-data', 'MISO data'),
         ('mosi-data', 'MOSI data'),
-        ('miso-bits', 'MISO bits'),
-        ('mosi-bits', 'MOSI bits'),
-        ('warnings', 'Human-readable warnings'),
+        ('miso-bit', 'MISO bit'),
+        ('mosi-bit', 'MOSI bit'),
+        ('warning', 'Warning'),
         ('miso-transfer', 'MISO transfer'),
         ('mosi-transfer', 'MOSI transfer'),
     )
     annotation_rows = (
         ('miso-bits', 'MISO bits', (2,)),
-        ('miso-data', 'MISO data', (0,)),
-        ('miso-transfer', 'MISO transfer', (5,)),
+        ('miso-data-vals', 'MISO data', (0,)),
+        ('miso-transfers', 'MISO transfers', (5,)),
         ('mosi-bits', 'MOSI bits', (3,)),
-        ('mosi-data', 'MOSI data', (1,)),
-        ('mosi-transfer', 'MOSI transfer', (6,)),
+        ('mosi-data-vals', 'MOSI data', (1,)),
+        ('mosi-transfers', 'MOSI transfers', (6,)),
         ('other', 'Other', (4,)),
     )
     binary = (
diff --git a/decoders/st7735/pd.py b/decoders/st7735/pd.py
index 252b188..626d2eb 100644
--- a/decoders/st7735/pd.py
+++ b/decoders/st7735/pd.py
@@ -89,7 +89,7 @@ class Decoder(srd.Decoder):
     annotation_rows = (
         ('bits', 'Bits', (Ann.BITS,)),
         ('fields', 'Fields', (Ann.CMD, Ann.DATA)),
-        ('description', 'Description', (Ann.DESC,)),
+        ('descriptions', 'Descriptions', (Ann.DESC,)),
     )
 
     def __init__(self):
diff --git a/decoders/stepper_motor/pd.py b/decoders/stepper_motor/pd.py
index 99a4b2e..4f245ec 100644
--- a/decoders/stepper_motor/pd.py
+++ b/decoders/stepper_motor/pd.py
@@ -43,8 +43,8 @@ class Decoder(srd.Decoder):
         ('position', 'Position')
     )
     annotation_rows = (
-        ('speed', 'Speed', (0,)),
-        ('position', 'Position', (1,)),
+        ('speeds', 'Speeds', (0,)),
+        ('positions', 'Positions', (1,)),
     )
 
     def __init__(self):
diff --git a/decoders/swim/pd.py b/decoders/swim/pd.py
index fd43f41..b48bb12 100644
--- a/decoders/swim/pd.py
+++ b/decoders/swim/pd.py
@@ -55,7 +55,7 @@ class Decoder(srd.Decoder):
         ('address', 'Address'),
         ('data-write', 'Data write'),
         ('data-read', 'Data read'),
-        ('debug', 'Debug'),
+        ('debug-msg', 'Debug message'),
     )
     annotation_rows = (
         ('bits', 'Bits', (0,)),
diff --git a/decoders/tca6408a/pd.py b/decoders/tca6408a/pd.py
index 4924517..3a46fac 100644
--- a/decoders/tca6408a/pd.py
+++ b/decoders/tca6408a/pd.py
@@ -34,7 +34,7 @@ class Decoder(srd.Decoder):
     annotations = (
         ('register', 'Register type'),
         ('value', 'Register value'),
-        ('warnings', 'Warning messages'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('regs', 'Registers', (0, 1)),
diff --git a/decoders/tdm_audio/pd.py b/decoders/tdm_audio/pd.py
index 6c5869b..e805706 100644
--- a/decoders/tdm_audio/pd.py
+++ b/decoders/tdm_audio/pd.py
@@ -42,7 +42,7 @@ class Decoder(srd.Decoder):
         {'id': 'edge', 'desc': 'Clock edge to sample on', 'default': 'rising', 'values': ('rising', 'falling') }
     )
     annotations = tuple(('ch%d' % i, 'Ch%d' % i) for i in range(MAX_CHANNELS))
-    annotation_rows = tuple(('ch%d' % i, 'Ch%d' % i, (i,)) for i in range(MAX_CHANNELS))
+    annotation_rows = tuple(('ch%d-vals' % i, 'Ch%d' % i, (i,)) for i in range(MAX_CHANNELS))
 
     def __init__(self):
         self.reset()
diff --git a/decoders/timing/pd.py b/decoders/timing/pd.py
index d3e0d1f..3c70eca 100644
--- a/decoders/timing/pd.py
+++ b/decoders/timing/pd.py
@@ -64,9 +64,9 @@ class Decoder(srd.Decoder):
         ('delta', 'Delta'),
     )
     annotation_rows = (
-        ('time', 'Time', (0,)),
-        ('average', 'Average', (1,)),
-        ('delta', 'Delta', (2,)),
+        ('times', 'Times', (0,)),
+        ('averages', 'Averages', (1,)),
+        ('deltas', 'Deltas', (2,)),
     )
     options = (
         { 'id': 'avg_period', 'desc': 'Averaging period', 'default': 100 },
diff --git a/decoders/uart/pd.py b/decoders/uart/pd.py
index 0109425..0c501b0 100644
--- a/decoders/uart/pd.py
+++ b/decoders/uart/pd.py
@@ -134,18 +134,18 @@ class Decoder(srd.Decoder):
     annotations = (
         ('rx-data', 'RX data'),
         ('tx-data', 'TX data'),
-        ('rx-start', 'RX start bits'),
-        ('tx-start', 'TX start bits'),
-        ('rx-parity-ok', 'RX parity OK bits'),
-        ('tx-parity-ok', 'TX parity OK bits'),
-        ('rx-parity-err', 'RX parity error bits'),
-        ('tx-parity-err', 'TX parity error bits'),
-        ('rx-stop', 'RX stop bits'),
-        ('tx-stop', 'TX stop bits'),
-        ('rx-warnings', 'RX warnings'),
-        ('tx-warnings', 'TX warnings'),
-        ('rx-data-bits', 'RX data bits'),
-        ('tx-data-bits', 'TX data bits'),
+        ('rx-start', 'RX start bit'),
+        ('tx-start', 'TX start bit'),
+        ('rx-parity-ok', 'RX parity OK bit'),
+        ('tx-parity-ok', 'TX parity OK bit'),
+        ('rx-parity-err', 'RX parity error bit'),
+        ('tx-parity-err', 'TX parity error bit'),
+        ('rx-stop', 'RX stop bit'),
+        ('tx-stop', 'TX stop bit'),
+        ('rx-warning', 'RX warning'),
+        ('tx-warning', 'TX warning'),
+        ('rx-data-bit', 'RX data bit'),
+        ('tx-data-bit', 'TX data bit'),
         ('rx-break', 'RX break'),
         ('tx-break', 'TX break'),
         ('rx-packet', 'RX packet'),
@@ -153,14 +153,14 @@ class Decoder(srd.Decoder):
     )
     annotation_rows = (
         ('rx-data-bits', 'RX bits', (Ann.RX_DATA_BIT,)),
-        ('rx-data', 'RX', (Ann.RX_DATA, Ann.RX_START, Ann.RX_PARITY_OK, Ann.RX_PARITY_ERR, Ann.RX_STOP)),
+        ('rx-data-vals', 'RX data', (Ann.RX_DATA, Ann.RX_START, Ann.RX_PARITY_OK, Ann.RX_PARITY_ERR, Ann.RX_STOP)),
         ('rx-warnings', 'RX warnings', (Ann.RX_WARN,)),
-        ('rx-break', 'RX break', (Ann.RX_BREAK,)),
+        ('rx-breaks', 'RX breaks', (Ann.RX_BREAK,)),
         ('rx-packets', 'RX packets', (Ann.RX_PACKET,)),
         ('tx-data-bits', 'TX bits', (Ann.TX_DATA_BIT,)),
-        ('tx-data', 'TX', (Ann.TX_DATA, Ann.TX_START, Ann.TX_PARITY_OK, Ann.TX_PARITY_ERR, Ann.TX_STOP)),
+        ('tx-data-vals', 'TX data', (Ann.TX_DATA, Ann.TX_START, Ann.TX_PARITY_OK, Ann.TX_PARITY_ERR, Ann.TX_STOP)),
         ('tx-warnings', 'TX warnings', (Ann.TX_WARN,)),
-        ('tx-break', 'TX break', (Ann.TX_BREAK,)),
+        ('tx-breaks', 'TX breaks', (Ann.TX_BREAK,)),
         ('tx-packets', 'TX packets', (Ann.TX_PACKET,)),
     )
     binary = (
diff --git a/decoders/usb_power_delivery/pd.py b/decoders/usb_power_delivery/pd.py
index d9209bf..87ed554 100644
--- a/decoders/usb_power_delivery/pd.py
+++ b/decoders/usb_power_delivery/pd.py
@@ -223,7 +223,7 @@ class Decoder(srd.Decoder):
         ('crc', 'Checksum'),
         ('eop', 'End Of Packet'),
         ('sym', '4b5b symbols'),
-        ('warnings', 'Warnings'),
+        ('warning', 'Warning'),
         ('src', 'Source Message'),
         ('snk', 'Sink Message'),
         ('payload', 'Payload'),
@@ -231,11 +231,11 @@ class Decoder(srd.Decoder):
     )
     annotation_rows = (
        ('4b5b', 'Symbols', (7,)),
-       ('phase', 'Parts', (1, 2, 3, 4, 5, 6)),
-       ('payload', 'Payload', (11,)),
-       ('type', 'Type', (0, 9, 10)),
+       ('parts', 'Parts', (1, 2, 3, 4, 5, 6)),
+       ('payloads', 'Payloads', (11,)),
+       ('types', 'Types', (0, 9, 10)),
        ('warnings', 'Warnings', (8,)),
-       ('text', 'Full text', (12,)),
+       ('texts', 'Full text', (12,)),
     )
     binary = (
         ('raw-data', 'RAW binary data'),
diff --git a/decoders/usb_request/pd.py b/decoders/usb_request/pd.py
index 3f46788..2f5abcc 100644
--- a/decoders/usb_request/pd.py
+++ b/decoders/usb_request/pd.py
@@ -130,7 +130,7 @@ class Decoder(srd.Decoder):
         ('request-setup-write', 'Setup: Host-to-device'),
         ('request-bulk-read', 'Bulk: Device-to-host'),
         ('request-bulk-write', 'Bulk: Host-to-device'),
-        ('errors', 'Unexpected packets'),
+        ('error', 'Unexpected packet'),
     )
     annotation_rows = (
         ('request-setup', 'USB SETUP', (0, 1)),
diff --git a/decoders/wiegand/pd.py b/decoders/wiegand/pd.py
index a93be10..7b3241f 100644
--- a/decoders/wiegand/pd.py
+++ b/decoders/wiegand/pd.py
@@ -43,12 +43,12 @@ class Decoder(srd.Decoder):
          'default': 4, 'values': (1, 2, 4, 8, 16, 32)},
     )
     annotations = (
-        ('bits', 'Bits'),
+        ('bit', 'Bit'),
         ('state', 'State'),
     )
     annotation_rows = (
-        ('bits', 'Binary value', (0,)),
-        ('state', 'Stream state', (1,)),
+        ('bits', 'Bits', (0,)),
+        ('states', 'Stream states', (1,)),
     )
 
     def __init__(self):
diff --git a/decoders/xfp/pd.py b/decoders/xfp/pd.py
index ded7694..e217d7d 100644
--- a/decoders/xfp/pd.py
+++ b/decoders/xfp/pd.py
@@ -33,8 +33,8 @@ class Decoder(srd.Decoder):
     outputs = []
     tags = ['Networking']
     annotations = (
-        ('fieldnames-and-values', 'XFP structure field names and values'),
-        ('fields', 'XFP structure fields'),
+        ('field-name-and-val', 'Field name and value'),
+        ('field-val', 'Field value'),
     )
 
     def __init__(self):
diff --git a/decoders/z80/pd.py b/decoders/z80/pd.py
index fba279b..cdbebeb 100644
--- a/decoders/z80/pd.py
+++ b/decoders/z80/pd.py
@@ -93,15 +93,15 @@ class Decoder(srd.Decoder):
         } for i in range(16)
     )
     annotations = (
-        ('addr',  'Memory or I/O address'),
+        ('addr', 'Memory or I/O address'),
         ('memrd', 'Byte read from memory'),
         ('memwr', 'Byte written to memory'),
-        ('iord',  'Byte read from I/O port'),
-        ('iowr',  'Byte written to I/O port'),
+        ('iord', 'Byte read from I/O port'),
+        ('iowr', 'Byte written to I/O port'),
         ('instr', 'Z80 CPU instruction'),
-        ('rop',   'Value of input operand'),
-        ('wop',   'Value of output operand'),
-        ('warn',  'Warning message'),
+        ('rop', 'Value of input operand'),
+        ('wop', 'Value of output operand'),
+        ('warning', 'Warning'),
     )
     annotation_rows = (
         ('addrbus', 'Address bus', (Ann.ADDR,)),