documentation and name changes
documentation and name changes (2)