Fixes #3954 - translate names to ids