DOC, RF: Start unifying naming scheme (close to PEP-8)