LPS-50418 apply naming convention consistently