Revert "Revert "documentation and naming""

This reverts commit aaaa5cf9fce20efa9ff331b94a7cbbc83b828298.
build fix
xml formatting