SH - Fixed some broken references after moving data objects to a new namespace.