diff --git a/tools/bifcl/include/bif_type.def b/tools/bifcl/include/bif_type.def
index 586ef7b4da..d97f547822 100644
--- a/tools/bifcl/include/bif_type.def
+++ b/tools/bifcl/include/bif_type.def
@@ -4,10 +4,10 @@ DEFINE_BIF_TYPE(TYPE_ANY,        "any",        "any",        "zeek::Val*",
 DEFINE_BIF_TYPE(TYPE_BOOL,       "bool",       "bool",       "int",               "int",                                  "%s->AsBool()",                   "%s->AsBool()",                   "",                   "zeek::val_mgr->Bool(%s)",                                                      "zeek::val_mgr->Bool(%s)")
 DEFINE_BIF_TYPE(TYPE_CONN_ID,    "conn_id",    "conn_id",    "zeek::Val*",        "zeek::IntrusivePtr<zeek::Val>",        "%s",                             "%s",                             "",                   "zeek::IntrusivePtr{zeek::AdoptRef{}, %s}",                                     "std::move(%s)")
 DEFINE_BIF_TYPE(TYPE_CONNECTION, "connection", "connection", "zeek::Connection*", "zeek::Connection*",                    "%s->AsRecordVal()->GetOrigin()", "%s->AsRecordVal()->GetOrigin()", "",                   "%s->GetVal()",                                                                 "%s->GetVal()")
-DEFINE_BIF_TYPE(TYPE_COUNT,      "count",      "count",      "bro_uint_t",        "bro_uint_t",                           "%s->AsCount()",                  "%s->AsCount()",                  "",                   "zeek::val_mgr->Count(%s)",                                                     "zeek::val_mgr->Count(%s)")
+DEFINE_BIF_TYPE(TYPE_COUNT,      "count",      "count",      "zeek_uint_t",       "zeek_uint_t",                          "%s->AsCount()",                  "%s->AsCount()",                  "",                   "zeek::val_mgr->Count(%s)",                                                     "zeek::val_mgr->Count(%s)")
 DEFINE_BIF_TYPE(TYPE_DOUBLE,     "double",     "double",     "double",            "double",                               "%s->AsDouble()",                 "%s->AsDouble()",                 "",                   "zeek::make_intrusive<zeek::DoubleVal>(%s)",                                    "zeek::make_intrusive<zeek::DoubleVal>(%s)")
 DEFINE_BIF_TYPE(TYPE_FILE,       "file",       "file",       "zeek::File*",       "zeek::IntrusivePtr<zeek::FileVal>",    "%s->AsFile()",                   "%s",                             "",                   "zeek::make_intrusive<zeek::FileVal>(zeek::IntrusivePtr{zeek::AdoptRef{}, %s})",    "std::move(%s)")
-DEFINE_BIF_TYPE(TYPE_INT,        "int",        "int",        "bro_int_t",         "bro_int_t",                            "%s->AsInt()",                    "%s->AsInt()",                    "",                   "zeek::val_mgr->Int(%s)",                                                       "zeek::val_mgr->Int(%s)")
+DEFINE_BIF_TYPE(TYPE_INT,        "int",        "int",        "zeek_int_t",        "zeek_int_t",                           "%s->AsInt()",                    "%s->AsInt()",                    "",                   "zeek::val_mgr->Int(%s)",                                                       "zeek::val_mgr->Int(%s)")
 DEFINE_BIF_TYPE(TYPE_INTERVAL,   "interval",   "interval",   "double",            "double",                               "%s->AsInterval()",               "%s->AsInterval()",               "",                   "zeek::make_intrusive<zeek::IntervalVal>(%s, Seconds)",                         "zeek::make_intrusive<zeek::IntervalVal>(%s, Seconds)")
 DEFINE_BIF_TYPE(TYPE_PATTERN,    "pattern",    "pattern",    "RE_Matcher*",       "zeek::IntrusivePtr<zeek::PatternVal>", "%s->AsPattern()",                "%s",                             "<zeek::PatternVal>", "zeek::make_intrusive<zeek::PatternVal>(%s)",                                   "std::move(%s)")
 DEFINE_BIF_TYPE(TYPE_PORT,       "port",       "port",       "zeek::PortVal*",    "zeek::IntrusivePtr<zeek::PortVal>",    "%s->AsPortVal()",                "%s",                             "<zeek::PortVal>",    "zeek::IntrusivePtr{zeek::AdoptRef{}, %s}",                                     "std::move(%s)")