Changing call style from kwargs, and some consequential downstream changes, plus some variable name tweaking (#306)