diff --git a/mode/bds.py b/mode/bds.py
index 15c9265..a468ea4 100644
--- a/mode/bds.py
+++ b/mode/bds.py
@@ -23,9 +23,9 @@ class BDSGrammar(Grammar):
         PatternRule('delimiter', r'(?:\|\||&&|[!<>=:\{\}\(\)\[\]])'),
         PatternRule('bds.section', r'section(?= *\()'),
         PatternRule('bds.component', tbbid + r"(?= *\()"),
-        PatternRule('bds.attr_name', r"[a-z_]+(?==)"),
-        RegionRule('bds.attr_value', r"(?<=)'", StringGrammar1, r"'"),
-        RegionRule('bds.attr_value', r'(?<=)"', StringGrammar2, r'"'),
+        PatternRule('bds.aname', r"[a-z_]+(?==)"),
+        RegionRule('bds.avalue', r"(?<=)'", StringGrammar1, r"'"),
+        RegionRule('bds.avalue', r'(?<=)"', StringGrammar2, r'"'),
         PatternRule('bds.num', r"-?(?:[0-9][0-9\.]*[0-9]|[0-9])"),
         PatternRule('bds.alias', r"[a-z0-9]+(?=:" + tbbid + ")"),
         PatternRule('bds.id', tbbid),
@@ -40,21 +40,21 @@ class BDS(Fundamental):
     extensions = ['.bds']
     grammar    = BDSGrammar
     colors     = {
-        'bds.section':          ('blue', 'default', 'bold'),
-        'bds.component':        ('magenta', 'default', 'bold'),
-        'bds.attr_name':        ('blue', 'default', 'bold'),
-        'bds.attr_value.start': ('green', 'default', 'bold'),
-        'bds.attr_value.data':  ('green', 'default', 'bold'),
-        'bds.attr_value.null':  ('green', 'default', 'bold'),
-        'bds.attr_value.end':   ('green', 'default', 'bold'),
-        'bds.num':              ('red', 'default', 'bold'),
-        'bds.alias':            ('magenta', 'default', 'bold'),
-        'bds.id':               ('yellow', 'default', 'bold'),
-        'bds.func':             ('cyan', 'default', 'bold'),
-        'bds.op':               ('magenta', 'default', 'bold'),
-        'bds.string.start':     ('red', 'default', 'bold'),
-        'bds.string.null':      ('red', 'default', 'bold'),
-        'bds.string.end':       ('red', 'default', 'bold'),
+        'bds.section':      ('blue', 'default', 'bold'),
+        'bds.component':    ('magenta', 'default', 'bold'),
+        'bds.aname':        ('blue', 'default', 'bold'),
+        'bds.avalue.start': ('green', 'default', 'bold'),
+        'bds.avalue.data':  ('green', 'default', 'bold'),
+        'bds.avalue.null':  ('green', 'default', 'bold'),
+        'bds.avalue.end':   ('green', 'default', 'bold'),
+        'bds.num':          ('red', 'default', 'bold'),
+        'bds.alias':        ('magenta', 'default', 'bold'),
+        'bds.id':           ('yellow', 'default', 'bold'),
+        'bds.func':         ('cyan', 'default', 'bold'),
+        'bds.op':           ('magenta', 'default', 'bold'),
+        'bds.string.start': ('red', 'default', 'bold'),
+        'bds.string.null':  ('red', 'default', 'bold'),
+        'bds.string.end':   ('red', 'default', 'bold'),
     }
     opentokens  = ('delimiter',)
     opentags    = {'(': ')', '[': ']', '{': '}'}