Updates shortcut macro names to use Annex prefix