LPS-48895 rename variables