LPS-50690 consistent naming