rename functions to be more clear
rename function to include monthly
Merge pull request #234 from dimagi/default-consumption-fix

rename consumption functions to avoid confusion