Docs and naming fix