Variable renaming
Updating coffee handling to new API