Update internal doc again
Rewrite some internal argument names