5 files changed, 7 insertions, 6 deletions
diff --git a/nest/iface.c b/nest/iface.c
index a024b943..bbe38d3f 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -1018,7 +1018,7 @@ if_choose_router_id(struct iface_patt *mask, u32 old_id)
 void
 if_init(void)
 {
-  iface_domain = DOMAIN_NEW(attrs, "Interfaces");
+  iface_domain = DOMAIN_NEW(attrs);
 
   IFACE_LOCK;
   if_pool = rp_new(&root_pool, iface_domain.attrs, "Interfaces");
diff --git a/nest/locks.c b/nest/locks.c
index 247d0c56..66409c6d 100644
--- a/nest/locks.c
+++ b/nest/locks.c
@@ -197,5 +197,6 @@ olock_init(void)
 {
   DBG("olock: init\n");
   init_list(&olock_list);
-  olock_domain = DOMAIN_NEW(attrs, "Object lock");
+  olock_domain = DOMAIN_NEW(attrs);
+  DOMAIN_SETUP(attrs, olock_domain, "Object lock", NULL);
 }
diff --git a/nest/proto.c b/nest/proto.c
index 32183c9d..647b7f4e 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1859,9 +1859,9 @@ void protos_build_gen(void);
 void
 protos_build(void)
 {
-  protos_build_gen();
-
   proto_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Protocols");
+
+  protos_build_gen();
 }
 
 
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 38612a4e..c035a2dc 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -1607,7 +1607,7 @@ ea_show_list(struct cli *c, ea_list *eal)
 void
 rta_init(void)
 {
-  attrs_domain = DOMAIN_NEW(attrs, "Attributes");
+  attrs_domain = DOMAIN_NEW(attrs);
 
   RTA_LOCK;
   rta_pool = rp_new(&root_pool, attrs_domain.attrs, "Attributes");
diff --git a/nest/rt-table.c b/nest/rt-table.c
index f1e3c8f7..a934d3c3 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -2850,7 +2850,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
   pool *sp = birdloop_pool(loop);
 
   /* Create the table domain and pool */
-  DOMAIN(rtable) dom = DOMAIN_NEW(rtable, cf->name);
+  DOMAIN(rtable) dom = DOMAIN_NEW(rtable);
   LOCK_DOMAIN(rtable, dom);
 
   pool *p = rp_newf(sp, dom.rtable, "Routing table data %s", cf->name);