Use ECMA-048 names as defaults.

The old (incorrect) names are kept as an alias for backwards
compatability. Note that "brown" was replaced by "yellow", so
"yellow" no longer is "bold + brown".