Adjust code to use renamed global parameters.