Cosmetic changes

1. Names
2. Documentation
Revert "Cosmetic changes"

This reverts commit 39d4872b641329285fcda984ac46732005bef09a.
Revert "Revert "Cosmetic changes""

This reverts commit 5a14dc43ff8174194f5bd42fbc32c1c9a0800313.