Moving page with shortcuts to an new space incorrectly adds old space name

We use shortcut links all over the place. For example, we have a shortcut for jira. [XXX-1@jiraissue] links to the XXX-1 issue. If this page is moved, you get [OLDSPACENAME:XXX-1@jiraissue] which clearly breaks the link! This is a serious error as we now have a lot of messed up pages!!!! Too late now for us, but needs to be fixed for the next poor person. Looking at the number of existing and past issues with this capability, it really needs to be thought out a bit better and fixed permanently.