MacOS: variable renaming for future fix