LPS-50555

this kind of depends on LPS-49844 as far as the renaming of the methods goes so i have that commit in here as well...