re-name of variables to be consistent with Main