LPS-48965 Apply changes (no logical changes)

Hi Brian, this seems big but it's not :) just minor changes on the API to make it more clear

Thanks