Comment by dgacmu

I 99.9% agree with you. Some nitpicks, since this is a discussion of getting units right:

mAh doesn't measure "current", because current is the flow of electrons. It measures charge.

2000 mAh hour is redundant - the 'h' in mAh is hours. :)

But your basic point is 100% correct: All batteries should show their capacity in Wh.