Fixed a few bugs that I'd introduced by renaming domains, but not the corresponding attributes