LPS-32193 changing function names
LPS-32193 regenerate