Start moving predefs to zap core