LUN-718: changed variable names to be more explicit.