#796, #1701 fixing doc vs code arg-s naming consistency