(maint) slight refactor

Rename a few paramaters to be shorter and easier to use.
Update variable names to use the new syntax.
Clean up configs.