Change several variable names in the new method to
better reflect their pupose.


compile, test, all is well