Update for juju/names refactor part 1