Fixed with Arch._adjust_naming_conventions on a per-tree basis instead.