Merge "Rename some DB/LB variables to be more consistent"