Patch 3

The doc still needs the address of the 'naming conventions' document.