LPS-45978 SF - make all consistent