diff --git a/spacy/symbols.pxd b/spacy/symbols.pxd
index 590a2d41d..0c60f6f67 100644
--- a/spacy/symbols.pxd
+++ b/spacy/symbols.pxd
@@ -351,71 +351,71 @@ cpdef enum symbol_t:
     VerbType_mod # U
     VerbType_light # U
 
-    Name_person
-    Name_norp
-    Name_facility
-    Name_org
-    Name_gpe
-    Name_loc
-    Name_product
-    Name_event
-    Name_work_of_art
-    Name_language
+    PERSON
+    NORP
+    FACILITY
+    ORG
+    GPE
+    LOC
+    PRODUCT
+    EVENT
+    WORK_OF_ART
+    LANGUAGE
 
-    Unit_date
-    Unit_time
-    Unit_percent
-    Unit_money
-    Unit_quantity
-    Unit_ordinal
-    Unit_cardinal
+    DATE
+    TIME
+    PERCENT
+    MONEY
+    QUANTITY
+    ORDINAL
+    CARDINAL
 
-    Dep_acomp
-    Dep_advcl
-    Dep_advmod
-    Dep_agent
-    Dep_amod
-    Dep_appos
-    Dep_attr
-    Dep_aux
-    Dep_auxpass
-    Dep_cc
-    Dep_ccomp
-    Dep_complm
-    Dep_conj
-    Dep_csubj
-    Dep_csubjpass
-    Dep_dep
-    Dep_det
-    Dep_dobj
-    Dep_expl
-    Dep_hmod
-    Dep_hyph
-    Dep_infmod
-    Dep_intj
-    Dep_iobj
-    Dep_mark
-    Dep_meta
-    Dep_neg
-    Dep_nmod
-    Dep_nn
-    Dep_npadvmod
-    Dep_nsubj
-    Dep_nsubjpass
-    Dep_num
-    Dep_number
-    Dep_oprd
-    Dep_parataxis
-    Dep_partmod
-    Dep_pcomp
-    Dep_pobj
-    Dep_poss
-    Dep_possessive
-    Dep_preconj
-    Dep_prep
-    Dep_prt
-    Dep_punct
-    Dep_quantmod
-    Dep_rcmod
-    Dep_root
-    Dep_xcomp
+    acomp
+    advcl
+    advmod
+    agent
+    amod
+    appos
+    attr
+    aux
+    auxpass
+    cc
+    ccomp
+    complm
+    conj
+    csubj
+    csubjpass
+    dep
+    det
+    dobj
+    expl
+    hmod
+    hyph
+    infmod
+    intj
+    iobj
+    mark
+    meta
+    neg
+    nmod
+    nn
+    npadvmod
+    nsubj
+    nsubjpass
+    num
+    number
+    oprd
+    parataxis
+    partmod
+    pcomp
+    pobj
+    poss
+    possessive
+    preconj
+    prep
+    prt
+    punct
+    quantmod
+    rcmod
+    root
+    xcomp
diff --git a/spacy/symbols.pyx b/spacy/symbols.pyx
index 9a3d219d5..31b01db98 100644
--- a/spacy/symbols.pyx
+++ b/spacy/symbols.pyx
@@ -351,74 +351,74 @@ IDS = {
     "VerbType_mod ": VerbType_mod, # U,
     "VerbType_light ": VerbType_light, # U,
 
-    "Name_person": Name_person,
-    "Name_norp": Name_norp,
-    "Name_facility": Name_facility,
-    "Name_org": Name_org,
-    "Name_gpe": Name_gpe,
-    "Name_loc": Name_loc,
-    "Name_product": Name_product,
-    "Name_event": Name_event,
-    "Name_work_of_art": Name_work_of_art,
-    "Name_language": Name_language,
+    "PERSON": PERSON,
+    "NORP": NORP,
+    "FACILITY": FACILITY,
+    "ORG": ORG,
+    "GPE": GPE,
+    "LOC": LOC,
+    "PRODUCT": PRODUCT,
+    "EVENT": EVENT,
+    "WORK_OF_ART": WORK_OF_ART,
+    "LANGUAGE": LANGUAGE,
 
-    "Unit_date": Unit_date,
-    "Unit_time": Unit_time,
-    "Unit_percent": Unit_percent,
-    "Unit_money": Unit_money,
-    "Unit_quantity": Unit_quantity,
-    "Unit_ordinal": Unit_ordinal,
-    "Unit_cardinal": Unit_cardinal,
+    "DATE": DATE,
+    "TIME": TIME,
+    "PERCENT": PERCENT,
+    "MONEY": MONEY,
+    "QUANTITY": QUANTITY,
+    "ORDINAL": ORDINAL,
+    "CARDINAL": CARDINAL,
 
-    "Dep_acomp": Dep_acomp,
-    "Dep_advcl": Dep_advcl,
-    "Dep_advmod": Dep_advmod,
-    "Dep_agent": Dep_agent,
-    "Dep_amod": Dep_amod,
-    "Dep_appos": Dep_appos,
-    "Dep_attr": Dep_attr,
-    "Dep_aux": Dep_aux,
-    "Dep_auxpass": Dep_auxpass,
-    "Dep_cc": Dep_cc,
-    "Dep_ccomp": Dep_ccomp,
-    "Dep_complm": Dep_complm,
-    "Dep_conj": Dep_conj,
-    "Dep_csubj": Dep_csubj,
-    "Dep_csubjpass": Dep_csubjpass,
-    "Dep_dep": Dep_dep,
-    "Dep_det": Dep_det,
-    "Dep_dobj": Dep_dobj,
-    "Dep_expl": Dep_expl,
-    "Dep_hmod": Dep_hmod,
-    "Dep_hyph": Dep_hyph,
-    "Dep_infmod": Dep_infmod,
-    "Dep_intj": Dep_intj,
-    "Dep_iobj": Dep_iobj,
-    "Dep_mark": Dep_mark,
-    "Dep_meta": Dep_meta,
-    "Dep_neg": Dep_neg,
-    "Dep_nmod": Dep_nmod,
-    "Dep_nn": Dep_nn,
-    "Dep_npadvmod": Dep_npadvmod,
-    "Dep_nsubj": Dep_nsubj,
-    "Dep_nsubjpass": Dep_nsubjpass,
-    "Dep_num": Dep_num,
-    "Dep_number": Dep_number,
-    "Dep_oprd": Dep_oprd,
-    "Dep_parataxis": Dep_parataxis,
-    "Dep_partmod": Dep_partmod,
-    "Dep_pcomp": Dep_pcomp,
-    "Dep_pobj": Dep_pobj,
-    "Dep_poss": Dep_poss,
-    "Dep_possessive": Dep_possessive,
-    "Dep_preconj": Dep_preconj,
-    "Dep_prep": Dep_prep,
-    "Dep_prt": Dep_prt,
-    "Dep_punct": Dep_punct,
-    "Dep_quantmod": Dep_quantmod,
-    "Dep_rcmod": Dep_rcmod,
-    "Dep_root": Dep_root,
-    "Dep_xcomp": Dep_xcomp
+    "acomp": acomp,
+    "advcl": advcl,
+    "advmod": advmod,
+    "agent": agent,
+    "amod": amod,
+    "appos": appos,
+    "attr": attr,
+    "aux": aux,
+    "auxpass": auxpass,
+    "cc": cc,
+    "ccomp": ccomp,
+    "complm": complm,
+    "conj": conj,
+    "csubj": csubj,
+    "csubjpass": csubjpass,
+    "dep": dep,
+    "det": det,
+    "dobj": dobj,
+    "expl": expl,
+    "hmod": hmod,
+    "hyph": hyph,
+    "infmod": infmod,
+    "intj": intj,
+    "iobj": iobj,
+    "mark": mark,
+    "meta": meta,
+    "neg": neg,
+    "nmod": nmod,
+    "nn": nn,
+    "npadvmod": npadvmod,
+    "nsubj": nsubj,
+    "nsubjpass": nsubjpass,
+    "num": num,
+    "number": number,
+    "oprd": oprd,
+    "parataxis": parataxis,
+    "partmod": partmod,
+    "pcomp": pcomp,
+    "pobj": pobj,
+    "poss": poss,
+    "possessive": possessive,
+    "preconj": preconj,
+    "prep": prep,
+    "prt": prt,
+    "punct": punct,
+    "quantmod": quantmod,
+    "rcmod": rcmod,
+    "root": root,
+    "xcomp": xcomp
 }
 
 NAMES = [it[0] for it in sorted(IDS.items(), key=lambda it: it[1])]