Fixed #2435
Fixes #2368
Temporary fix for #2366; fixes #2368; Refactoring annotations in the name editor
had to rename the packages to make them compliant with buckminster