fix default consumption inconsistencies

and a bunch of renaming to make things harder to screw up in the future.

should fix http://manage.dimagi.com/default.asp?122095

fix is in 494408b58d49334c54ccac6f5615d710d11a55d2 and then test update is in a9508f3709365e47e5c1429026d5676afb476ae0

codependent with https://github.com/dimagi/casexml/pull/234