Previous rename was wrong as it overlapped with another variable in use,
thus breaking everything. D'oh !