Good change here, that shadowing-type of naming was hard to read.