Hi Leonie,
That’s not preventable and will usually happen if the update contains different layout and naming structure. Though, that is only when there is a major update just like the recent one.
What you could do is adding comment to your template of what’s changed and what it is for. That way, you can always get the updated copy from upgrade templates and add the changes from your older template to newer one.
Hope this helps.