Similar re-naming applies here.