Updated consumable code to take into account name changes. Fixes #6.