LPS-46205 SF and rename some methods