LPS-50418 consistent naming