Adapt to COFFEE's new naming convention