Revert "documentation and naming"

This reverts commit 03a1ba7beb090ffa2ee1f61e6487e236e00e066b.