diff --git a/src/ZeekList.h b/src/ZeekList.h
index 73b28a5426..3b23ed8527 100644
--- a/src/ZeekList.h
+++ b/src/ZeekList.h
@@ -5,23 +5,30 @@
 #include "List.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
-using val_list = zeek::PList<zeek::Val>;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
-using expr_list = zeek::PList<zeek::detail::Expr>;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
-using id_list = zeek::PList<zeek::detail::ID>;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail);
-using stmt_list = zeek::PList<zeek::detail::Stmt>;
-
 namespace zeek { class Type; }
 using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
-using type_list = zeek::PList<zeek::Type>;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail);
-using attr_list = zeek::PList<zeek::detail::Attr>;
-
 ZEEK_FORWARD_DECLARE_NAMESPACED(Timer, zeek::detail);
-using timer_list = zeek::PList<zeek::detail::Timer, zeek::ListOrder::UNORDERED>;
+
+namespace zeek {
+
+using val_list = PList<Val>;
+using expr_list = PList<detail::Expr>;
+using id_list = PList<detail::ID>;
+using stmt_list = PList<detail::Stmt>;
+using type_list = PList<Type>;
+using attr_list = PList<detail::Attr>;
+using timer_list = PList<detail::Timer, ListOrder::UNORDERED>;
+
+} // namespace zeek
+
+using val_list [[deprecated("Remove in v4.1. Use zeek::val_list.")]] = zeek::val_list;
+using expr_list [[deprecated("Remove in v4.1. Use zeek::expr_list.")]] = zeek::expr_list;
+using id_list [[deprecated("Remove in v4.1. Use zeek::id_list.")]] = zeek::id_list;
+using stmt_list [[deprecated("Remove in v4.1. Use zeek::stmt_list.")]] = zeek::stmt_list;
+using type_list [[deprecated("Remove in v4.1. Use zeek::type_list.")]] = zeek::type_list;
+using attr_list [[deprecated("Remove in v4.1. Use zeek::attr_list.")]] = zeek::attr_list;
+using timer_list [[deprecated("Remove in v4.1. Use zeek::timer_list.")]] = zeek::timer_list;
diff --git a/src/broker/messaging.bif b/src/broker/messaging.bif
index 56491ff644..9e5608bdc4 100644
--- a/src/broker/messaging.bif
+++ b/src/broker/messaging.bif
@@ -47,7 +47,7 @@ std::set<std::string> val_to_topic_set(zeek::Val* val)
 	return rval;
 	}
 
-static bool publish_event_args(val_list& args, const zeek::String* topic,
+static bool publish_event_args(zeek::val_list& args, const zeek::String* topic,
                                zeek::detail::Frame* frame)
 	{
 	zeek::Broker::Manager::ScriptScopeGuard ssg;
diff --git a/src/parse.y b/src/parse.y
index 6ad81f1884..28e89c0a87 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -232,7 +232,7 @@ static bool expr_is_table_type_name(const zeek::detail::Expr* expr)
 	bool b;
 	char* str;
 	zeek::detail::ID* id;
-	id_list* id_l;
+	zeek::id_list* id_l;
 	zeek::detail::InitClass ic;
 	zeek::Val* val;
 	zeek::RE_Matcher* re;
@@ -1255,7 +1255,7 @@ lambda_body:
 			auto ingredients = std::make_unique<zeek::detail::function_ingredients>(
 				zeek::IntrusivePtr{zeek::NewRef{}, zeek::detail::current_scope()},
 				zeek::IntrusivePtr{zeek::AdoptRef{}, $3});
-			id_list outer_ids = zeek::detail::gather_outer_ids(zeek::detail::pop_scope().get(), ingredients->body.get());
+			zeek::id_list outer_ids = zeek::detail::gather_outer_ids(zeek::detail::pop_scope().get(), ingredients->body.get());
 
 			$$ = new zeek::detail::LambdaExpr(std::move(ingredients), std::move(outer_ids));
 			}
@@ -1653,7 +1653,7 @@ case_type_list:
 	|
 		case_type
 			{
-			$$ = new id_list;
+			$$ = new zeek::id_list;
 			$$->push_back($1);
 			}
 	;
@@ -1704,7 +1704,7 @@ for_head:
 				                                    false, false);
 				}
 
-			id_list* loop_vars = new id_list;
+			auto* loop_vars = new zeek::id_list;
 			loop_vars->push_back(loop_var.release());
 
 			$$ = new zeek::detail::ForStmt(loop_vars, {zeek::AdoptRef{}, $5});
@@ -1742,7 +1742,7 @@ for_head:
 			else
 				val_var = zeek::detail::install_ID($5, module, false, false);
 
-			id_list* loop_vars = new id_list;
+			auto* loop_vars = new zeek::id_list;
 			loop_vars->push_back(key_var.release());
 
 			$$ = new zeek::detail::ForStmt(loop_vars, {zeek::AdoptRef{}, $7}, std::move(val_var));
@@ -1773,7 +1773,7 @@ local_id_list:
 			{ $1->push_back($3); }
 	|	local_id
 			{
-			$$ = new id_list;
+			$$ = new zeek::id_list;
 			$$->push_back($1);
 			}
 	;