Make sure all references are correct, update the RFCs.

Hopefully all references caught. - dave

Issue done.