standardized some of the argument naming