Merge "Make getter & setting names consistent."