Make docs, code, and tests consistent