Temporary fix for #2366; fixes #2368; Refactoring annotations in the name editor