Rename to match cake2.4