LPS-41846 Simplify more
LPS-41846 Rename, no logic changes