Revert "LPS-47048 SF"

This reverts commit 57a0a7df96548fcad4e08c1973ef45e48346a052.
Revert "LPS-47048 SF"

This reverts commit 2a4bc63557860b4994cb941967a3db5661a39921.
LPS-47048 SF
LPS-47048 Rename the vars