Update some docs and naming