Fixed some name-shadowing warnings.