diff --git a/tools/bifcl/builtin-func.l b/tools/bifcl/builtin-func.l
index f6a246a082..e08c1b1505 100644
--- a/tools/bifcl/builtin-func.l
+++ b/tools/bifcl/builtin-func.l
@@ -271,13 +271,13 @@ void init_alternative_mode()
 		fprintf(fp_func_init, "\n");
 		fprintf(fp_func_init, "namespace plugin { namespace %s {\n", plugin_canon);
 		fprintf(fp_func_init, "\n");
-		fprintf(fp_func_init, "void __bif_%s_init(plugin::Plugin* plugin)\n", name);
+		fprintf(fp_func_init, "void __bif_%s_init(zeek::plugin::Plugin* plugin)\n", name);
 		fprintf(fp_func_init, "\t{\n");
 
 		fprintf(fp_func_register, "#include \"plugin/Manager.h\"\n");
 		fprintf(fp_func_register, "\n");
 		fprintf(fp_func_register, "namespace plugin { namespace %s {\n", plugin_canon);
-		fprintf(fp_func_register, "void __bif_%s_init(plugin::Plugin* plugin);\n", name);
+		fprintf(fp_func_register, "void __bif_%s_init(zeek::plugin::Plugin* plugin);\n", name);
 		fprintf(fp_func_register, "zeek::detail::plugin::__RegisterBif __register_bifs_%s_%s(\"%s\", __bif_%s_init);\n", plugin_canon, name, plugin, name);
 		fprintf(fp_func_register, "} }\n");
         }
diff --git a/tools/bifcl/builtin-func.y b/tools/bifcl/builtin-func.y
index 22a3e46a3f..f9040571c9 100644
--- a/tools/bifcl/builtin-func.y
+++ b/tools/bifcl/builtin-func.y
@@ -304,7 +304,7 @@ void record_bif_item(const char* id, const char* type)
 	if ( ! plugin )
 		return;
 
-	fprintf(fp_func_init, "\tplugin->AddBifItem(\"%s\", plugin::BifItem::%s);\n", id, type);
+	fprintf(fp_func_init, "\tplugin->AddBifItem(\"%s\", zeek::plugin::BifItem::%s);\n", id, type);
 	}
 
 %}