This document summarizes lessons learned from 20 years of research on agricultural water productivity. It discusses how definitions and concepts around water efficiency have evolved over time to recognize the importance of scale and context. Early research focused on reducing water applications at the field scale, but studies in Pakistan found that while applications decreased, total water consumption increased at the system scale due to expansion of irrigated area. This highlights the need to clearly define objectives and terms like water consumed versus applied. Overall, the research emphasizes considering multiple scales and factors, and recognizing that improved productivity, not just efficiency, should be the goal.