Changes to variable names in OP to be consistent with the other modules and algorithms.