Removes some naming ambiguity and ensures sane parameters.