P1031 - P1047 ?

I am confused.
1967 what happened.
Was the gold GT40 P1031 or was the baby blue GT40 P1031..
As I understand Shelby P1047 crashed at Le Mans and Holman & Moody P1031 did not finish.
Two weeks later a re tagged GT40 won Reims 12hours.
I thought P1031 got retagged into P1047, so a H&M car became a Shelby car or...?
Did they correct that later on, or did they recognise it recently so the correct re tagging is also recent...