LPS-44647 SF
LPS-44647 Rename vars