Bug 22087: Prevent variable names colision