I guess the correct labeling will be to still be A1 (as officially named) but still as trunk and old R1 roads to be put on the streets were they used to be pre-2011 with old_ref tag and the new ones to be as was done in my change.