Was hrh Prince Charles prince of wales re-instated as heir apparent to the succession to the throne of the UK?

Charles, son of Queen Elizabeth II was Duke of Cornwall and Heir Presumptive as a child. In 1958 he was named Prince of Wales but this was not formalised until 1969, at his Investiture at Caernarfon Castle when he became formally the Heir Apparent to the throne.