LPS-51249 Use proper naming