Fix documentation and naming and tests