remove confusing use of same name in enclosed scope