DOC: Further improvements to naming conventions.