LPS-32132 Make variable names more consistent