MOB-2139 variables renamed