juju/names refactor part 2

Update juju/names to d656ac5
This bit is really ugly at the moment, it will get cleaner in latter patches