Keep up with Cake 3.x definitions.