Rename new constant and move it into Vcard::Bnf