LPS-45071 Update usages