LPS-50671 Rename variables