Update prefixes and their mapping according to #817 comment on new prefixes.