docs, more consistent naming conventions