Rework cipher / digest fetching for legacy nids with multiple name support