Changes to go with some recent renaming/relocation of database items.