Removed several calls to deprecated internal methods, and fixed a regression where names were still being used in place of UUIDs for ownership