LPS-51795

Hi Brian,

as you requested I changed the attribute and method names. 

thanks,
Daniel

cc'-ing: @matethurzo