LPS-46132 Rename some variables