#5448 Refactor hybrid name import/check