Add name-id mapping to shorten the keys.