more name shadowing cleanup