Doc fix and parameter rename for clarity and docs fix