another code review where we spend half the time arguing about naming conventions. Can we please just focus on the actual functionality and leave the style nits for another time?