clean up naming standards for XML and JSON, docs are WIP