LPS-45898

Hey Hugo,

Not sure how you feel about the variable names, but I figured you would know best.

Thanks.