From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 9 May 2024 15:33:48 +0000 (-0600)
Subject: Use mi instead of inst to refer to the module instance, instance is extremely overused
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ea48dffaa69efc4066fde0b1d36a08724bc879e;p=thirdparty%2Ffreeradius-server.git

Use mi instead of inst to refer to the module instance, instance is extremely overused
---

diff --git a/src/lib/eap_aka_sim/module.c b/src/lib/eap_aka_sim/module.c
index 282190b636..4b58fc6d0d 100644
--- a/src/lib/eap_aka_sim/module.c
+++ b/src/lib/eap_aka_sim/module.c
@@ -41,7 +41,7 @@ RCSID("$Id$")
  */
 static unlang_action_t mod_encode(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_module_conf_t);
+	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_module_conf_t);
 	eap_session_t			*eap_session = eap_session_get(request->parent);
 	eap_aka_sim_mod_session_t	*mod_session = talloc_get_type_abort(eap_session->opaque,
 										eap_aka_sim_mod_session_t);
@@ -296,7 +296,7 @@ static unlang_action_t mod_encode(rlm_rcode_t *p_result, module_ctx_t const *mct
  */
 unlang_action_t eap_aka_sim_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_module_conf_t);
+	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_module_conf_t);
 	eap_session_t			*eap_session = eap_session_get(request->parent);
 	eap_aka_sim_mod_session_t	*mod_session = talloc_get_type_abort(eap_session->opaque,
 									     eap_aka_sim_mod_session_t);
diff --git a/src/lib/eap_aka_sim/state_machine.c b/src/lib/eap_aka_sim/state_machine.c
index 2f76657f61..ff5f140c7c 100644
--- a/src/lib/eap_aka_sim/state_machine.c
+++ b/src/lib/eap_aka_sim/state_machine.c
@@ -658,7 +658,7 @@ RESUME(store_session)
  */
 RESUME(store_pseudonym)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*vp;
 	fr_pair_t			*new;
@@ -805,7 +805,7 @@ static unlang_action_t session_and_pseudonym_store(rlm_rcode_t *p_result, module
 						   eap_aka_sim_session_t *eap_aka_sim_session,
 						   module_method_t next)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	fr_pair_t			*vp;
 	fr_pair_t			*new;
 
@@ -879,7 +879,7 @@ RESUME(clear_session)
  */
 RESUME(clear_pseudonym)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 
 	pair_delete_request(attr_eap_aka_sim_next_pseudonym);
@@ -921,7 +921,7 @@ static unlang_action_t session_and_pseudonym_clear(rlm_rcode_t *p_result, module
 						   eap_aka_sim_session_t *eap_aka_sim_session,
 						   module_method_t next)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 
 	if (!fr_cond_assert(next)) return STATE_TRANSITION(common_failure_notification);
 
@@ -1239,7 +1239,7 @@ RESUME(send_eap_failure)
  */
 STATE_GUARD(eap_failure)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t	*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 
 	/*
@@ -1284,7 +1284,7 @@ RESUME(recv_common_failure_notification_ack)
  */
 STATE(common_failure_notification)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	fr_pair_t			*subtype_vp = NULL;
 
 	subtype_vp = fr_pair_find_by_da(&request->request_pairs, NULL, attr_eap_aka_sim_subtype);
@@ -1418,7 +1418,7 @@ RESUME(send_common_failure_notification)
  */
 STATE_GUARD(common_failure_notification)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 
 	/*
@@ -1526,7 +1526,7 @@ RESUME(send_eap_success)
  */
 STATE_GUARD(eap_success)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 
 	STATE_SET(eap_success);
 
@@ -1555,7 +1555,7 @@ RESUME(recv_common_success_notification_ack)
  */
 STATE(common_success_notification)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 
 	/*
 	 *  	Because the server uses the AT_NOTIFICATION code "Success" (32768) to
@@ -1633,7 +1633,7 @@ RESUME(send_common_success_notification)
  */
 STATE_GUARD(common_success_notification)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 
 	STATE_SET(common_success_notification);
 
@@ -1726,7 +1726,7 @@ RESUME(recv_common_reauthentication_response)
  */
 STATE(common_reauthentication)
 {
-	eap_aka_sim_process_conf_t 	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t 	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*subtype_vp = NULL;
 
@@ -1969,7 +1969,7 @@ RESUME(send_common_reauthentication_request)
  */
 RESUME(load_pseudonym)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 
 	pair_delete_request(attr_eap_aka_sim_next_reauth_id);
@@ -2031,7 +2031,7 @@ RESUME(load_pseudonym)
  */
 RESUME(load_session)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 
 	pair_delete_request(attr_session_id);
@@ -2097,7 +2097,7 @@ RESUME(load_session)
  */
 STATE_GUARD(common_reauthentication)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t	*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t		*vp = NULL;
 
@@ -2126,7 +2126,7 @@ STATE_GUARD(common_reauthentication)
  */
 RESUME(recv_aka_synchronization_failure)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*vp;
 
@@ -2265,7 +2265,7 @@ RESUME(recv_aka_challenge_response)
  */
 STATE(aka_challenge)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*subtype_vp = NULL;
 	fr_pair_t			*vp;
@@ -2500,7 +2500,7 @@ RESUME(send_aka_challenge_request)
  */
 STATE_GUARD(aka_challenge)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*vp;
 
@@ -2618,7 +2618,7 @@ RESUME(recv_sim_challenge_response)
  */
 STATE(sim_challenge)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t	   *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t		   *subtype_vp = NULL;
 
@@ -2740,7 +2740,7 @@ RESUME(send_sim_challenge_request)
  */
 STATE_GUARD(sim_challenge)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*vp;
 
@@ -2808,7 +2808,7 @@ STATE_GUARD(common_challenge)
  */
 RESUME(recv_aka_identity_response)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 
 	bool				user_set_id_req;
@@ -2893,7 +2893,7 @@ RESUME(recv_aka_identity_response)
  */
 STATE(aka_identity)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*subtype_vp = NULL;
 
@@ -3039,7 +3039,7 @@ RESUME(send_aka_identity_request)
  */
 STATE_GUARD(aka_identity)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 
 	STATE_SET(aka_identity);
@@ -3077,7 +3077,7 @@ STATE_GUARD(aka_identity)
  */
 RESUME(recv_sim_start_response)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	bool			  	user_set_id_req;
 	fr_pair_t		  	*identity_type;
@@ -3202,7 +3202,7 @@ RESUME(recv_sim_start_response)
  */
 STATE(sim_start)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*subtype_vp = NULL;
 
@@ -3409,7 +3409,7 @@ RESUME(send_sim_start)
  */
 STATE_GUARD(sim_start)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t	   *eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 
 	STATE_SET(sim_start);
@@ -3462,7 +3462,7 @@ STATE_GUARD(common_identity)
  */
 RESUME(recv_common_identity_response)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*eap_type, *method, *identity_type;
 	fr_aka_sim_method_hint_t	running, hinted;
@@ -3630,7 +3630,7 @@ RESUME(recv_common_identity_response)
 STATE(init)
 {
 	eap_session_t			*eap_session = eap_session_get(request->parent);
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t 		*eap_aka_sim_session = talloc_get_type_abort(mctx->rctx, eap_aka_sim_session_t);
 	fr_pair_t			*vp;
 	fr_aka_sim_id_type_t		type;
@@ -3689,7 +3689,7 @@ static int _eap_aka_sim_session_free(eap_aka_sim_session_t *eap_aka_sim_session)
  */
 unlang_action_t eap_aka_sim_state_machine_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t *inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 	eap_aka_sim_session_t *eap_aka_sim_session = request_data_reference(request,
 									    (void *)eap_aka_sim_state_machine_process,
 									    0);
diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index 890cdfea70..0f4b91e7c9 100644
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -2626,8 +2626,8 @@ static int mod_close(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	fr_io_instance_t *inst = mctx->inst->data;
-	CONF_SECTION *conf = mctx->inst->conf;
+	fr_io_instance_t *inst = mctx->mi->data;
+	CONF_SECTION *conf = mctx->mi->conf;
 
 	/*
 	 *	Find and bootstrap the application IO handler.
@@ -2716,8 +2716,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	fr_io_instance_t	*inst = mctx->inst->data;
-	CONF_SECTION		*conf = mctx->inst->conf;
+	fr_io_instance_t	*inst = mctx->mi->data;
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	fr_assert(inst->app_io != NULL);
 
diff --git a/src/lib/server/module.c b/src/lib/server/module.c
index 402d157d83..cf06d9b372 100644
--- a/src/lib/server/module.c
+++ b/src/lib/server/module.c
@@ -249,7 +249,7 @@ static void module_detach_parent(module_instance_t *mi)
 	if (mi->parent) module_detach_parent(UNCONST(module_instance_t *, mi->parent));
 
 	if (mi->exported->detach) {
-		mi->exported->detach(&(module_detach_ctx_t){ .inst = mi });
+		mi->exported->detach(&(module_detach_ctx_t){ .mi = mi });
 		mi->detached = true;
 	}
 }
@@ -622,7 +622,7 @@ static int _module_thread_inst_free(module_thread_instance_t *ti)
 
 	if (mi->exported->thread_detach) {
 		mi->exported->thread_detach(&(module_thread_inst_ctx_t const ){
-						.inst = ti->mi,
+						.mi = ti->mi,
 						.thread = ti->data,
 						.el = ti->el
 					  });
diff --git a/src/lib/server/module.h b/src/lib/server/module.h
index 44514ef23c..f3448202e6 100644
--- a/src/lib/server/module.h
+++ b/src/lib/server/module.h
@@ -80,12 +80,6 @@ typedef unlang_action_t (*module_method_t)(rlm_rcode_t *p_result, module_ctx_t c
  */
 typedef int (*module_instantiate_t)(module_inst_ctx_t const *mctx);
 
-/** Wrapper structure around module_instance_t to allow us to pass more arguments into module_detach_ctx_t in future
- */
-typedef struct {
-	module_instance_t const	*inst;		//!< Module instance to detach.
-} module_detach_ctx_t;
-
 /** Module detach callback
  *
  * Is called just before the server exits, and after re-instantiation on HUP,
diff --git a/src/lib/server/module_ctx.h b/src/lib/server/module_ctx.h
index a926e3f9b6..872daa0c3e 100644
--- a/src/lib/server/module_ctx.h
+++ b/src/lib/server/module_ctx.h
@@ -39,7 +39,7 @@ typedef struct module_instance_s module_instance_t;
  *
  */
 typedef struct {
-	module_instance_t const		*inst;		//!< Dynamic loader API handle for the module.
+	module_instance_t const		*mi;		//!< Instance of the module being instantiated.
 	void				*thread;	//!< Thread specific instance data.
 	void				*env_data;	//!< Per call environment data.
 	void				*rctx;		//!< Resume ctx that a module previously set.
@@ -49,14 +49,20 @@ typedef struct {
  *
  */
 typedef struct {
-	module_instance_t const		*inst;		//!< Dynamic loader API handle for the module.
+	module_instance_t const		*mi;		//!< Instance of the module being instantiated.
 } module_inst_ctx_t;
 
+/** Temporary structure to hold arguments for detach calls
+ */
+typedef struct {
+	module_instance_t const		*mi;		//!< Module instance to detach.
+} module_detach_ctx_t;
+
 /** Temporary structure to hold arguments for thread_instantiation calls
  *
  */
 typedef struct {
-	module_instance_t const		*inst;		//!< Dynamic loader API handle for the module.
+	module_instance_t const		*mi;		//!< Instance of the module being instantiated.
 							///< Must come first to allow cast between
 							///< module_inst_ctx.
 	void				*thread;	//!< Thread instance data.
@@ -84,7 +90,7 @@ static module_ctx_t *module_ctx_from_inst(TALLOC_CTX *ctx, module_inst_ctx_t con
 
 	nmctx = talloc_zero(ctx, module_ctx_t);
 	if (unlikely(!nmctx)) return NULL;
-	nmctx->inst = mctx->inst;
+	nmctx->mi = mctx->mi;
 
 	return nmctx;
 }
@@ -98,7 +104,7 @@ static module_ctx_t *module_ctx_from_thread_inst(TALLOC_CTX *ctx, module_thread_
 
 	nmctx = talloc_zero(ctx, module_ctx_t);
 	if (unlikely(!nmctx)) return NULL;
-	nmctx->inst = mctx->inst;
+	nmctx->mi = mctx->mi;
 	nmctx->thread = mctx->thread;
 
 	return nmctx;
@@ -130,7 +136,7 @@ DIAG_ON(unused-function)
  * @param[in] _env_data	Call environment data.
  * @param[in] _rctx	Resume ctx (if any).
  */
-#define MODULE_CTX(_mi, _thread, _env_data, _rctx) &(module_ctx_t){ .inst = _mi, .thread = _thread, .env_data = _env_data, .rctx = _rctx }
+#define MODULE_CTX(_mi, _thread, _env_data, _rctx) &(module_ctx_t){ .mi = _mi, .thread = _thread, .env_data = _env_data, .rctx = _rctx }
 
 /** Wrapper to create a module_ctx_t as a compound literal from a module_inst_ctx_t
  *
@@ -140,7 +146,7 @@ DIAG_ON(unused-function)
  *
  * @param[in] _mctx	to copy fields from.
  */
-#define MODULE_CTX_FROM_INST(_mctx) &(module_ctx_t){ .inst = (_mctx)->inst }
+#define MODULE_CTX_FROM_INST(_mctx) &(module_ctx_t){ .mi = (_mctx)->mi }
 
 /** Wrapper to create a module_ctx_t as a compound literal from a module_inst_ctx_t
  *
@@ -150,7 +156,7 @@ DIAG_ON(unused-function)
  *
  * @param[in] _mctx	to copy fields from.
  */
-#define MODULE_CTX_FROM_THREAD_INST(_mctx) &(module_ctx_t){ .inst = (_mctx)->inst, .thread = (_mctx)->thread, .env_data = (_mctx)->env_data }
+#define MODULE_CTX_FROM_THREAD_INST(_mctx) &(module_ctx_t){ .mi = (_mctx)->mi, .thread = (_mctx)->thread, .env_data = (_mctx)->env_data }
 
 /** Wrapper to create a module_inst_ctx_t as a compound literal
  *
@@ -160,7 +166,7 @@ DIAG_ON(unused-function)
  *
  * @param[in] _mi	of the module being called..
  */
-#define MODULE_INST_CTX(_mi) &(module_inst_ctx_t){ .inst = _mi }
+#define MODULE_INST_CTX(_mi) &(module_inst_ctx_t){ .mi = _mi }
 
 /** Wrapper to create a module_thread_inst_ctx_t as a compound literal
  *
@@ -172,7 +178,7 @@ DIAG_ON(unused-function)
  * @param[in] _thread 	instance of the module being called.
  * @param[in] _el	Thread specific event list.
  */
-#define MODULE_THREAD_INST_CTX(_mi, _thread, _el) &(module_thread_inst_ctx_t){ .inst = _mi, .thread = _thread, .el = _el }
+#define MODULE_THREAD_INST_CTX(_mi, _thread, _el) &(module_thread_inst_ctx_t){ .mi = _mi, .thread = _thread, .el = _el }
 
 /** Wrapper to create a module_inst_ctx_t as a comound listeral from a module_thread_ctx_t
  *
@@ -180,7 +186,7 @@ DIAG_ON(unused-function)
  *
  * @param[in] _mctx	to extract module_thread_inst_ctx_t from.
  */
-#define MODULE_THREAD_INST_CTX_FROM_INST_CTX(_mctx) &(module_ctx_t){ .inst = (_mctx)->inst }
+#define MODULE_THREAD_INST_CTX_FROM_INST_CTX(_mctx) &(module_ctx_t){ .mi = (_mctx)->mi }
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/server/process.h b/src/lib/server/process.h
index 52a9d09d13..a664d6c0e6 100644
--- a/src/lib/server/process.h
+++ b/src/lib/server/process.h
@@ -191,7 +191,7 @@ RECV(generic)
 {
 	CONF_SECTION			*cs;
 	fr_process_state_t const	*state;
-	PROCESS_INST const		*inst = mctx->inst->data;
+	PROCESS_INST const		*inst = mctx->mi->data;
 
 	PROCESS_TRACE;
 
@@ -267,7 +267,7 @@ SEND(generic)
 	fr_pair_t 			*vp;
 	CONF_SECTION			*cs;
 	fr_process_state_t const	*state;
-	PROCESS_INST const   		*inst = mctx->inst->data;
+	PROCESS_INST const   		*inst = mctx->mi->data;
 
 	PROCESS_TRACE;
 
@@ -329,7 +329,7 @@ RESUME(send_generic)
 	rlm_rcode_t			rcode = *p_result;
 	CONF_SECTION			*cs;
 	fr_process_state_t const	*state;
-	PROCESS_INST const   		*inst = mctx->inst->data;
+	PROCESS_INST const   		*inst = mctx->mi->data;
 
 	PROCESS_TRACE;
 
@@ -425,7 +425,7 @@ RESUME(new_client)
 {
 	rlm_rcode_t			rcode = *p_result;
 	CONF_SECTION			*cs;
-	PROCESS_INST const		*inst = mctx->inst->data;
+	PROCESS_INST const		*inst = mctx->mi->data;
 
 	switch (rcode) {
 	case RLM_MODULE_OK:
@@ -453,7 +453,7 @@ RESUME(new_client)
 static inline unlang_action_t new_client(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
 	CONF_SECTION			*cs;
-	PROCESS_INST const		*inst = mctx->inst->data;
+	PROCESS_INST const		*inst = mctx->mi->data;
 
 	PROCESS_TRACE;
 	fr_assert(inst->sections.new_client != NULL);
diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index e173569659..6b0ab525ab 100644
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -400,7 +400,7 @@ static void unlang_dump(unlang_t *instruction, int depth)
 		{
 			unlang_module_t *single = unlang_generic_to_module(c);
 
-			DEBUG("%.*s%s", depth, unlang_spaces, single->instance->name);
+			DEBUG("%.*s%s", depth, unlang_spaces, single->mi->name);
 		}
 			break;
 
@@ -4553,7 +4553,7 @@ static unlang_t *compile_module(unlang_t *parent, unlang_compile_t *unlang_ctx,
 	}
 
 	MEM(single = talloc_zero(parent, unlang_module_t));
-	single->instance = inst;
+	single->mi = inst;
 	single->method = method;
 	c = unlang_module_to_generic(single);
 	c->parent = parent;
@@ -4589,7 +4589,7 @@ static unlang_t *compile_module(unlang_t *parent, unlang_compile_t *unlang_ctx,
 		single->call_env = call_env_alloc(single, single->self.name, method_env,
 						  unlang_ctx->rules, inst->conf,
 						  unlang_ctx->section_name1, unlang_ctx->section_name2,
-						  single->instance->data);
+						  single->mi->data);
 		if (!single->call_env) {
 		error:
 			talloc_free(c);
diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 02e8614430..38efed2eb1 100644
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -145,7 +145,7 @@ int unlang_module_timeout_add(request_t *request, unlang_module_timeout_t callba
 		.request = request,
 		.fd = -1,
 		.timeout = callback,
-		.mi = mc->instance,
+		.mi = mc->mi,
 		.thread = state->thread,
 		.env_data = state->env_data,
 		.rctx = rctx
@@ -268,7 +268,7 @@ int unlang_module_fd_add(request_t *request,
 	ev->fd_read = read;
 	ev->fd_write = write;
 	ev->fd_error = error;
-	ev->mi = mc->instance;
+	ev->mi = mc->mi;
 	ev->thread = state->thread;
 	ev->env_data = state->env_data;
 	ev->rctx = rctx;
@@ -314,7 +314,7 @@ int unlang_module_fd_delete(request_t *request, void const *ctx, int fd)
  *
  * @param[out] p_result		Where to write the result of calling the module.
  * @param[in] request		The current request.
- * @param[in] module_instance	Instance of the module to call.
+ * @param[in] mi		Instance of the module to call.
  * @param[in] method		to call.
  * @param[in] top_frame		Set to UNLANG_TOP_FRAME if the interpreter should return.
  *				Set to UNLANG_SUB_FRAME if the interprer should continue.
@@ -323,7 +323,7 @@ int unlang_module_fd_delete(request_t *request, void const *ctx, int fd)
  *	- -1 on failure.
  */
 int unlang_module_push(rlm_rcode_t *p_result, request_t *request,
-		       module_instance_t *module_instance, module_method_t method, bool top_frame)
+		       module_instance_t *mi, module_method_t method, bool top_frame)
 {
 	unlang_stack_t			*stack = request->stack;
 	unlang_stack_frame_t		*frame;
@@ -339,8 +339,8 @@ int unlang_module_push(rlm_rcode_t *p_result, request_t *request,
 	*mc = (unlang_module_t){
 		.self = {
 			.type = UNLANG_TYPE_MODULE,
-			.name = module_instance->name,
-			.debug_name = module_instance->name,
+			.name = mi->name,
+			.debug_name = mi->name,
 			.actions = {
 				.actions = {
 					[RLM_MODULE_REJECT]	= 0,
@@ -356,7 +356,7 @@ int unlang_module_push(rlm_rcode_t *p_result, request_t *request,
 				.retry = RETRY_INIT,
 			},
 		},
-		.instance = module_instance,
+		.mi = mi,
 		.method = method
 	};
 
@@ -372,7 +372,7 @@ int unlang_module_push(rlm_rcode_t *p_result, request_t *request,
 	state = frame->state;
 	*state = (unlang_frame_state_module_t){
 		.p_result = p_result,
-		.thread = module_thread(module_instance)
+		.thread = module_thread(mi)
 	};
 
 	/*
@@ -537,7 +537,7 @@ unlang_action_t unlang_module_yield_to_section(rlm_rcode_t *p_result,
 		state = talloc_get_type_abort(frame->state, unlang_frame_state_module_t);
 
 		return resume(p_result,
-			      MODULE_CTX(mc->instance, module_thread(mc->instance)->data,
+			      MODULE_CTX(mc->mi, module_thread(mc->mi)->data,
 			      		 state->env_data, rctx),
 			      request);
 	}
@@ -635,10 +635,10 @@ static void unlang_module_signal(request_t *request, unlang_stack_frame_t *frame
 	 *	Async calls can't push anything onto the unlang stack, so we just use a local "caller" here.
 	 */
 	caller = request->module;
-	request->module = mc->instance->name;
-	safe_lock(mc->instance);
-	if (!(action & state->sigmask)) state->signal(MODULE_CTX(mc->instance, state->thread->data, state->env_data, state->rctx), request, action);
-	safe_unlock(mc->instance);
+	request->module = mc->mi->name;
+	safe_lock(mc->mi);
+	if (!(action & state->sigmask)) state->signal(MODULE_CTX(mc->mi, state->thread->data, state->env_data, state->rctx), request, action);
+	safe_unlock(mc->mi);
 	request->module = caller;
 
 	/*
@@ -725,16 +725,16 @@ static unlang_action_t unlang_module_resume(rlm_rcode_t *p_result, request_t *re
 	/*
 	 *	Lock is noop unless instance->mutex is set.
 	 */
-	safe_lock(mc->instance);
-	ua = resume(&state->rcode, MODULE_CTX(mc->instance, state->thread->data,
+	safe_lock(mc->mi);
+	ua = resume(&state->rcode, MODULE_CTX(mc->mi, state->thread->data,
 					      state->env_data, state->rctx), request);
-	safe_unlock(mc->instance);
+	safe_unlock(mc->mi);
 
 	if (request->master_state == REQUEST_STOP_PROCESSING) ua = UNLANG_ACTION_STOP_PROCESSING;
 
 	switch (ua) {
 	case UNLANG_ACTION_STOP_PROCESSING:
-		RWARN("Module %s or worker signalled to stop processing request", mc->instance->module->exported->name);
+		RWARN("Module %s or worker signalled to stop processing request", mc->mi->module->exported->name);
 		if (state->p_result) *state->p_result = state->rcode;
 		state->thread->active_callers--;
 		*p_result = state->rcode;
@@ -895,15 +895,15 @@ static unlang_action_t unlang_module(rlm_rcode_t *p_result, request_t *request,
 	fr_assert(mc);
 
 	RDEBUG4("[%i] %s - %s (%s)", stack_depth_current(request), __FUNCTION__,
-		mc->instance->module->exported->name, mc->instance->name);
+		mc->mi->module->exported->name, mc->mi->name);
 
 	state->p_result = NULL;
 
 	/*
 	 *	Return administratively configured return code
 	 */
-	if (mc->instance->force) {
-		state->rcode = mc->instance->code;
+	if (mc->mi->force) {
+		state->rcode = mc->mi->code;
 		ua = UNLANG_ACTION_CALCULATE_RESULT;
 		goto done;
 	}
@@ -933,7 +933,7 @@ static unlang_action_t unlang_module(rlm_rcode_t *p_result, request_t *request,
 	/*
 	 *	Grab the thread/module specific data if any exists.
 	 */
-	state->thread = module_thread(mc->instance);
+	state->thread = module_thread(mc->mi);
 	fr_assert(state->thread != NULL);
 
 	/*
@@ -952,12 +952,12 @@ static unlang_action_t unlang_module(rlm_rcode_t *p_result, request_t *request,
 	 */
 	if (fr_time_delta_ispos(frame->instruction->actions.retry.irt)) now = fr_time();
 
-	request->module = mc->instance->name;
-	safe_lock(mc->instance);	/* Noop unless instance->mutex set */
+	request->module = mc->mi->name;
+	safe_lock(mc->mi);	/* Noop unless instance->mutex set */
 	ua = mc->method(&state->rcode,
-			MODULE_CTX(mc->instance, state->thread->data, state->env_data, NULL),
+			MODULE_CTX(mc->mi, state->thread->data, state->env_data, NULL),
 			request);
-	safe_unlock(mc->instance);
+	safe_unlock(mc->mi);
 
 	if (request->master_state == REQUEST_STOP_PROCESSING) ua = UNLANG_ACTION_STOP_PROCESSING;
 
@@ -967,7 +967,7 @@ static unlang_action_t unlang_module(rlm_rcode_t *p_result, request_t *request,
 	 *	must have been blocked.
 	 */
 	case UNLANG_ACTION_STOP_PROCESSING:
-		RWARN("Module %s became unblocked", mc->instance->name);
+		RWARN("Module %s became unblocked", mc->mi->name);
 		if (state->p_result) *state->p_result = state->rcode;
 		*p_result = state->rcode;
 		request->module = state->previous_module;
diff --git a/src/lib/unlang/module_priv.h b/src/lib/unlang/module_priv.h
index 0b3e9532c1..54f135e269 100644
--- a/src/lib/unlang/module_priv.h
+++ b/src/lib/unlang/module_priv.h
@@ -34,7 +34,7 @@ extern "C" {
  */
 typedef struct {
 	unlang_t			self;			//!< Common fields in all #unlang_t tree nodes.
-	module_instance_t		*instance;		//!< Global instance of the module we're calling.
+	module_instance_t		*mi;			//!< Global instance of the module we're calling.
 	module_method_t			method;			//!< The entry point into the module.
 	call_env_t const		*call_env;		//!< The per call parsed call environment.
 } unlang_module_t;
diff --git a/src/lib/unlang/xlat_func.c b/src/lib/unlang/xlat_func.c
index f36b449147..569fce1622 100644
--- a/src/lib/unlang/xlat_func.c
+++ b/src/lib/unlang/xlat_func.c
@@ -171,8 +171,8 @@ xlat_t *xlat_func_find_module(module_inst_ctx_t const *mctx, char const *name)
 	 *	Name xlats other than those which are just the module instance
 	 *	as <instance name>.<function name>
 	 */
-	if (mctx && name != mctx->inst->name) {
-		snprintf(inst_name, sizeof(inst_name), "%s.%s", mctx->inst->name, name);
+	if (mctx && name != mctx->mi->name) {
+		snprintf(inst_name, sizeof(inst_name), "%s.%s", mctx->mi->name, name);
 		name = inst_name;
 	}
 
@@ -278,13 +278,13 @@ xlat_t *xlat_func_register_module(TALLOC_CTX *ctx, module_inst_ctx_t const *mctx
 	xlat_t			*c;
 	char 			inst_name[256];
 
-	fr_assert_msg(name != mctx->inst->name, "`name` must not be the same as the module "
+	fr_assert_msg(name != mctx->mi->name, "`name` must not be the same as the module "
 		      "instance name.  Pass a NULL `name` arg if this is required");
 
 	if (!name) {
-		name = mctx->inst->name;
+		name = mctx->mi->name;
 	} else {
-		if ((size_t)snprintf(inst_name, sizeof(inst_name), "%s.%s", mctx->inst->name, name) >= sizeof(inst_name)) {
+		if ((size_t)snprintf(inst_name, sizeof(inst_name), "%s.%s", mctx->mi->name, name) >= sizeof(inst_name)) {
 			ERROR("%s: Instance name too long", __FUNCTION__);
 			return NULL;
 		}
@@ -553,7 +553,7 @@ void xlat_func_unregister_module(module_instance_t const *inst)
 	     c;
 	     c = fr_rb_iter_next_inorder(&iter)) {
 		if (!c->mctx) continue;
-		if (c->mctx->inst != inst) continue;
+		if (c->mctx->mi != inst) continue;
 
 		fr_rb_iter_delete_inorder(&iter);
 	}
diff --git a/src/lib/unlang/xlat_inst.c b/src/lib/unlang/xlat_inst.c
index 9c531711a7..fd05d2a9aa 100644
--- a/src/lib/unlang/xlat_inst.c
+++ b/src/lib/unlang/xlat_inst.c
@@ -158,7 +158,7 @@ static xlat_thread_inst_t *xlat_thread_inst_alloc(TALLOC_CTX *ctx, fr_event_list
 		module_ctx_t *mctx;
 
 		mctx = module_ctx_from_inst(xt, call->func->mctx);
-		mctx->thread = module_rlm_thread_by_data(mctx->inst->data)->data;
+		mctx->thread = module_rlm_thread_by_data(mctx->mi->data)->data;
 
 		xt->mctx = mctx;
 	}
@@ -251,7 +251,7 @@ static xlat_inst_t *xlat_inst_alloc(xlat_exp_t *node)
 	if (call->func->call_env_method) {
 		fr_assert_msg(call->func->call_env_method->inst_size,
 			      "Method environment for module %s, xlat %s declared, "
-			      "but no inst_size set", call->func->mctx->inst->name, call->func->name);
+			      "but no inst_size set", call->func->mctx->mi->name, call->func->name);
 
 		/*
 		 *	FIXME - This is wrong, we should pass in the tmpl_rule_t
@@ -272,7 +272,7 @@ static xlat_inst_t *xlat_inst_alloc(xlat_exp_t *node)
 									.dict_def = call->dict,
 									.list_def = request_attr_request
 							}
-					      }, call->func->mctx->inst->conf, NULL, NULL, call->func->mctx->inst->data);
+					      }, call->func->mctx->mi->conf, NULL, NULL, call->func->mctx->mi->data);
 		if (!xi->call_env) {
 			talloc_free(xi);
 			return NULL;
diff --git a/src/listen/arp/proto_arp.c b/src/listen/arp/proto_arp.c
index 8f3935592f..f05f57f6a9 100644
--- a/src/listen/arp/proto_arp.c
+++ b/src/listen/arp/proto_arp.c
@@ -223,7 +223,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_arp_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_arp_t);
+	proto_arp_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_arp_t);
 
 	if (!inst->num_messages) inst->num_messages = 256;
 
@@ -244,8 +244,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_arp_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_arp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_arp_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_arp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	module_instance_t	*parent_inst;
 
 	/*
diff --git a/src/listen/arp/proto_arp_ethernet.c b/src/listen/arp/proto_arp_ethernet.c
index 6e27fac8d8..61df2da057 100644
--- a/src/listen/arp/proto_arp_ethernet.c
+++ b/src/listen/arp/proto_arp_ethernet.c
@@ -218,9 +218,9 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_arp_ethernet_t 	*inst = talloc_get_type_abort(mctx->inst->data, proto_arp_ethernet_t);
+	proto_arp_ethernet_t 	*inst = talloc_get_type_abort(mctx->mi->data, proto_arp_ethernet_t);
 
-	inst->cs = mctx->inst->conf;
+	inst->cs = mctx->mi->conf;
 
 	return 0;
 }
diff --git a/src/listen/bfd/proto_bfd.c b/src/listen/bfd/proto_bfd.c
index b8a0604ce8..f8a2f428cf 100644
--- a/src/listen/bfd/proto_bfd.c
+++ b/src/listen/bfd/proto_bfd.c
@@ -317,7 +317,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_bfd_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_bfd_t);
+	proto_bfd_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_bfd_t);
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -355,13 +355,13 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_bfd_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_bfd_t);
+	proto_bfd_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_bfd_t);
 	CONF_SECTION		*server;
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
 	 */
-	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -377,7 +377,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 	server = inst->io.server_cs;
 
 	inst->peers = cf_data_value(cf_data_find(server, fr_rb_tree_t, "peers"));
diff --git a/src/listen/bfd/proto_bfd_udp.c b/src/listen/bfd/proto_bfd_udp.c
index 72ad305eda..ca5d9db8dc 100644
--- a/src/listen/bfd/proto_bfd_udp.c
+++ b/src/listen/bfd/proto_bfd_udp.c
@@ -355,8 +355,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_bfd_udp_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_bfd_udp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_bfd_udp_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_bfd_udp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	size_t			num;
 	CONF_ITEM		*ci;
 	CONF_SECTION		*server_cs;
diff --git a/src/listen/control/proto_control.c b/src/listen/control/proto_control.c
index 91daa9946d..16fc75749c 100644
--- a/src/listen/control/proto_control.c
+++ b/src/listen/control/proto_control.c
@@ -94,7 +94,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_control_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_control_t);
+	proto_control_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_control_t);
 
 	fr_assert(inst->io.submodule != NULL);
 
@@ -129,8 +129,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_control_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_control_t);
-	CONF_SECTION			*conf = mctx->inst->conf;
+	proto_control_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_control_t);
+	CONF_SECTION			*conf = mctx->mi->conf;
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
@@ -163,7 +163,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/control/proto_control_unix.c b/src/listen/control/proto_control_unix.c
index 0a936b3d2b..17d06e1d83 100644
--- a/src/listen/control/proto_control_unix.c
+++ b/src/listen/control/proto_control_unix.c
@@ -580,8 +580,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_control_unix_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_control_unix_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_control_unix_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_control_unix_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	inst->cs = conf;
 
diff --git a/src/listen/cron/proto_cron.c b/src/listen/cron/proto_cron.c
index 4bccfae9f7..62fa54a731 100644
--- a/src/listen/cron/proto_cron.c
+++ b/src/listen/cron/proto_cron.c
@@ -176,7 +176,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_cron_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_cron_t);
+	proto_cron_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_cron_t);
 
 	fr_assert(inst->io.submodule);
 
@@ -210,8 +210,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_cron_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_cron_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_cron_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_cron_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
@@ -242,7 +242,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/cron/proto_cron_crontab.c b/src/listen/cron/proto_cron_crontab.c
index cde00debda..3c1278c6f0 100644
--- a/src/listen/cron/proto_cron_crontab.c
+++ b/src/listen/cron/proto_cron_crontab.c
@@ -680,10 +680,10 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_cron_crontab_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_cron_crontab_t);
+	proto_cron_crontab_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_cron_crontab_t);
 
-	inst->parent = talloc_get_type_abort(mctx->inst->parent->data, proto_cron_t);
-	inst->cs = mctx->inst->conf;
+	inst->parent = talloc_get_type_abort(mctx->mi->parent->data, proto_cron_t);
+	inst->cs = mctx->mi->conf;
 
 	return 0;
 }
@@ -698,8 +698,8 @@ static fr_client_t *mod_client_find(fr_listen_t *li, UNUSED fr_ipaddr_t const *i
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_cron_crontab_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_cron_crontab_t);
-	CONF_SECTION		*conf = mctx->inst->data;
+	proto_cron_crontab_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_cron_crontab_t);
+	CONF_SECTION		*conf = mctx->mi->data;
 	fr_client_t		*client;
 	fr_pair_t		*vp;
 	FILE			*fp;
diff --git a/src/listen/detail/proto_detail.c b/src/listen/detail/proto_detail.c
index 7c132ca1b7..d8282f8adf 100644
--- a/src/listen/detail/proto_detail.c
+++ b/src/listen/detail/proto_detail.c
@@ -457,8 +457,8 @@ static int mod_open(void *instance, fr_schedule_t *sc, CONF_SECTION *conf)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_detail_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_detail_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_detail_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_detail_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	/*
 	 *	Instantiate the I/O module. But DON'T instantiate the
@@ -510,8 +510,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_detail_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_detail_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_detail_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_detail_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	/*
 	 *	The listener is inside of a virtual server.
diff --git a/src/listen/detail/proto_detail_file.c b/src/listen/detail/proto_detail_file.c
index 52fccaa31c..2f46154f2e 100644
--- a/src/listen/detail/proto_detail_file.c
+++ b/src/listen/detail/proto_detail_file.c
@@ -624,8 +624,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_detail_file_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_detail_file_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_detail_file_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_detail_file_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	module_instance_t const	*mi;
 	char			*p;
 
@@ -656,7 +656,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	 *	so we can find out what the parent of our instance
 	 *	was.
 	 */
-	mi = mctx->inst;
+	mi = mctx->mi;
 
 #ifndef __linux__
 	/*
@@ -717,8 +717,8 @@ static int8_t _detail_file_cmp(void const *one, void const *two)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_detail_file_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_detail_file_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_detail_file_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_detail_file_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	pthread_mutex_lock(&detail_file_mutex);
 	if (!detail_file_tree) {
diff --git a/src/listen/detail/proto_detail_work.c b/src/listen/detail/proto_detail_work.c
index dc615b06a2..f5af01f765 100644
--- a/src/listen/detail/proto_detail_work.c
+++ b/src/listen/detail/proto_detail_work.c
@@ -844,7 +844,7 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_detail_work_t *inst = talloc_get_type_abort(mctx->inst->data, proto_detail_work_t);
+	proto_detail_work_t *inst = talloc_get_type_abort(mctx->mi->data, proto_detail_work_t);
 	fr_client_t *client;
 
 	client = inst->client = talloc_zero(inst, fr_client_t);
@@ -862,9 +862,9 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_detail_work_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_detail_work_t);
-	CONF_SECTION		*cs = mctx->inst->conf;
-	module_instance_t const	*mi = mctx->inst;
+	proto_detail_work_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_detail_work_t);
+	CONF_SECTION		*cs = mctx->mi->conf;
+	module_instance_t const	*mi = mctx->mi;
 
 	inst->parent = talloc_get_type_abort(mi->parent->data, proto_detail_t);
 	inst->cs = cs;
diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c
index 21e90cf51a..7b70406f96 100644
--- a/src/listen/dhcpv4/proto_dhcpv4.c
+++ b/src/listen/dhcpv4/proto_dhcpv4.c
@@ -363,7 +363,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_dhcpv4_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_dhcpv4_t);
+	proto_dhcpv4_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_dhcpv4_t);
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -401,12 +401,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_dhcpv4_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_dhcpv4_t);
+	proto_dhcpv4_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_dhcpv4_t);
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
 	 */
-	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 
 	fr_assert(dict_dhcpv4 != NULL);
 	fr_assert(attr_message_type != NULL);
@@ -437,7 +437,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.c b/src/listen/dhcpv4/proto_dhcpv4_udp.c
index dc14399bf1..5bcbb91a32 100644
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.c
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.c
@@ -671,8 +671,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_dhcpv4_udp_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_dhcpv4_udp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_dhcpv4_udp_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_dhcpv4_udp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	size_t			num;
 	CONF_ITEM		*ci;
 	CONF_SECTION		*server_cs;
diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c
index 5482d823c5..bcc6c7a6fa 100644
--- a/src/listen/dhcpv6/proto_dhcpv6.c
+++ b/src/listen/dhcpv6/proto_dhcpv6.c
@@ -344,7 +344,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_dhcpv6_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_dhcpv6_t);
+	proto_dhcpv6_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_dhcpv6_t);
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -381,12 +381,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_dhcpv6_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_dhcpv6_t);
+	proto_dhcpv6_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_dhcpv6_t);
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
 	 */
-	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 
 	fr_assert(dict_dhcpv6 != NULL);
 	fr_assert(attr_packet_type != NULL);
@@ -417,7 +417,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index e5aee4f751..dba46e651f 100644
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -469,12 +469,12 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_dhcpv6_udp_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_dhcpv6_udp_t);
+	proto_dhcpv6_udp_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_dhcpv6_udp_t);
 	size_t			num;
 	CONF_ITEM		*ci;
 	CONF_SECTION		*server_cs;
 	fr_client_t		*client;
-	CONF_SECTION		*conf = mctx->inst->conf;
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	inst->cs = conf;
 
diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c
index fbf4fe258f..c1f1fb016e 100644
--- a/src/listen/dns/proto_dns.c
+++ b/src/listen/dns/proto_dns.c
@@ -293,7 +293,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_dns_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_dns_t);
+	proto_dns_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_dns_t);
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -330,12 +330,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_dns_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_dns_t);
+	proto_dns_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_dns_t);
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
 	 */
-	inst->io.server_cs = cf_section_find_parent(mctx->inst->conf, "server", CF_IDENT_ANY);
+	inst->io.server_cs = cf_section_find_parent(mctx->mi->conf, "server", CF_IDENT_ANY);
 
 	fr_assert(dict_dns != NULL);
 	fr_assert(attr_packet_type != NULL);
@@ -360,7 +360,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/dns/proto_dns_udp.c b/src/listen/dns/proto_dns_udp.c
index a02bdbc950..307863c344 100644
--- a/src/listen/dns/proto_dns_udp.c
+++ b/src/listen/dns/proto_dns_udp.c
@@ -340,8 +340,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_dns_udp_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_dns_udp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_dns_udp_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_dns_udp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	size_t			num;
 	CONF_SECTION		*server_cs;
 	fr_client_t		*client;
diff --git a/src/listen/ldap_sync/proto_ldap_sync.c b/src/listen/ldap_sync/proto_ldap_sync.c
index 032657a767..8dcf914f1b 100644
--- a/src/listen/ldap_sync/proto_ldap_sync.c
+++ b/src/listen/ldap_sync/proto_ldap_sync.c
@@ -233,8 +233,8 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_ldap_sync_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_ldap_sync_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_ldap_sync_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_ldap_sync_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	CONF_SECTION		*sync_cs;
 	sync_config_t		*sync_conf;
 	size_t			i;
@@ -367,8 +367,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_ldap_sync_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_ldap_sync_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_ldap_sync_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_ldap_sync_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	inst->server_cs = cf_item_to_section(cf_parent(conf));
 	inst->cs = conf;
diff --git a/src/listen/ldap_sync/proto_ldap_sync_ldap.c b/src/listen/ldap_sync/proto_ldap_sync_ldap.c
index 04c077f13d..99c5443c93 100644
--- a/src/listen/ldap_sync/proto_ldap_sync_ldap.c
+++ b/src/listen/ldap_sync/proto_ldap_sync_ldap.c
@@ -1278,8 +1278,8 @@ static void mod_event_list_set(fr_listen_t *li, fr_event_list_t *el, void *nr)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_ldap_sync_ldap_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_ldap_sync_ldap_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_ldap_sync_ldap_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_ldap_sync_ldap_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	char const		*server;
 
 	/*
@@ -1307,9 +1307,9 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_ldap_sync_ldap_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_ldap_sync_ldap_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
-	module_instance_t const	*mi = mctx->inst;
+	proto_ldap_sync_ldap_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_ldap_sync_ldap_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
+	module_instance_t const	*mi = mctx->mi;
 
 	inst->parent = talloc_get_type_abort(mi->parent->data, proto_ldap_sync_t);
 	inst->cs = conf;
diff --git a/src/listen/load/proto_load.c b/src/listen/load/proto_load.c
index daa5c8137b..15403244a9 100644
--- a/src/listen/load/proto_load.c
+++ b/src/listen/load/proto_load.c
@@ -186,7 +186,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_load_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_load_t);
+	proto_load_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_load_t);
 
 	fr_assert(inst->io.submodule);
 
@@ -220,8 +220,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_load_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_load_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_load_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_load_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
@@ -253,7 +253,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/load/proto_load_step.c b/src/listen/load/proto_load_step.c
index 9c84bf5f6c..f925382375 100644
--- a/src/listen/load/proto_load_step.c
+++ b/src/listen/load/proto_load_step.c
@@ -339,9 +339,9 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_load_step_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_load_step_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
-	module_instance_t const	*mi = mctx->inst;
+	proto_load_step_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_load_step_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
+	module_instance_t const	*mi = mctx->mi;
 
 	inst->parent = talloc_get_type_abort(mi->parent->data, proto_load_t);
 	inst->cs = conf;
@@ -378,8 +378,8 @@ static fr_client_t *mod_client_find(fr_listen_t *li, UNUSED fr_ipaddr_t const *i
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_load_step_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_load_step_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_load_step_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_load_step_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	fr_client_t		*client;
 	fr_pair_t		*vp;
 
diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index aa39b98fca..dfbddfd7ba 100644
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -435,7 +435,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_radius_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_radius_t);
+	proto_radius_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_radius_t);
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -473,12 +473,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_radius_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_radius_t);
+	proto_radius_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_radius_t);
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
 	 */
-	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -515,7 +515,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index c343604f59..70713aefc1 100644
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -433,8 +433,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_radius_tcp_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_radius_tcp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_radius_tcp_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_radius_tcp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	size_t			i, num;
 	CONF_ITEM		*ci;
 	CONF_SECTION		*server_cs;
diff --git a/src/listen/radius/proto_radius_udp.c b/src/listen/radius/proto_radius_udp.c
index af1b70a713..4f70102d6b 100644
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -436,8 +436,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_radius_udp_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_radius_udp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_radius_udp_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_radius_udp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	size_t			num;
 	CONF_ITEM		*ci;
 	CONF_SECTION		*server_cs;
diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c
index 131b76b80e..8acae229e6 100644
--- a/src/listen/tacacs/proto_tacacs.c
+++ b/src/listen/tacacs/proto_tacacs.c
@@ -450,7 +450,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_tacacs_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_tacacs_t);
+	proto_tacacs_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_tacacs_t);
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -488,12 +488,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_tacacs_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_tacacs_t);
+	proto_tacacs_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_tacacs_t);
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
 	 */
-	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->io.server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 
 	fr_assert(dict_tacacs != NULL);
 
@@ -520,7 +520,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c
index 63d41e38a0..f02442e3f5 100644
--- a/src/listen/tacacs/proto_tacacs_tcp.c
+++ b/src/listen/tacacs/proto_tacacs_tcp.c
@@ -400,8 +400,8 @@ static char const *mod_name(fr_listen_t *li)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_tacacs_tcp_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_tacacs_tcp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_tacacs_tcp_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_tacacs_tcp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	size_t			num;
 	CONF_ITEM		*ci;
 	CONF_SECTION		*server_cs;
diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index 9a88706d39..6a775dff66 100644
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -312,7 +312,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	proto_vmps_t		*inst = talloc_get_type_abort(mctx->inst->data, proto_vmps_t);
+	proto_vmps_t		*inst = talloc_get_type_abort(mctx->mi->data, proto_vmps_t);
 
 	/*
 	 *	No IO module, it's an empty listener.
@@ -350,8 +350,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_vmps_t 		*inst = talloc_get_type_abort(mctx->inst->data, proto_vmps_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_vmps_t 		*inst = talloc_get_type_abort(mctx->mi->data, proto_vmps_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	/*
 	 *	Ensure that the server CONF_SECTION is always set.
@@ -384,7 +384,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	We will need this for dynamic clients and connected sockets.
 	 */
-	inst->io.mi = mctx->inst;
+	inst->io.mi = mctx->mi;
 
 	/*
 	 *	Bootstrap the master IO handler.
diff --git a/src/listen/vmps/proto_vmps_udp.c b/src/listen/vmps/proto_vmps_udp.c
index b4c571600f..40986a5e1e 100644
--- a/src/listen/vmps/proto_vmps_udp.c
+++ b/src/listen/vmps/proto_vmps_udp.c
@@ -390,8 +390,8 @@ static int mod_track_compare(UNUSED void const *instance, UNUSED void *thread_in
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	proto_vmps_udp_t	*inst = talloc_get_type_abort(mctx->inst->data, proto_vmps_udp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	proto_vmps_udp_t	*inst = talloc_get_type_abort(mctx->mi->data, proto_vmps_udp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	size_t			num;
 	CONF_ITEM		*ci;
 	CONF_SECTION		*server_cs;
diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c
index a79079a688..87524f5a67 100644
--- a/src/modules/rlm_always/rlm_always.c
+++ b/src/modules/rlm_always/rlm_always.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module_rlm.h>
@@ -68,7 +68,7 @@ static xlat_action_t always_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 xlat_ctx_t const *xctx,
 				 request_t *request, fr_value_box_list_t *in)
 {
-	rlm_always_t		*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_always_t);
+	rlm_always_t		*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_always_t);
 	module_instance_t	*mi = inst->mi;
 	char const		*status;
 	char const		*p;
@@ -117,12 +117,12 @@ done:
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_always_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_always_t);
+	rlm_always_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_always_t);
 	xlat_t		*xlat;
 
-	inst->mi = module_rlm_by_name(NULL, mctx->inst->name);
+	inst->mi = module_rlm_by_name(NULL, mctx->mi->name);
 	if (!inst->mi) {
-		cf_log_err(mctx->inst->conf, "Can't find the module instance data for this module: %s", mctx->inst->name);
+		cf_log_err(mctx->mi->conf, "Can't find the module instance data for this module: %s", mctx->mi->name);
 		return -1;
 	}
 
@@ -134,14 +134,14 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_always_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_always_t);
+	rlm_always_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_always_t);
 
 	/*
 	 *	Convert the rcode string to an int
 	 */
 	inst->rcode = fr_table_value_by_str(rcode_table, inst->rcode_str, RLM_MODULE_NOT_SET);
 	if (inst->rcode == RLM_MODULE_NOT_SET) {
-		cf_log_err(mctx->inst->conf, "rcode value \"%s\" is invalid", inst->rcode_str);
+		cf_log_err(mctx->mi->conf, "rcode value \"%s\" is invalid", inst->rcode_str);
 		return -1;
 	}
 
@@ -154,7 +154,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static unlang_action_t CC_HINT(nonnull) mod_always_return(rlm_rcode_t *p_result, module_ctx_t const *mctx, UNUSED request_t *request)
 {
-	rlm_always_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_always_t);
+	rlm_always_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_always_t);
 
 	RETURN_MODULE_RCODE(inst->rcode);
 }
diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index bad95a7a39..bfccfcd1d0 100644
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module_rlm.h>
@@ -168,7 +168,7 @@ static int attr_filter_getfile(TALLOC_CTX *ctx, module_inst_ctx_t const *mctx, c
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_attr_filter_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_attr_filter_t);
+	rlm_attr_filter_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_attr_filter_t);
 	int rcode;
 	pairlist_list_init(&inst->attrs);
 
@@ -190,7 +190,7 @@ static unlang_action_t CC_HINT(nonnull(1,2)) attr_filter_common(rlm_rcode_t *p_r
 								module_ctx_t const *mctx, request_t *request,
 								fr_packet_t *packet, fr_pair_list_t *list)
 {
-	rlm_attr_filter_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_attr_filter_t);
+	rlm_attr_filter_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_attr_filter_t);
 	fr_pair_list_t	output;
 	PAIR_LIST	*pl = NULL;
 	int		found = 0;
diff --git a/src/modules/rlm_brotli/rlm_brotli.c b/src/modules/rlm_brotli/rlm_brotli.c
index d87f5b0f23..38130e9851 100644
--- a/src/modules/rlm_brotli/rlm_brotli.c
+++ b/src/modules/rlm_brotli/rlm_brotli.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <talloc.h>
 
@@ -186,7 +186,7 @@ static xlat_action_t brotli_xlat_compress(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	  xlat_ctx_t const *xctx,
 					  request_t *request, fr_value_box_list_t *args)
 {
-	rlm_brotli_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_brotli_t);
+	rlm_brotli_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_brotli_t);
 	fr_value_box_t const		*data_vb;
 
 	BrotliEncoderState		*state;
@@ -295,7 +295,7 @@ static xlat_action_t brotli_xlat_decompress(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	    xlat_ctx_t const *xctx,
 					    request_t *request, fr_value_box_list_t *args)
 {
-	rlm_brotli_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_brotli_t);
+	rlm_brotli_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_brotli_t);
 	fr_value_box_t const		*data_vb;
 
 	BrotliDecoderState		*state;
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
index 71490b5f2d..b9fb5b8da9 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
@@ -107,15 +107,15 @@ static void *mod_conn_create(TALLOC_CTX *ctx, void *instance, fr_time_delta_t ti
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_cache_memcached_t		*driver = talloc_get_type_abort(mctx->inst->data, rlm_cache_memcached_t);
-	CONF_SECTION			*conf = mctx->inst->conf;
+	rlm_cache_memcached_t		*driver = talloc_get_type_abort(mctx->mi->data, rlm_cache_memcached_t);
+	CONF_SECTION			*conf = mctx->mi->conf;
 	memcached_return_t		ret;
 	char				buffer[256];
-	rlm_cache_config_t const	*config = talloc_get_type_abort(mctx->inst->parent->data, rlm_cache_config_t);
+	rlm_cache_config_t const	*config = talloc_get_type_abort(mctx->mi->parent->data, rlm_cache_config_t);
 
 	fr_assert(config);
 
-	snprintf(buffer, sizeof(buffer), "rlm_cache (%s)", mctx->inst->parent->name);
+	snprintf(buffer, sizeof(buffer), "rlm_cache (%s)", mctx->mi->parent->name);
 
 	ret = libmemcached_check_configuration(driver->options, talloc_array_length(driver->options) -1,
 					       buffer, sizeof(buffer));
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
index 4838e824d1..0ac8522834 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
@@ -69,7 +69,7 @@ static int8_t cache_heap_cmp(void const *one, void const *two)
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_cache_rbtree_t *driver = talloc_get_type_abort(mctx->inst->data, rlm_cache_rbtree_t);
+	rlm_cache_rbtree_t *driver = talloc_get_type_abort(mctx->mi->data, rlm_cache_rbtree_t);
 
 	if (driver->cache) {
 		fr_rb_iter_inorder_t	iter;
@@ -97,7 +97,7 @@ static int mod_detach(module_detach_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_cache_rbtree_t *driver = talloc_get_type_abort(mctx->inst->data, rlm_cache_rbtree_t);
+	rlm_cache_rbtree_t *driver = talloc_get_type_abort(mctx->mi->data, rlm_cache_rbtree_t);
 	int ret;
 
 	/*
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
index 2c1d63e162..d5ad02d987 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
@@ -72,17 +72,17 @@ fr_dict_attr_autoload_t rlm_cache_redis_dict_attr[] = {
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_cache_redis_t		*driver = talloc_get_type_abort(mctx->inst->data, rlm_cache_redis_t);
+	rlm_cache_redis_t		*driver = talloc_get_type_abort(mctx->mi->data, rlm_cache_redis_t);
 	char				buffer[256];
 
 	buffer[0] = '\0';
 
-	if (cf_section_rules_push(mctx->inst->conf, driver_config) < 0) return -1;
-	if (cf_section_parse(driver, driver, mctx->inst->conf) < 0) return -1;
+	if (cf_section_rules_push(mctx->mi->conf, driver_config) < 0) return -1;
+	if (cf_section_parse(driver, driver, mctx->mi->conf) < 0) return -1;
 
-	snprintf(buffer, sizeof(buffer), "rlm_cache (%s)", mctx->inst->parent->name);
+	snprintf(buffer, sizeof(buffer), "rlm_cache (%s)", mctx->mi->parent->name);
 
-	driver->cluster = fr_redis_cluster_alloc(driver, mctx->inst->conf, &driver->conf, true,
+	driver->cluster = fr_redis_cluster_alloc(driver, mctx->mi->conf, &driver->conf, true,
 						 buffer, "modules.cache.pool", NULL);
 	if (!driver->cluster) {
 		ERROR("Cluster failure");
diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 2b41615425..ae92fe2770 100644
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module_rlm.h>
@@ -606,7 +606,7 @@ static unlang_action_t cache_set_ttl(rlm_rcode_t *p_result,
 static unlang_action_t CC_HINT(nonnull) mod_cache_it(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
 	rlm_cache_entry_t	*c = NULL;
-	rlm_cache_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_cache_t);
+	rlm_cache_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_cache_t);
 	cache_call_env_t	*env = talloc_get_type_abort(mctx->env_data, cache_call_env_t);
 
 	rlm_cache_handle_t	*handle;
@@ -876,7 +876,7 @@ xlat_action_t cache_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			 request_t *request, fr_value_box_list_t *in)
 {
 	rlm_cache_entry_t 		*c = NULL;
-	rlm_cache_t			*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_cache_t);
+	rlm_cache_t			*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_cache_t);
 	cache_call_env_t		*env = talloc_get_type_abort(xctx->env_data, cache_call_env_t);
 	rlm_cache_handle_t		*handle = NULL;
 
@@ -949,7 +949,7 @@ static xlat_action_t cache_ttl_get_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 {
 
 	rlm_cache_entry_t	*c = NULL;
-	rlm_cache_t		*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_cache_t);
+	rlm_cache_t		*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_cache_t);
 	cache_call_env_t	*env = talloc_get_type_abort(xctx->env_data, cache_call_env_t);
 	rlm_cache_handle_t	*handle = NULL;
 
@@ -1029,7 +1029,7 @@ static void cache_unref(request_t *request, rlm_cache_t const *inst, rlm_cache_e
  */
 static unlang_action_t CC_HINT(nonnull) mod_method_status(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t);
+	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t);
 	cache_call_env_t	*env = talloc_get_type_abort(mctx->env_data, cache_call_env_t);
 	rlm_rcode_t		rcode = RLM_MODULE_NOOP;
 	rlm_cache_entry_t 	*entry = NULL;
@@ -1067,7 +1067,7 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_method_load(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t);
+	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t);
 	cache_call_env_t	*env = talloc_get_type_abort(mctx->env_data, cache_call_env_t);
 	rlm_rcode_t		rcode = RLM_MODULE_NOOP;
 	rlm_cache_entry_t 	*entry = NULL;
@@ -1109,7 +1109,7 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_method_update(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t);
+	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t);
 	cache_call_env_t	*env = talloc_get_type_abort(mctx->env_data, cache_call_env_t);
 	rlm_rcode_t		rcode = RLM_MODULE_NOOP;
 	fr_time_delta_t		ttl;
@@ -1197,7 +1197,7 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_method_store(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t);
+	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t);
 	cache_call_env_t	*env = talloc_get_type_abort(mctx->env_data, cache_call_env_t);
 	rlm_rcode_t		rcode = RLM_MODULE_NOOP;
 	fr_time_delta_t		ttl;
@@ -1264,13 +1264,13 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_method_clear(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t);
+	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t);
 	cache_call_env_t	*env = talloc_get_type_abort(mctx->env_data, cache_call_env_t);
 	rlm_rcode_t		rcode = RLM_MODULE_NOOP;
 	rlm_cache_entry_t 	*entry = NULL;
 	rlm_cache_handle_t 	*handle = NULL;
 
-	DEBUG3("Calling %s.clear", mctx->inst->name);
+	DEBUG3("Calling %s.clear", mctx->mi->name);
 
 	if (env->key->vb_length == 0) {
 		REDEBUG("Zero length key string is invalid");
@@ -1308,7 +1308,7 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_method_ttl(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t);
+	rlm_cache_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t);
 	cache_call_env_t	*env = talloc_get_type_abort(mctx->env_data, cache_call_env_t);
 	rlm_rcode_t		rcode = RLM_MODULE_NOOP;
 	fr_time_delta_t		ttl;
@@ -1316,7 +1316,7 @@ static unlang_action_t CC_HINT(nonnull) mod_method_ttl(rlm_rcode_t *p_result, mo
 	rlm_cache_handle_t 	*handle = NULL;
 	fr_pair_t		*vp;
 
-	DEBUG3("Calling %s.ttl", mctx->inst->name);
+	DEBUG3("Calling %s.ttl", mctx->mi->name);
 
 	if (env->key->vb_length == 0) {
 		REDEBUG("Zero length key string is invalid");
@@ -1372,7 +1372,7 @@ finish:
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_cache_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t);
+	rlm_cache_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t);
 
 	/*
 	 *	We need to explicitly free all children, so if the driver
@@ -1438,8 +1438,8 @@ static int cache_update_section_parse(TALLOC_CTX *ctx, call_env_parsed_head_t *o
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_cache_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_cache_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	if (!fr_time_delta_ispos(inst->config.ttl)) {
 		cf_log_err(conf, "Must set 'ttl' to non-zero");
@@ -1459,7 +1459,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_cache_t 	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cache_t );
+	rlm_cache_t 	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t );
 	xlat_t		*xlat;
 
 	inst->driver = (rlm_cache_driver_t const *)inst->driver_submodule->module->exported;
diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index 166437cc2a..8be472e10b 100644
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/password.h>
@@ -141,7 +141,7 @@ static xlat_action_t xlat_func_chap_password(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	     xlat_ctx_t const *xctx,
 					     request_t *request, fr_value_box_list_t *in)
 {
-	rlm_chap_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_chap_t);
+	rlm_chap_t const	*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_chap_t);
 	uint8_t			chap_password[1 + FR_CHAP_CHALLENGE_LENGTH];
 	fr_value_box_t		*vb;
 	uint8_t	const		*challenge;
@@ -176,11 +176,11 @@ static xlat_action_t xlat_func_chap_password(TALLOC_CTX *ctx, fr_dcursor_t *out,
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
 	fr_pair_t		*vp;
-	rlm_chap_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_chap_t);
+	rlm_chap_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_chap_t);
 	chap_autz_call_env_t	*env_data = talloc_get_type_abort(mctx->env_data, chap_autz_call_env_t);
 
 	if (fr_pair_find_by_da(&request->control_pairs, NULL, attr_auth_type) != NULL) {
-		RDEBUG3("Auth-Type is already set.  Not setting 'Auth-Type := %s'", mctx->inst->name);
+		RDEBUG3("Auth-Type is already set.  Not setting 'Auth-Type := %s'", mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -208,7 +208,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 
 	if (!inst->auth_type) {
 		WARN("No 'authenticate %s {...}' section or 'Auth-Type = %s' set.  Cannot setup CHAP authentication",
-		     mctx->inst->name, mctx->inst->name);
+		     mctx->mi->name, mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -227,7 +227,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
  */
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_chap_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_chap_t);
+	rlm_chap_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_chap_t);
 	fr_pair_t		*known_good;
 	uint8_t			pass_str[1 + FR_CHAP_CHALLENGE_LENGTH];
 	chap_auth_call_env_t	*env_data = talloc_get_type_abort(mctx->env_data, chap_auth_call_env_t);
@@ -346,12 +346,12 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_chap_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_chap_t);
+	rlm_chap_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_chap_t);
 
-	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->inst->name, -1);
+	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->mi->name, -1);
 	if (!inst->auth_type) {
 		WARN("Failed to find 'authenticate %s {...}' section.  CHAP authentication will likely not work",
-		     mctx->inst->name);
+		     mctx->mi->name);
 	}
 
 	return 0;
diff --git a/src/modules/rlm_cipher/rlm_cipher.c b/src/modules/rlm_cipher/rlm_cipher.c
index 4fa8e1c270..6268ad5efa 100644
--- a/src/modules/rlm_cipher/rlm_cipher.c
+++ b/src/modules/rlm_cipher/rlm_cipher.c
@@ -646,7 +646,7 @@ static xlat_action_t cipher_rsa_sign_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					  xlat_ctx_t const *xctx,
 					  request_t *request, fr_value_box_list_t *in)
 {
-	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
+	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_cipher_t);
 	rlm_cipher_rsa_thread_inst_t	*t = talloc_get_type_abort(xctx->mctx->thread, rlm_cipher_rsa_thread_inst_t);
 
 	char const			*msg;
@@ -786,7 +786,7 @@ static xlat_action_t cipher_rsa_verify_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	    xlat_ctx_t const *xctx,
 					    request_t *request, fr_value_box_list_t *in)
 {
-	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
+	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_cipher_t);
 	rlm_cipher_rsa_thread_inst_t	*t = talloc_get_type_abort(xctx->mctx->thread, rlm_cipher_rsa_thread_inst_t);
 
 	uint8_t	const			*sig;
@@ -898,7 +898,7 @@ static xlat_action_t cipher_fingerprint_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	     xlat_ctx_t const *xctx,
 					     request_t *request, fr_value_box_list_t *in)
 {
-	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
+	rlm_cipher_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_cipher_t);
 	char const			*md_name;
 	EVP_MD const			*md;
 	size_t				md_len;
@@ -947,7 +947,7 @@ static xlat_action_t cipher_serial_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	xlat_ctx_t const *xctx,
 					request_t *request, UNUSED fr_value_box_list_t *in)
 {
-	rlm_cipher_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
+	rlm_cipher_t const	*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_cipher_t);
 	ASN1_INTEGER const	*serial;
     	fr_value_box_t		*vb;
 
@@ -969,7 +969,7 @@ static xlat_action_t cipher_certificate_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 	     xlat_ctx_t const *xctx,
 					     request_t *request, fr_value_box_list_t *in)
 {
-	rlm_cipher_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_cipher_t);
+	rlm_cipher_t const	*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_cipher_t);
 	char const		*attribute = fr_value_box_list_head(in)->vb_strvalue;
     	fr_value_box_t		*vb;
 
@@ -1095,7 +1095,7 @@ static int cipher_rsa_padding_params_set(EVP_PKEY_CTX *evp_pkey_ctx, cipher_rsa_
  */
 static int cipher_rsa_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_cipher_t const		*inst = talloc_get_type_abort(mctx->inst->data, rlm_cipher_t);
+	rlm_cipher_t const		*inst = talloc_get_type_abort(mctx->mi->data, rlm_cipher_t);
 	rlm_cipher_rsa_thread_inst_t	*ti = talloc_get_type_abort(mctx->thread, rlm_cipher_rsa_thread_inst_t);
 
 	/*
@@ -1255,7 +1255,7 @@ static int cipher_rsa_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_cipher_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cipher_t);
+	rlm_cipher_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cipher_t);
 
 	switch (inst->type) {
 	case RLM_CIPHER_TYPE_RSA:
@@ -1277,8 +1277,8 @@ static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_cipher_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_cipher_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_cipher_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_cipher_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	switch (inst->type) {
 	case RLM_CIPHER_TYPE_RSA:
diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index e2008e764a..76ef5913d7 100644
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -98,7 +98,7 @@ fr_dict_attr_autoload_t rlm_couchbase_dict_attr[] = {
  */
 static unlang_action_t mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_couchbase_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_couchbase_t);		/* our module instance */
+	rlm_couchbase_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_couchbase_t);		/* our module instance */
 	rlm_couchbase_handle_t	*handle = NULL;			/* connection pool handle */
 	char			buffer[MAX_KEY_SIZE];
 	char const		*dockey;			/* our document key */
@@ -232,7 +232,7 @@ finish:
  */
 static unlang_action_t mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_couchbase_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_couchbase_t);       /* our module instance */
+	rlm_couchbase_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_couchbase_t);       /* our module instance */
 	rlm_couchbase_handle_t *handle = NULL;  /* connection pool handle */
 	rlm_rcode_t rcode = RLM_MODULE_OK;      /* return code */
 	fr_pair_t *vp;                         /* radius value pair linked list */
@@ -423,7 +423,7 @@ finish:
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_couchbase_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_couchbase_t);
+	rlm_couchbase_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_couchbase_t);
 
 	if (inst->map) json_object_put(inst->map);
 	if (inst->pool) fr_pool_free(inst->pool);
@@ -443,8 +443,8 @@ static int mod_detach(module_detach_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_couchbase_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_couchbase_t);   /* our module instance */
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_couchbase_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_couchbase_t);   /* our module instance */
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	{
 		char *server, *p;
diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c
index 063ba4291c..b3221eba1e 100644
--- a/src/modules/rlm_csv/rlm_csv.c
+++ b/src/modules/rlm_csv/rlm_csv.c
@@ -514,8 +514,8 @@ static int csv_maps_verify(CONF_SECTION *cs, void *mod_inst, UNUSED void *proc_i
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_csv_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_csv_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_csv_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_csv_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 	int		i;
 	char const	*p;
 	char		*q;
@@ -737,7 +737,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	And register the `map csv <key> { ... }` function.
 	 */
-	map_proc_register(inst, mctx->inst->name, mod_map_proc, csv_maps_verify, 0, 0);
+	map_proc_register(inst, mctx->mi->name, mod_map_proc, csv_maps_verify, 0, 0);
 
 	return 0;
 }
@@ -753,8 +753,8 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_csv_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_csv_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_csv_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_csv_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 	CONF_SECTION	*cs;
 	int		lineno;
 	FILE		*fp;
@@ -1002,7 +1002,7 @@ static unlang_action_t mod_map_proc(rlm_rcode_t *p_result, void *mod_inst, UNUSE
 
 static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_csv_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_csv_t);
+	rlm_csv_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_csv_t);
 	rlm_rcode_t rcode;
 	ssize_t slen;
 	fr_value_box_t *key;
diff --git a/src/modules/rlm_date/rlm_date.c b/src/modules/rlm_date/rlm_date.c
index 3cca93ac6b..38a2395075 100644
--- a/src/modules/rlm_date/rlm_date.c
+++ b/src/modules/rlm_date/rlm_date.c
@@ -170,7 +170,7 @@ static xlat_action_t xlat_date_convert(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				       xlat_ctx_t const *xctx,
 				       request_t *request, fr_value_box_list_t *in)
 {
-	rlm_date_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_date_t);
+	rlm_date_t const	*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_date_t);
 	struct tm 		tminfo;
 	fr_value_box_t		*arg = fr_value_box_list_head(in);
 
@@ -232,7 +232,7 @@ static xlat_action_t xlat_date_convert(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_date_t 	*inst = talloc_get_type_abort(mctx->inst->data, rlm_date_t );
+	rlm_date_t 	*inst = talloc_get_type_abort(mctx->mi->data, rlm_date_t );
 	xlat_t 		*xlat;
 
 	xlat = xlat_func_register_module(inst, mctx, NULL, xlat_date_convert, FR_TYPE_VOID);
diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c
index 1025165c01..8cacbc4dec 100644
--- a/src/modules/rlm_delay/rlm_delay.c
+++ b/src/modules/rlm_delay/rlm_delay.c
@@ -137,7 +137,7 @@ static void mod_delay_cancel(module_ctx_t const *mctx, request_t *request, UNUSE
 
 static unlang_action_t CC_HINT(nonnull) mod_delay(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_delay_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_delay_t);
+	rlm_delay_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_delay_t);
 	fr_time_delta_t		delay;
 	fr_time_t		resume_at, *yielded_at;
 
@@ -220,7 +220,7 @@ static xlat_action_t xlat_delay(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out
 				xlat_ctx_t const *xctx,
 				request_t *request, fr_value_box_list_t *in)
 {
-	rlm_delay_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_delay_t);
+	rlm_delay_t const	*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_delay_t);
 	fr_time_t		resume_at, *yielded_at;
 	fr_value_box_t		*delay = fr_value_box_list_head(in);
 
@@ -262,7 +262,7 @@ yield:
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_delay_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_delay_t);
+	rlm_delay_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_delay_t);
 	xlat_t		*xlat;
 
 	xlat = xlat_func_register_module(inst, mctx, NULL, xlat_delay, FR_TYPE_TIME_DELTA);
diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index 0c39266cde..4fce50280f 100644
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -180,8 +180,8 @@ static int8_t detail_cmp(void const *a, void const *b)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_detail_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_detail_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_detail_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_detail_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	inst->ef = module_rlm_exfile_init(inst, conf, 256, fr_time_delta_from_sec(30), inst->locking, NULL, NULL);
 	if (!inst->ef) {
@@ -328,7 +328,7 @@ static unlang_action_t CC_HINT(nonnull) detail_do(rlm_rcode_t *p_result, module_
 	int			outfd, dupfd;
 	FILE			*outfp = NULL;
 
-	rlm_detail_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_detail_t);
+	rlm_detail_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_detail_t);
 
 	RDEBUG2("%s expands to %pV", env->filename_tmpl->name, &env->filename);
 
diff --git a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
index 3be14b8649..8b1dc2fd43 100644
--- a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
+++ b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
@@ -111,8 +111,8 @@ static const conf_parser_t module_config[] = {
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_dhcpv4_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_dhcpv4_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_dhcpv4_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_dhcpv4_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	/*
 	 *	Ensure that we have a destination address.
@@ -160,9 +160,9 @@ static void dhcpv4_queue_resume(bool sent, void *rctx)
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_dhcpv4_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_dhcpv4_t);
+	rlm_dhcpv4_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_dhcpv4_t);
 	rlm_dhcpv4_thread_t 	*t = talloc_get_type_abort(mctx->thread, rlm_dhcpv4_thread_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	t->buffer = talloc_array(t, uint8_t, inst->max_packet_size);
 	if (!t->buffer) {
diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c
index f6548a1d77..cc714a3180 100644
--- a/src/modules/rlm_digest/rlm_digest.c
+++ b/src/modules/rlm_digest/rlm_digest.c
@@ -85,7 +85,7 @@ fr_dict_attr_autoload_t rlm_digest_dict_attr[] = {
 
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_digest_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_digest_t);
+	rlm_digest_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_digest_t);
 	fr_pair_t		*vp;
 
 	/*
@@ -96,7 +96,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 
 	if (!inst->auth_type) {
 		WARN("No 'authenticate %s {...}' section or 'Auth-Type = %s' set.  Cannot setup Digest authentication",
-		     mctx->inst->name, mctx->inst->name);
+		     mctx->mi->name, mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -452,12 +452,12 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_digest_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_digest_t);
+	rlm_digest_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_digest_t);
 
-	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->inst->name, -1);
+	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->mi->name, -1);
 	if (!inst->auth_type) {
 		WARN("Failed to find 'authenticate %s {...}' section.  Digest authentication will likely not work",
-		     mctx->inst->name);
+		     mctx->mi->name);
 	}
 
 	return 0;
diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index 3775f0aa68..b897526f40 100644
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module_rlm.h>
@@ -231,7 +231,7 @@ static eap_type_t eap_process_nak(module_ctx_t const *mctx, request_t *request,
 				  eap_type_t last_type,
 				  eap_type_data_t *nak)
 {
-	rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t);
+	rlm_eap_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_eap_t);
 	unsigned int i, s_i = 0;
 	fr_pair_t *vp = NULL;
 	eap_type_t method = FR_EAP_METHOD_INVALID;
@@ -572,7 +572,7 @@ static ssize_t eap_identity_is_nai_with_realm(char const *identity)
  */
 static unlang_action_t eap_method_select(rlm_rcode_t *p_result, module_ctx_t const *mctx, eap_session_t *eap_session)
 {
-	rlm_eap_t const			*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t);
+	rlm_eap_t const			*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_eap_t);
 	eap_type_data_t			*type = &eap_session->this_round->response->type;
 	request_t			*request = eap_session->request;
 
@@ -855,7 +855,7 @@ static unlang_action_t eap_method_select(rlm_rcode_t *p_result, module_ctx_t con
 
 static unlang_action_t mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t);
+	rlm_eap_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_eap_t);
 	eap_session_t		*eap_session;
 	eap_packet_raw_t	*eap_packet;
 	unlang_action_t		ua;
@@ -920,7 +920,7 @@ static unlang_action_t mod_authenticate(rlm_rcode_t *p_result, module_ctx_t cons
  */
 static unlang_action_t mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_t);
+	rlm_eap_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_eap_t);
 	int			status;
 
 #ifdef WITH_PROXY
@@ -934,7 +934,7 @@ static unlang_action_t mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *
 
 	if (!inst->auth_type) {
 		WARN("No 'authenticate %s {...}' section or 'Auth-Type = %s' set.  Cannot setup EAP authentication",
-		     mctx->inst->name, mctx->inst->name);
+		     mctx->mi->name, mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -1036,7 +1036,7 @@ static unlang_action_t mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *
 	 *	Was *NOT* an EAP-Failure, so we now need to turn it into one.
 	 */
 	REDEBUG("Request rejected after last call to module \"%s\", transforming response into EAP-Failure",
-		mctx->inst->name);
+		mctx->mi->name);
 	eap_fail(eap_session);				/* Compose an EAP failure */
 	eap_session_destroy(&eap_session);		/* Free the EAP session, and dissociate it from the request */
 
@@ -1052,13 +1052,13 @@ static unlang_action_t mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_eap_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_t);
+	rlm_eap_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_t);
 	size_t		i;
 
-	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->inst->name, -1);
+	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->mi->name, -1);
 	if (!inst->auth_type) {
 		WARN("Failed to find 'authenticate %s {...}' section.  EAP authentication will likely not work",
-		     mctx->inst->name);
+		     mctx->mi->name);
 	}
 
 	/*
@@ -1073,7 +1073,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_eap_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_t);
+	rlm_eap_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_t);
 	size_t		i, j, loaded, count = 0;
 
 	/*
@@ -1154,13 +1154,13 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	 *	allowed by the config.
 	 */
 	if (inst->default_method_is_set && !inst->methods[inst->default_method].submodule) {
-		cf_log_err_by_child(mctx->inst->conf, "default_eap_type", "EAP-Type \"%s\" is not enabled",
+		cf_log_err_by_child(mctx->mi->conf, "default_eap_type", "EAP-Type \"%s\" is not enabled",
 				    eap_type2name(inst->default_method));
 		return -1;
 	}
 
 	if (count == 0) {
-		cf_log_err(mctx->inst->conf, "No EAP method(s) configured, module cannot do anything");
+		cf_log_err(mctx->mi->conf, "No EAP method(s) configured, module cannot do anything");
 		return -1;
 	}
 
diff --git a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
index 2c7f3bdec5..e0bf27f2f3 100644
--- a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
+++ b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
@@ -61,8 +61,8 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_module_conf_t);
-	CONF_SECTION			*conf = mctx->inst->conf;
+	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_module_conf_t);
+	CONF_SECTION			*conf = mctx->mi->conf;
 
 	inst->type = rlm_eap_aka.provides[0];
 
diff --git a/src/modules/rlm_eap/types/rlm_eap_aka_prime/rlm_eap_aka_prime.c b/src/modules/rlm_eap/types/rlm_eap_aka_prime/rlm_eap_aka_prime.c
index 93fb9154f1..85b5a3e383 100644
--- a/src/modules/rlm_eap/types/rlm_eap_aka_prime/rlm_eap_aka_prime.c
+++ b/src/modules/rlm_eap/types/rlm_eap_aka_prime/rlm_eap_aka_prime.c
@@ -60,7 +60,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_module_conf_t);
+	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_module_conf_t);
 
 	inst->type = rlm_eap_aka_prime.provides[0];
 
diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
index 54fc2fc14b..40ae6b98ea 100644
--- a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
@@ -524,7 +524,7 @@ static unlang_action_t mod_handshake_process(UNUSED rlm_rcode_t *p_result, UNUSE
  */
 static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_fast_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_eap_fast_t);
+	rlm_eap_fast_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_eap_fast_t);
 	rlm_eap_fast_thread_t	*thread = talloc_get_type_abort(mctx->thread, rlm_eap_fast_thread_t);
 	eap_session_t		*eap_session = eap_session_get(request->parent);
 	eap_tls_session_t 	*eap_tls_session;
@@ -602,7 +602,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_eap_fast_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_fast_t);
+	rlm_eap_fast_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_fast_t);
 	rlm_eap_fast_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_eap_fast_thread_t);
 
 	t->ssl_ctx = fr_tls_ctx_alloc(inst->tls_conf, false);
@@ -626,11 +626,11 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_eap_fast_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_fast_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_eap_fast_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_fast_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	if (!virtual_server_find(inst->virtual_server)) {
-		cf_log_err_by_child(mctx->inst->conf, "virtual_server", "Unknown virtual server '%s'",
+		cf_log_err_by_child(mctx->mi->conf, "virtual_server", "Unknown virtual server '%s'",
 				    inst->virtual_server);
 		return -1;
 	}
diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index 27661cb13a..ac51afa4f7 100644
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -122,7 +122,7 @@ static unlang_action_t gtc_resume(rlm_rcode_t *p_result, module_ctx_t const *mct
  */
 static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_gtc_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_gtc_t);
+	rlm_eap_gtc_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_gtc_t);
 
 	eap_session_t		*eap_session = eap_session_get(request->parent);
 	eap_round_t		*eap_round = eap_session->this_round;
@@ -184,7 +184,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 	char		challenge_str[1024];
 	int		length;
 	eap_round_t	*eap_round = eap_session->this_round;
-	rlm_eap_gtc_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_gtc_t);
+	rlm_eap_gtc_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_gtc_t);
 
 	if (xlat_eval(challenge_str, sizeof(challenge_str), request, inst->challenge, NULL, NULL) < 0) {
 		RETURN_MODULE_FAIL;
diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index 3560c03407..04f67c76fb 100644
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -282,7 +282,7 @@ static unlang_action_t mschap_resume(rlm_rcode_t *p_result, module_ctx_t const *
 	mschapv2_opaque_t		*data = talloc_get_type_abort(eap_session->opaque, mschapv2_opaque_t);
 	eap_round_t			*eap_round = eap_session->this_round;
 	fr_pair_list_t			response;
- 	rlm_eap_mschapv2_t const	*inst = mctx->inst->data;
+ 	rlm_eap_mschapv2_t const	*inst = mctx->mi->data;
 	rlm_rcode_t			rcode;
 	fr_pair_t *parent;
 
@@ -369,7 +369,7 @@ static unlang_action_t mschap_resume(rlm_rcode_t *p_result, module_ctx_t const *
  */
 static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_mschapv2_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_mschapv2_t);
+	rlm_eap_mschapv2_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_mschapv2_t);
 	request_t			*parent = request->parent;
 	eap_session_t			*eap_session = eap_session_get(parent);
 	mschapv2_opaque_t		*data = talloc_get_type_abort(eap_session->opaque, mschapv2_opaque_t);
@@ -628,7 +628,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 	int			i;
 	bool			created_auth_challenge;
 
-	if (!fr_cond_assert(mctx->inst->data)) RETURN_MODULE_FAIL;
+	if (!fr_cond_assert(mctx->mi->data)) RETURN_MODULE_FAIL;
 
 	/*
 	 *	We're looking for attributes that should come
@@ -687,7 +687,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 	 *	Compose the EAP-MSCHAPV2 packet out of the data structure,
 	 *	and free it.
 	 */
-	eap_mschapv2_compose(mctx->inst->data, request, eap_session, auth_challenge);
+	eap_mschapv2_compose(mctx->mi->data, request, eap_session, auth_challenge);
 	if (created_auth_challenge) TALLOC_FREE(auth_challenge);
 
 	/*
@@ -707,10 +707,10 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_eap_mschapv2_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_mschapv2_t);
+	rlm_eap_mschapv2_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_mschapv2_t);
 
 	if (inst->identity && (strlen(inst->identity) > 255)) {
-		cf_log_err(mctx->inst->conf, "identity is too long");
+		cf_log_err(mctx->mi->conf, "identity is too long");
 		return -1;
 	}
 
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index d982f07c1c..14c42780af 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -116,7 +116,7 @@ static peap_tunnel_t *peap_alloc(TALLOC_CTX *ctx, rlm_eap_peap_t *inst)
 
 static unlang_action_t mod_handshake_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_peap_t		*inst = talloc_get_type(mctx->inst->data, rlm_eap_peap_t);
+	rlm_eap_peap_t		*inst = talloc_get_type(mctx->mi->data, rlm_eap_peap_t);
 
 	rlm_rcode_t		rcode;
 
@@ -272,7 +272,7 @@ static unlang_action_t mod_handshake_process(UNUSED rlm_rcode_t *p_result, UNUSE
  */
 static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_peap_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_peap_t);
+	rlm_eap_peap_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_peap_t);
 	rlm_eap_peap_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_eap_peap_thread_t);
 	eap_session_t		*eap_session = eap_session_get(request->parent);
 	eap_tls_session_t	*eap_tls_session;
@@ -339,7 +339,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_eap_peap_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_peap_t);
+	rlm_eap_peap_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_peap_t);
 	rlm_eap_peap_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_eap_peap_thread_t);
 
 	t->ssl_ctx = fr_tls_ctx_alloc(inst->tls_conf, false);
@@ -363,8 +363,8 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_eap_peap_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_peap_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_eap_peap_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_peap_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	if (!virtual_server_find(inst->virtual_server)) {
 		cf_log_err_by_child(conf, "virtual_server", "Unknown virtual server '%s'", inst->virtual_server);
diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index febcab0c3e..047a13e40e 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -154,7 +154,7 @@ static int send_pwd_request(request_t *request, pwd_session_t *session, eap_roun
 
 static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_pwd_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_pwd_t);
+	rlm_eap_pwd_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_pwd_t);
 	eap_session_t	*eap_session = eap_session_get(request->parent);
 
 	pwd_session_t	*session;
@@ -486,7 +486,7 @@ static int _free_pwd_session(pwd_session_t *session)
 
 static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_pwd_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_pwd_t);
+	rlm_eap_pwd_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_pwd_t);
 	eap_session_t		*eap_session = eap_session_get(request->parent);
 	pwd_session_t		*session;
 	fr_pair_t		*vp;
@@ -544,7 +544,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_eap_pwd_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_pwd_t);
+	rlm_eap_pwd_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_pwd_t);
 
 	if (inst->bnctx) BN_CTX_free(inst->bnctx);
 
@@ -553,8 +553,8 @@ static int mod_detach(module_detach_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_eap_pwd_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_pwd_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_eap_pwd_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_pwd_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	if (inst->fragment_size < 100) {
 		cf_log_err(conf, "Fragment size is too small");
diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
index 416d79551e..71bf0bb730 100644
--- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
@@ -59,7 +59,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_module_conf_t);
+	eap_aka_sim_module_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_module_conf_t);
 
 	inst->type = rlm_eap_sim.provides[0];
 
diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index 1586c6e222..2259cc5d2b 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -184,7 +184,7 @@ static unlang_action_t mod_handshake_process(UNUSED rlm_rcode_t *p_result, UNUSE
  */
 static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_tls_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_tls_t);
+	rlm_eap_tls_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_tls_t);
 	rlm_eap_tls_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_eap_tls_thread_t);
 	eap_session_t		*eap_session = eap_session_get(request->parent);
 	eap_tls_session_t	*eap_tls_session;
@@ -229,7 +229,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_eap_tls_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_tls_t);
+	rlm_eap_tls_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_tls_t);
 	rlm_eap_tls_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_eap_tls_thread_t);
 
 	t->ssl_ctx = fr_tls_ctx_alloc(inst->tls_conf, false);
@@ -253,8 +253,8 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_eap_tls_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_tls_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_eap_tls_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_tls_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	inst->tls_conf = eap_tls_conf_parse(conf, "tls");
 	if (!inst->tls_conf) {
diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
index 1bd95d5a2a..20f3e2dc63 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
@@ -285,7 +285,7 @@ static unlang_action_t mod_handshake_process(UNUSED rlm_rcode_t *p_result, UNUSE
  */
 static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_eap_ttls_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_ttls_t);
+	rlm_eap_ttls_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_ttls_t);
 	rlm_eap_ttls_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_eap_ttls_thread_t);
 	eap_session_t		*eap_session = eap_session_get(request->parent);
 
@@ -331,7 +331,7 @@ static unlang_action_t mod_session_init(rlm_rcode_t *p_result, module_ctx_t cons
 
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_eap_ttls_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_ttls_t);
+	rlm_eap_ttls_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_ttls_t);
 	rlm_eap_ttls_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_eap_ttls_thread_t);
 
 	t->ssl_ctx = fr_tls_ctx_alloc(inst->tls_conf, false);
@@ -355,8 +355,8 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_eap_ttls_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_eap_ttls_t);
-	CONF_SECTION 	*conf = mctx->inst->conf;
+	rlm_eap_ttls_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_eap_ttls_t);
+	CONF_SECTION 	*conf = mctx->mi->conf;
 
 	if (!virtual_server_find(inst->virtual_server)) {
 		cf_log_err_by_child(conf, "virtual_server", "Unknown virtual server '%s'", inst->virtual_server);
diff --git a/src/modules/rlm_escape/rlm_escape.c b/src/modules/rlm_escape/rlm_escape.c
index 7cf275974c..ec82daa984 100644
--- a/src/modules/rlm_escape/rlm_escape.c
+++ b/src/modules/rlm_escape/rlm_escape.c
@@ -65,7 +65,7 @@ static xlat_action_t escape_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				 xlat_ctx_t const *xctx,
 				 request_t *request, fr_value_box_list_t *in)
 {
-	rlm_escape_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_escape_t);
+	rlm_escape_t const	*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_escape_t);
 	fr_value_box_t		*arg = fr_value_box_list_head(in);
 	char const		*p = arg->vb_strvalue;
 	size_t			len;
diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index df686ac20d..bd52dc9838 100644
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <stdint.h>
 
@@ -138,7 +138,7 @@ static xlat_action_t exec_xlat_oneshot(TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out
 				       xlat_ctx_t const *xctx,
 				       request_t *request, fr_value_box_list_t *in)
 {
-	rlm_exec_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_exec_t);
+	rlm_exec_t const	*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_exec_t);
 	fr_pair_list_t		*env_pairs = NULL;
 	fr_exec_state_t		*exec;
 
@@ -240,7 +240,7 @@ static rlm_rcode_t rlm_exec_status2rcode(request_t *request, fr_value_box_t *box
 static unlang_action_t mod_exec_oneshot_nowait_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx,
 						      request_t *request)
 {
-	rlm_exec_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_exec_t);
+	rlm_exec_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_exec_t);
 	fr_value_box_list_t	*args = talloc_get_type_abort(mctx->rctx, fr_value_box_list_t);
 	fr_pair_list_t		*env_pairs = NULL;
 
@@ -282,7 +282,7 @@ static fr_sbuff_parse_rules_t const rhs_term = {
 static unlang_action_t mod_exec_oneshot_wait_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
 	int			status;
-	rlm_exec_t const       	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_exec_t);
+	rlm_exec_t const       	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_exec_t);
 	rlm_exec_ctx_t		*m = talloc_get_type_abort(mctx->rctx, rlm_exec_ctx_t);
 	rlm_rcode_t		rcode;
 
@@ -387,7 +387,7 @@ static unlang_action_t CC_HINT(nonnull) mod_exec_dispatch_oneshot(rlm_rcode_t *p
 	rlm_exec_ctx_t		*m;
 	fr_pair_list_t		*env_pairs = NULL;
 	TALLOC_CTX		*ctx;
-	rlm_exec_t const       	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_exec_t);
+	rlm_exec_t const       	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_exec_t);
 	exec_call_env_t		*env_data = talloc_get_type_abort(mctx->env_data, exec_call_env_t);
 
 	if (!env_data->program) {
@@ -454,8 +454,8 @@ static unlang_action_t CC_HINT(nonnull) mod_exec_dispatch_oneshot(rlm_rcode_t *p
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_exec_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_exec_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_exec_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_exec_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 	xlat_t		*xlat;
 
 	xlat = xlat_func_register_module(NULL, mctx, NULL, exec_xlat_oneshot, FR_TYPE_STRING);
diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index a22000bc83..bdc7379f8a 100644
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -609,7 +609,7 @@ static unlang_action_t CC_HINT(nonnull) mod_files(rlm_rcode_t *p_result, module_
 	rlm_files_env_t		*env = talloc_get_type_abort(mctx->env_data, rlm_files_env_t);
 
 	fr_value_box_list_init(&env->values);
-	env->name = mctx->inst->name;
+	env->name = mctx->mi->name;
 
 	/*
 	 *	Set mod_files_resume as the repeat function
diff --git a/src/modules/rlm_icmp/rlm_icmp.c b/src/modules/rlm_icmp/rlm_icmp.c
index 393b9b071b..282596b566 100644
--- a/src/modules/rlm_icmp/rlm_icmp.c
+++ b/src/modules/rlm_icmp/rlm_icmp.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module_rlm.h>
@@ -170,7 +170,7 @@ static xlat_action_t xlat_icmp(TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx,
 			       request_t *request, fr_value_box_list_t *in)
 {
-	rlm_icmp_t		*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_icmp_t);
+	rlm_icmp_t		*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_icmp_t);
 	rlm_icmp_thread_t	*t = talloc_get_type_abort(xctx->mctx->thread, rlm_icmp_thread_t);
 	rlm_icmp_echo_t		*echo;
 	icmp_header_t		icmp;
@@ -378,7 +378,7 @@ static void mod_icmp_error(fr_event_list_t *el, UNUSED int sockfd, UNUSED int fl
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
 	module_thread_inst_ctx_t	*our_mctx;
-	rlm_icmp_t			*inst = talloc_get_type_abort(mctx->inst->data, rlm_icmp_t);
+	rlm_icmp_t			*inst = talloc_get_type_abort(mctx->mi->data, rlm_icmp_t);
 	rlm_icmp_thread_t		*t = talloc_get_type_abort(mctx->thread, rlm_icmp_thread_t);
 	fr_ipaddr_t			ipaddr, *src;
 
@@ -493,7 +493,7 @@ static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_icmp_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_icmp_t);
+	rlm_icmp_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_icmp_t);
 	xlat_t		*xlat;
 
 	xlat = xlat_func_register_module(inst, mctx, NULL, xlat_icmp, FR_TYPE_BOOL);
diff --git a/src/modules/rlm_idn/rlm_idn.c b/src/modules/rlm_idn/rlm_idn.c
index ada9f2de91..15e6700972 100644
--- a/src/modules/rlm_idn/rlm_idn.c
+++ b/src/modules/rlm_idn/rlm_idn.c
@@ -104,7 +104,7 @@ static xlat_action_t xlat_idna(TALLOC_CTX *ctx, fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx,
 			       request_t *request, fr_value_box_list_t *in)
 {
-	rlm_idn_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_idn_t);
+	rlm_idn_t const	*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_idn_t);
 	char		*idna = NULL;
 	int		res;
 	size_t		len;
@@ -150,7 +150,7 @@ static xlat_action_t xlat_idna(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_idn_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_idn_t);
+	rlm_idn_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_idn_t);
 	xlat_t		*xlat;
 
 	xlat = xlat_func_register_module(inst, mctx, NULL, xlat_idna, FR_TYPE_STRING);
diff --git a/src/modules/rlm_imap/rlm_imap.c b/src/modules/rlm_imap/rlm_imap.c
index 159b513774..ccb123b52d 100644
--- a/src/modules/rlm_imap/rlm_imap.c
+++ b/src/modules/rlm_imap/rlm_imap.c
@@ -105,7 +105,7 @@ static void imap_io_module_signal(module_ctx_t const *mctx, request_t *request,
 static unlang_action_t CC_HINT(nonnull) mod_authenticate_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx,
 								request_t *request)
 {
-	rlm_imap_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_imap_t);
+	rlm_imap_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_imap_t);
 	fr_curl_io_request_t     	*randle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t);
 	fr_curl_tls_t const		*tls;
 	long 				curl_out;
@@ -242,7 +242,7 @@ static int imap_conn_alloc(fr_curl_io_request_t *randle, void *uctx)
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_imap_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_imap_t);
+	rlm_imap_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_imap_t);
 	rlm_imap_thread_t    	*t = talloc_get_type_abort(mctx->thread, rlm_imap_thread_t);
 	fr_curl_handle_t    	*mhandle;
 
diff --git a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
index a4c1b2f978..bd98b393be 100644
--- a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
+++ b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
@@ -2174,8 +2174,8 @@ static int read_file(rlm_isc_dhcp_t *inst, rlm_isc_dhcp_info_t *parent, char con
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_isc_dhcp_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_isc_dhcp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_isc_dhcp_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_isc_dhcp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	rlm_isc_dhcp_info_t	*info;
 	int			ret;
 
@@ -2205,7 +2205,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_isc_dhcp_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_isc_dhcp_t);
+	rlm_isc_dhcp_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_isc_dhcp_t);
 	int			ret;
 
 	ret = apply_fixed_ip(inst, request);
@@ -2219,7 +2219,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 
 static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_isc_dhcp_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_isc_dhcp_t);
+	rlm_isc_dhcp_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_isc_dhcp_t);
 	int			ret;
 
 	ret = apply(inst, request, inst->head);
diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index a5077140e5..53b00db25f 100644
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -208,7 +208,7 @@ static xlat_action_t json_encode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
 				      request_t *request, fr_value_box_list_t *in)
 {
-	rlm_json_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_json_t);
+	rlm_json_t const	*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_json_t);
 	fr_json_format_t const	*format = inst->format;
 
 	ssize_t			slen;
@@ -555,8 +555,8 @@ finish:
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_json_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_json_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_json_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_json_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	xlat_t			*xlat;
 	fr_json_format_t	*format = inst->format;
 
diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c
index d8ae10906d..bd8e8ee3c1 100644
--- a/src/modules/rlm_krb5/rlm_krb5.c
+++ b/src/modules/rlm_krb5/rlm_krb5.c
@@ -59,7 +59,7 @@ fr_dict_attr_autoload_t rlm_krb5_dict_attr[] = {
 
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_krb5_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_krb5_t);
+	rlm_krb5_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_krb5_t);
 
 #ifndef HEIMDAL_KRB5
 	talloc_free(inst->vic_options);
@@ -81,7 +81,7 @@ static int mod_detach(module_detach_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_krb5_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_krb5_t);
+	rlm_krb5_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_krb5_t);
 	krb5_error_code ret;
 #ifndef HEIMDAL_KRB5
 	krb5_keytab keytab;
@@ -222,7 +222,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 	/*
 	 *	Initialize the socket pool.
 	 */
-	inst->pool = module_rlm_connection_pool_init(mctx->inst->conf, inst, krb5_mod_conn_create, NULL, NULL, NULL, NULL);
+	inst->pool = module_rlm_connection_pool_init(mctx->mi->conf, inst, krb5_mod_conn_create, NULL, NULL, NULL, NULL);
 	if (!inst->pool) return -1;
 #else
 	inst->conn = krb5_mod_conn_create(inst, inst, fr_time_delta_wrap(0));
@@ -317,7 +317,7 @@ static rlm_rcode_t krb5_process_error(rlm_krb5_t const *inst, request_t *request
  */
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_krb5_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_krb5_t);
+	rlm_krb5_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_krb5_t);
 	rlm_rcode_t		rcode;
 	krb5_error_code		ret;
 	rlm_krb5_handle_t	*conn;
@@ -408,7 +408,7 @@ cleanup:
  */
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_krb5_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_krb5_t);
+	rlm_krb5_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_krb5_t);
 	rlm_rcode_t		rcode;
 	krb5_error_code		ret;
 
diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index fc789e2174..ee47a92f80 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -889,7 +889,7 @@ static xlat_action_t ldap_memberof_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat
 	 				request_t *request, fr_value_box_list_t *in)
 {
 	fr_value_box_t			*vb = NULL, *group_vb = fr_value_box_list_pop_head(in);
-	rlm_ldap_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_ldap_t);
 	fr_ldap_thread_t		*t = talloc_get_type_abort(xctx->mctx->thread, fr_ldap_thread_t);
 	ldap_xlat_memberof_call_env_t	*env_data = talloc_get_type_abort(xctx->env_data, ldap_xlat_memberof_call_env_t);
 	bool				group_is_dn;
@@ -1015,7 +1015,7 @@ static xlat_action_t ldap_profile_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor
 				       xlat_ctx_t const *xctx,
 				       request_t *request, fr_value_box_list_t *in)
 {
-	rlm_ldap_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_ldap_t);
 	fr_ldap_thread_t		*t = talloc_get_type_abort(xctx->mctx->thread, fr_ldap_thread_t);
 	ldap_xlat_profile_call_env_t	*env_data = talloc_get_type_abort(xctx->env_data, ldap_xlat_profile_call_env_t);
 	fr_value_box_t			*uri_components, *uri;
@@ -1422,7 +1422,7 @@ static unlang_action_t mod_authenticate_resume(rlm_rcode_t *p_result, UNUSED int
 
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_ldap_t const 	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t const 	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_ldap_t);
 	fr_ldap_thread_t	*thread = talloc_get_type_abort(module_rlm_thread_by_data(inst)->data, fr_ldap_thread_t);
 	ldap_auth_ctx_t		*auth_ctx;
 	ldap_auth_call_env_t	*call_env = talloc_get_type_abort(mctx->env_data, ldap_auth_call_env_t);
@@ -1802,7 +1802,7 @@ static int autz_ctx_free(ldap_autz_ctx_t *autz_ctx)
 
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_ldap_t const 	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t const 	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_ldap_t);
 	fr_ldap_thread_t	*thread = talloc_get_type_abort(module_rlm_thread_by_data(inst)->data, fr_ldap_thread_t);
 	ldap_autz_ctx_t		*autz_ctx;
 	fr_ldap_map_exp_t	*expanded;
@@ -1853,7 +1853,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 	}
 	expanded->attrs[expanded->count] = NULL;
 
-	autz_ctx->dlinst = mctx->inst;
+	autz_ctx->dlinst = mctx->mi;
 	autz_ctx->inst = inst;
 	autz_ctx->call_env = call_env;
 	autz_ctx->status = LDAP_AUTZ_FIND;
@@ -2153,7 +2153,7 @@ error:
 
 static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_ldap_t);
 	ldap_usermod_call_env_t	*call_env = talloc_get_type_abort(mctx->env_data, ldap_usermod_call_env_t);
 
 	if (inst->accounting) return user_modify(p_result, inst, request, inst->accounting, call_env);
@@ -2163,7 +2163,7 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo
 
 static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_ldap_t);
 	ldap_usermod_call_env_t	*call_env = talloc_get_type_abort(mctx->env_data, ldap_usermod_call_env_t);
 
 	if (inst->postauth) return user_modify(p_result, inst, request, inst->postauth, call_env);
@@ -2177,7 +2177,7 @@ static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, mod
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_ldap_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_ldap_t);
 
 	if (inst->user.obj_sort_ctrl) ldap_control_free(inst->user.obj_sort_ctrl);
 
@@ -2200,7 +2200,7 @@ static int parse_sub_section(module_inst_ctx_t const *mctx,
 			     CONF_SECTION *parent, ldap_acct_section_t **config,
 			     rlm_components_t comp)
 {
-	rlm_ldap_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_ldap_t);
 	CONF_SECTION 	*cs;
 
 	char const *name = section_type_value[comp];
@@ -2208,7 +2208,7 @@ static int parse_sub_section(module_inst_ctx_t const *mctx,
 	cs = cf_section_find(parent, name, NULL);
 	if (!cs) {
 		DEBUG2("rlm_ldap (%s) - Couldn't find configuration for %s, will return NOOP for calls "
-		       "from this section", mctx->inst->name, name);
+		       "from this section", mctx->mi->name, name);
 
 		return 0;
 	}
@@ -2217,7 +2217,7 @@ static int parse_sub_section(module_inst_ctx_t const *mctx,
 
 	*config = talloc_zero(inst, ldap_acct_section_t);
 	if (cf_section_parse(*config, *config, cs) < 0) {
-		PERROR("rlm_ldap (%s) - Failed parsing configuration for section %s", mctx->inst->name, name);
+		PERROR("rlm_ldap (%s) - Failed parsing configuration for section %s", mctx->mi->name, name);
 
 		return -1;
 	}
@@ -2232,7 +2232,7 @@ static int parse_sub_section(module_inst_ctx_t const *mctx,
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_ldap_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_ldap_t);
+	rlm_ldap_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_ldap_t);
 	fr_ldap_thread_t	*t = talloc_get_type_abort(mctx->thread, fr_ldap_thread_t);
 	fr_ldap_thread_trunk_t	*ttrunk;
 
@@ -2295,18 +2295,18 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_ldap_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_ldap_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_ldap_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_ldap_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 	char		buffer[256];
 	char const	*group_attribute;
 	xlat_t		*xlat;
 
-	inst->handle_config.name = talloc_typed_asprintf(inst, "rlm_ldap (%s)", mctx->inst->name);
+	inst->handle_config.name = talloc_typed_asprintf(inst, "rlm_ldap (%s)", mctx->mi->name);
 
 	if (inst->group.attribute) {
 		group_attribute = inst->group.attribute;
 	} else if (cf_section_name2(conf)) {
-		snprintf(buffer, sizeof(buffer), "%s-LDAP-Group", mctx->inst->name);
+		snprintf(buffer, sizeof(buffer), "%s-LDAP-Group", mctx->mi->name);
 		group_attribute = buffer;
 	} else {
 		group_attribute = "LDAP-Group";
@@ -2373,7 +2373,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	xlat_func_args_set(xlat, ldap_xlat_arg);
 	xlat_func_call_env_set(xlat, &xlat_profile_method_env);
 
-	map_proc_register(inst, mctx->inst->name, mod_map_proc, ldap_map_verify, 0, LDAP_URI_SAFE_FOR);
+	map_proc_register(inst, mctx->mi->name, mod_map_proc, ldap_map_verify, 0, LDAP_URI_SAFE_FOR);
 
 	return 0;
 }
@@ -2485,8 +2485,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 	size_t		i;
 
 	CONF_SECTION	*options;
-	rlm_ldap_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_ldap_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_ldap_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_ldap_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	options = cf_section_find(conf, "options", NULL);
 	if (!options || !cf_pair_find(options, "chase_referrals")) {
@@ -2587,7 +2587,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 	 */
 	if (inst->handle_config.server) {
 		inst->handle_config.server[talloc_array_length(inst->handle_config.server) - 2] = '\0';
-		DEBUG4("rlm_ldap (%s) - LDAP server string: %s", mctx->inst->name, inst->handle_config.server);
+		DEBUG4("rlm_ldap (%s) - LDAP server string: %s", mctx->mi->name, inst->handle_config.server);
 	}
 
 	/*
diff --git a/src/modules/rlm_ldap/user.c b/src/modules/rlm_ldap/user.c
index 2be5316bd8..ecf067e86e 100644
--- a/src/modules/rlm_ldap/user.c
+++ b/src/modules/rlm_ldap/user.c
@@ -30,7 +30,7 @@ USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/util/debug.h>
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include "rlm_ldap.h"
 
diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index d3b8ce762c..760b065b33 100644
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -571,7 +571,7 @@ static xlat_action_t linelog_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				  xlat_ctx_t const *xctx, request_t *request,
 				  fr_value_box_list_t *args)
 {
-	rlm_linelog_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_linelog_t);
+	rlm_linelog_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_linelog_t);
 	linelog_call_env_t const	*call_env = talloc_get_type_abort(xctx->env_data, linelog_call_env_t);
 
 	struct iovec			vector[2];
@@ -610,7 +610,7 @@ typedef struct {
 
 static unlang_action_t CC_HINT(nonnull) mod_do_linelog_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_linelog_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_linelog_t);
+	rlm_linelog_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_linelog_t);
 	linelog_call_env_t const	*call_env = talloc_get_type_abort(mctx->env_data, linelog_call_env_t);
 	rlm_linelog_rctx_t		*rctx = talloc_get_type_abort(mctx->rctx, rlm_linelog_rctx_t);
 	struct iovec			*vector;
@@ -677,9 +677,9 @@ static unlang_action_t CC_HINT(nonnull) mod_do_linelog_resume(rlm_rcode_t *p_res
  */
 static unlang_action_t CC_HINT(nonnull) mod_do_linelog(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_linelog_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_linelog_t);
+	rlm_linelog_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_linelog_t);
 	linelog_call_env_t const	*call_env = talloc_get_type_abort(mctx->env_data, linelog_call_env_t);
-	CONF_SECTION			*conf = mctx->inst->conf;
+	CONF_SECTION			*conf = mctx->mi->conf;
 
 	char				buff[4096];
 	char				*p = buff;
@@ -906,7 +906,7 @@ static int call_env_filename_parse(TALLOC_CTX *ctx, void *out, tmpl_rules_t cons
 
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_linelog_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_linelog_t);
+	rlm_linelog_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_linelog_t);
 
 	fr_pool_free(inst->pool);
 
@@ -918,8 +918,8 @@ static int mod_detach(module_detach_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_linelog_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_linelog_t);
-	CONF_SECTION		*cs, *conf = mctx->inst->conf;
+	rlm_linelog_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_linelog_t);
+	CONF_SECTION		*cs, *conf = mctx->mi->conf;
 	char			prefix[100];
 
 	inst->log_dst = fr_table_value_by_str(linefr_log_dst_table, inst->log_dst_str, LINELOG_DST_INVALID);
@@ -928,7 +928,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 		return -1;
 	}
 
-	snprintf(prefix, sizeof(prefix), "rlm_linelog (%s)", mctx->inst->name);
+	snprintf(prefix, sizeof(prefix), "rlm_linelog (%s)", mctx->mi->name);
 
 	/*
 	 *	Setup the logging destination
@@ -1033,7 +1033,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_linelog_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_linelog_t);
+	rlm_linelog_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_linelog_t);
 	xlat_t		*xlat;
 
 	static xlat_arg_parser_t const linelog_xlat_args[] = {
diff --git a/src/modules/rlm_logtee/rlm_logtee.c b/src/modules/rlm_logtee/rlm_logtee.c
index 1c373916d2..4fd7ac90f7 100644
--- a/src/modules/rlm_logtee/rlm_logtee.c
+++ b/src/modules/rlm_logtee/rlm_logtee.c
@@ -554,7 +554,7 @@ static unlang_action_t mod_insert_logtee(rlm_rcode_t *p_result, module_ctx_t con
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_logtee_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_logtee_t);
+	rlm_logtee_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_logtee_t);
 	rlm_logtee_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_logtee_thread_t);
 
 	MEM(t->fring = fr_fring_alloc(t, inst->buffer_depth, false));
@@ -596,8 +596,8 @@ static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_logtee_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_logtee_t);
-	CONF_SECTION    *conf = mctx->inst->conf;
+	rlm_logtee_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_logtee_t);
+	CONF_SECTION    *conf = mctx->mi->conf;
 	char		prefix[100];
 
 	/*
diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c
index 3a15db3398..40c93863c0 100644
--- a/src/modules/rlm_lua/lua.c
+++ b/src/modules/rlm_lua/lua.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
@@ -364,7 +364,7 @@ static int _lua_pair_get(lua_State *L)
 static int _lua_pair_set(lua_State *L)
 {
 	module_ctx_t const	*mctx = fr_lua_util_get_mctx();
-	rlm_lua_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_lua_t);
+	rlm_lua_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_lua_t);
 	request_t		*request = fr_lua_util_get_request();
 	fr_dcursor_t		cursor;
 	fr_dict_attr_t const	*da;
@@ -892,7 +892,7 @@ static void fr_lua_rcode_register(lua_State *L, char const *name)
  */
 int fr_lua_init(lua_State **out, module_inst_ctx_t const *mctx)
 {
-	rlm_lua_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_lua_t);
+	rlm_lua_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_lua_t);
 	lua_State		*L;
 
 	fr_lua_util_set_mctx(MODULE_CTX_FROM_INST(mctx));
diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c
index 10ed6f412b..d279ad0803 100644
--- a/src/modules/rlm_lua/rlm_lua.c
+++ b/src/modules/rlm_lua/rlm_lua.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
@@ -58,7 +58,7 @@ static const conf_parser_t module_config[] = {
 #define DO_LUA(_s)\
 static unlang_action_t mod_##_s(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) \
 {\
-	rlm_lua_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_lua_t);\
+	rlm_lua_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_lua_t);\
 	if (!inst->func_##_s) RETURN_MODULE_NOOP;\
 	return fr_lua_run(p_result, mctx, request, inst->func_##_s);\
 }
@@ -106,7 +106,7 @@ static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_lua_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_lua_t);
+	rlm_lua_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_lua_t);
 	rlm_rcode_t ret = 0;
 
 	/*
@@ -115,7 +115,7 @@ static int mod_detach(module_detach_ctx_t const *mctx)
 	if (inst->interpreter) {
 		if (inst->func_detach) {
 			fr_lua_run(&ret,
-				   MODULE_CTX(mctx->inst,
+				   MODULE_CTX(mctx->mi,
 					      &(rlm_lua_thread_t){
 							.interpreter = inst->interpreter
 					      },
@@ -130,7 +130,7 @@ static int mod_detach(module_detach_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_lua_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_lua_t);
+	rlm_lua_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_lua_t);
 	rlm_rcode_t rcode;
 
 	/*
@@ -144,7 +144,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 	if (inst->func_instantiate) {
 		fr_lua_run(&rcode,
-			   MODULE_CTX(mctx->inst,
+			   MODULE_CTX(mctx->mi,
 			   	      &(rlm_lua_thread_t){
 						.interpreter = inst->interpreter
 				      },
diff --git a/src/modules/rlm_lua/util.c b/src/modules/rlm_lua/util.c
index 1d4c3ee70b..3ed156b6f7 100644
--- a/src/modules/rlm_lua/util.c
+++ b/src/modules/rlm_lua/util.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX fr_lua_mctx->inst->name
+#define LOG_PREFIX fr_lua_mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 
@@ -349,4 +349,3 @@ request_t *fr_lua_util_get_request(void)
 {
 	return fr_lua_request;
 }
-
diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c
index 5e2ba662b5..27c4b62c11 100644
--- a/src/modules/rlm_mruby/rlm_mruby.c
+++ b/src/modules/rlm_mruby/rlm_mruby.c
@@ -131,7 +131,7 @@ static void mruby_parse_config(mrb_state *mrb, CONF_SECTION *cs, int lvl, mrb_va
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_mruby_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_mruby_t);
+	rlm_mruby_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_mruby_t);
 	mrb_state *mrb;
 	CONF_SECTION *cs;
 	FILE *f;
@@ -181,7 +181,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 	/* Convert a FreeRADIUS config structure into a mruby hash */
 	inst->mrubyconf_hash = mrb_hash_new(mrb);
-	cs = cf_section_find(mctx->inst->conf, "config", NULL);
+	cs = cf_section_find(mctx->mi->conf, "config", NULL);
 	if (cs) mruby_parse_config(mrb, cs, 0, inst->mrubyconf_hash);
 
 	/* Define the Request class */
@@ -473,7 +473,7 @@ DIAG_ON(DIAG_UNKNOWN_PRAGMAS)
 	{ \
 		return do_mruby(p_result, \
 			       request,	\
-			       (rlm_mruby_t const *)mctx->inst->data, \
+			       (rlm_mruby_t const *)mctx->mi->data, \
 			       #foo); \
 	}
 
@@ -490,7 +490,7 @@ RLM_MRUBY_FUNC(accounting)
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_mruby_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_mruby_t);
+	rlm_mruby_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_mruby_t);
 
 	mrb_close(inst->mrb);
 
diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index fa6a2db7e4..57b7d8771a 100644
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -26,7 +26,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exec_legacy.h>
@@ -389,7 +389,7 @@ static xlat_action_t mschap_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 	uint8_t			buffer[32];
 	fr_pair_t		*user_name;
 	fr_pair_t		*chap_challenge, *response;
-	rlm_mschap_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_mschap_t);
+	rlm_mschap_t const	*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_mschap_t);
 	fr_value_box_t		*arg = fr_value_box_list_head(in);
 	fr_value_box_t		*vb;
 	bool			tainted = false;
@@ -1379,7 +1379,7 @@ static void mppe_chap2_gen_keys128(uint8_t const *nt_hashhash, uint8_t const *re
  */
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_mschap_t const 	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_mschap_t);
+	rlm_mschap_t const 	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_mschap_t);
 	mschap_autz_call_env_t	*env_data = talloc_get_type_abort(mctx->env_data, mschap_autz_call_env_t);
 	fr_pair_t		*challenge = NULL;
 	fr_pair_t		*parent;
@@ -1403,7 +1403,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 
 	if (!inst->auth_type) {
 		WARN("No 'authenticate %s {...}' section or 'Auth-Type = %s' set.  Cannot setup MS-CHAP authentication",
-		     mctx->inst->name, mctx->inst->name);
+		     mctx->mi->name, mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -2263,7 +2263,7 @@ static int mschap_new_pass_decrypt(request_t *request, mschap_auth_ctx_t *auth_c
  */
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_mschap_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_mschap_t);
+	rlm_mschap_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_mschap_t);
 	mschap_auth_call_env_t	*env_data = talloc_get_type_abort(mctx->env_data, mschap_auth_call_env_t);
 	mschap_auth_ctx_t	*auth_ctx;
 
@@ -2274,7 +2274,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
 	 *	otherwise
 	 */
 	*auth_ctx = (mschap_auth_ctx_t) {
-		.name = mctx->inst->name,
+		.name = mctx->mi->name,
 		.inst = inst,
 		.method = inst->method,
 		.env_data = env_data,
@@ -2325,7 +2325,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
 	 *	input attribute, and we're calling out to an
 	 *	external password store.
 	 */
-	if (nt_password_find(auth_ctx, &auth_ctx->nt_password, mctx->inst->data, request) < 0) RETURN_MODULE_FAIL;
+	if (nt_password_find(auth_ctx, &auth_ctx->nt_password, mctx->mi->data, request) < 0) RETURN_MODULE_FAIL;
 
 	/*
 	 *	Check to see if this is a change password request, and process
@@ -2388,13 +2388,13 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_mschap_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_mschap_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_mschap_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_mschap_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
-	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->inst->name, -1);
+	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->mi->name, -1);
 	if (!inst->auth_type) {
 		WARN("Failed to find 'authenticate %s {...}' section.  MS-CHAP authentication will likely not work",
-		     mctx->inst->name);
+		     mctx->mi->name);
 	}
 
 	/*
@@ -2488,7 +2488,7 @@ done_mppe_check:
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_mschap_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_mschap_t);
+	rlm_mschap_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_mschap_t);
 	xlat_t			*xlat;
 
 	xlat = xlat_func_register_module(inst, mctx, NULL, mschap_xlat, FR_TYPE_VOID);
@@ -2508,7 +2508,7 @@ static int mod_detach(
 		      module_detach_ctx_t const *mctx)
 {
 #ifdef WITH_AUTH_WINBIND
-	rlm_mschap_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_mschap_t);
+	rlm_mschap_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_mschap_t);
 
 	fr_pool_free(inst->wb_pool);
 #endif
diff --git a/src/modules/rlm_opendirectory/rlm_opendirectory.c b/src/modules/rlm_opendirectory/rlm_opendirectory.c
index 292102bc0a..febd414b01 100644
--- a/src/modules/rlm_opendirectory/rlm_opendirectory.c
+++ b/src/modules/rlm_opendirectory/rlm_opendirectory.c
@@ -384,7 +384,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
  */
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_opendirectory_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_opendirectory_t);
+	rlm_opendirectory_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_opendirectory_t);
 	struct passwd			*userdata = NULL;
 	int				ismember = 0;
 	fr_client_t			*client = NULL;
@@ -505,7 +505,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 setup_auth_type:
 	if (!inst->auth_type) {
 		WARN("No 'authenticate %s {...}' section or 'Auth-Type = %s' set.  Cannot setup OpenDirectory authentication",
-		     mctx->inst->name, mctx->inst->name);
+		     mctx->mi->name, mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -516,12 +516,12 @@ setup_auth_type:
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_opendirectory_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_opendirectory_t);
+	rlm_opendirectory_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_opendirectory_t);
 
-	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->inst->name, -1);
+	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->mi->name, -1);
 	if (!inst->auth_type) {
 		WARN("Failed to find 'authenticate %s {...}' section.  OpenDirectory authentication will likely not work",
-		     mctx->inst->name);
+		     mctx->mi->name);
 	}
 
 	return 0;
diff --git a/src/modules/rlm_pam/rlm_pam.c b/src/modules/rlm_pam/rlm_pam.c
index f10826c607..e3c8d069b4 100644
--- a/src/modules/rlm_pam/rlm_pam.c
+++ b/src/modules/rlm_pam/rlm_pam.c
@@ -87,7 +87,7 @@ fr_dict_attr_autoload_t rlm_pam_dict_attr[] = {
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_pam_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_pam_t);
+	rlm_pam_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_pam_t);
 
 	if (!inst->pam_auth_name) inst->pam_auth_name = main_config->name;
 
@@ -213,7 +213,7 @@ static int do_pam(request_t *request, char const *username, char const *passwd,
 
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_pam_t const		*data = talloc_get_type_abort_const(mctx->inst->data, rlm_pam_t);
+	rlm_pam_t const		*data = talloc_get_type_abort_const(mctx->mi->data, rlm_pam_t);
 	int			ret;
 	fr_pair_t		*pair;
 
diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index fafb415870..bc7abd5c76 100644
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -149,11 +149,11 @@ static fr_dict_attr_t const **pap_alloweds;
  */
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_pap_t const 	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_pap_t);
+	rlm_pap_t const 	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_pap_t);
 	pap_call_env_t		*env_data = talloc_get_type_abort(mctx->env_data, pap_call_env_t);
 
 	if (fr_pair_find_by_da(&request->control_pairs, NULL, attr_auth_type) != NULL) {
-		RDEBUG3("Auth-Type is already set.  Not setting 'Auth-Type := %s'", mctx->inst->name);
+		RDEBUG3("Auth-Type is already set.  Not setting 'Auth-Type := %s'", mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -164,7 +164,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 
 	if (!inst->auth_type) {
 		WARN("No 'authenticate %s {...}' section or 'Auth-Type = %s' set.  Cannot setup PAP authentication.",
-		     mctx->inst->name, mctx->inst->name);
+		     mctx->mi->name, mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -899,7 +899,7 @@ static const pap_auth_func_t auth_func_table[] = {
  */
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_pap_t const 	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_pap_t);
+	rlm_pap_t const 	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_pap_t);
 	fr_pair_t		*known_good;
 	rlm_rcode_t		rcode = RLM_MODULE_INVALID;
 	pap_auth_func_t		auth_func;
@@ -975,12 +975,12 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_pap_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_pap_t);
+	rlm_pap_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_pap_t);
 
-	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->inst->name, -1);
+	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->mi->name, -1);
 	if (!inst->auth_type) {
 		WARN("Failed to find 'authenticate %s {...}' section.  PAP will likely not work",
-		     mctx->inst->name);
+		     mctx->mi->name);
 	}
 
 	return 0;
diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c
index 6e6a1dfa8f..935ba94ff7 100644
--- a/src/modules/rlm_passwd/rlm_passwd.c
+++ b/src/modules/rlm_passwd/rlm_passwd.c
@@ -393,8 +393,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 	size_t			len;
 	int			i;
 	fr_dict_attr_t const	*da;
-	rlm_passwd_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_passwd_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_passwd_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_passwd_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	fr_assert(inst->filename && *inst->filename);
 	fr_assert(inst->format && *inst->format);
@@ -502,7 +502,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_passwd_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_passwd_t);
+	rlm_passwd_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_passwd_t);
 	if (inst->ht) {
 		release_ht(inst->ht);
 		inst->ht = NULL;
@@ -562,7 +562,7 @@ static void result_add(TALLOC_CTX *ctx, rlm_passwd_t const *inst, request_t *req
 
 static unlang_action_t CC_HINT(nonnull) mod_passwd_map(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_passwd_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_passwd_t);
+	rlm_passwd_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_passwd_t);
 
 	char			buffer[1024];
 	fr_pair_t		*key, *i;
diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 64b2292bf1..c9fe6035bb 100644
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -800,7 +800,7 @@ static unlang_action_t do_perl(rlm_rcode_t *p_result, module_ctx_t const *mctx,
 			       PerlInterpreter *interp, char const *function_name)
 {
 
-	rlm_perl_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_perl_t);
+	rlm_perl_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_perl_t);
 	fr_pair_list_t		vps;
 	int			ret=0, count;
 	STRLEN			n_a;
@@ -902,7 +902,7 @@ static unlang_action_t do_perl(rlm_rcode_t *p_result, module_ctx_t const *mctx,
 #define RLM_PERL_FUNC(_x) \
 static unlang_action_t CC_HINT(nonnull) mod_##_x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) \
 { \
-	rlm_perl_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_perl_t); \
+	rlm_perl_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_perl_t); \
 	return do_perl(p_result, mctx, request, \
 		       ((rlm_perl_thread_t *)talloc_get_type_abort(mctx->thread, rlm_perl_thread_t))->perl, \
 		       inst->func_##_x); \
@@ -946,7 +946,7 @@ DIAG_ON(DIAG_UNKNOWN_PRAGMAS)
 
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_perl_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_perl_t);
+	rlm_perl_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_perl_t);
 	rlm_perl_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_perl_thread_t);
 	PerlInterpreter		*interp;
 	UV			clone_flags = 0;
@@ -996,8 +996,8 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_perl_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_perl_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_perl_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_perl_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 	AV		*end_AV;
 
 	char const	**embed_c;	/* Stupid Perl and lack of const consistency */
@@ -1074,7 +1074,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 DIAG_OFF(nested-externs)
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_perl_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_perl_t);
+	rlm_perl_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_perl_t);
 	int 		ret = 0, count = 0;
 
 
diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index 5dad237159..6550e02d3d 100644
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -27,7 +27,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module_rlm.h>
@@ -615,7 +615,7 @@ static unlang_action_t do_python(rlm_rcode_t *p_result, module_ctx_t const *mctx
 	 */
 	if (!p_func) RETURN_MODULE_NOOP;
 
-	RDEBUG3("Using thread state %p/%p", mctx->inst->data, t->state);
+	RDEBUG3("Using thread state %p/%p", mctx->mi->data, t->state);
 
 	PyEval_RestoreThread(t->state);	/* Swap in our local thread state */
 	do_python_single(&rcode, mctx, request, p_func, funcname);
@@ -627,7 +627,7 @@ static unlang_action_t do_python(rlm_rcode_t *p_result, module_ctx_t const *mctx
 #define MOD_FUNC(x) \
 static unlang_action_t CC_HINT(nonnull) mod_##x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request) \
 { \
-	rlm_python_t const *inst = talloc_get_type_abort_const(mctx->inst->data, rlm_python_t); \
+	rlm_python_t const *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_python_t); \
 	return do_python(p_result, mctx, request, inst->x.function, #x);\
 }
 
@@ -776,7 +776,7 @@ static int python_parse_config(module_inst_ctx_t const *mctx, CONF_SECTION *cs,
  */
 static int python_module_import_config(module_inst_ctx_t const *mctx, CONF_SECTION *conf, PyObject *module)
 {
-	rlm_python_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_python_t);
+	rlm_python_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_python_t);
 	CONF_SECTION *cs;
 
 	/*
@@ -853,8 +853,8 @@ static PyObject *python_module_init(void)
 
 static int python_interpreter_init(module_inst_ctx_t const *mctx)
 {
-	rlm_python_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_python_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_python_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_python_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 	PyObject	*module;
 
 	/*
@@ -926,7 +926,7 @@ static void python_interpreter_free(rlm_python_t *inst, PyThreadState *interp)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_python_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_python_t);
+	rlm_python_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_python_t);
 
 	if (python_interpreter_init(mctx) < 0) return -1;
 
@@ -976,7 +976,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_python_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_python_t);
+	rlm_python_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_python_t);
 
 	/*
 	 *	If we don't have a interpreter
@@ -1023,7 +1023,7 @@ static int mod_detach(module_detach_ctx_t const *mctx)
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
 	PyThreadState		*state;
-	rlm_python_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_python_t);
+	rlm_python_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_python_t);
 	rlm_python_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_python_thread_t);
 
 	state = PyThreadState_New(inst->interpreter->interp);
diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 948be03baf..09a77f3954 100644
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -332,7 +332,7 @@ static int status_check_update_parse(TALLOC_CTX *ctx, void *out, UNUSED void *pa
 
 static void mod_radius_signal(module_ctx_t const *mctx, request_t *request, fr_signal_t action)
 {
-	rlm_radius_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_radius_t);
+	rlm_radius_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_radius_t);
 	rlm_radius_io_t	const	*io = (rlm_radius_io_t const *)inst->io_submodule->module;		/* Public symbol exported by the module */
 
 	/*
@@ -389,7 +389,7 @@ static void radius_fixups(rlm_radius_t const *inst, request_t *request)
  */
 static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_radius_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_radius_t);
+	rlm_radius_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_radius_t);
 	rlm_rcode_t		rcode;
 	unlang_action_t		ua;
 	fr_client_t		*client;
@@ -455,11 +455,11 @@ static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, modul
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
 	size_t i, num_types;
-	rlm_radius_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_radius_t);
-	CONF_SECTION *conf = mctx->inst->conf;
+	rlm_radius_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_radius_t);
+	CONF_SECTION *conf = mctx->mi->conf;
 
 	inst->io = (rlm_radius_io_t const *)inst->io_submodule->module;	/* Public symbol exported by the module */
-	inst->name = mctx->inst->name;
+	inst->name = mctx->mi->name;
 
 	/*
 	 *	These limits are specific to RADIUS, and cannot be over-ridden
diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 8fe7206814..ae0c8634c9 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -2753,7 +2753,7 @@ static unlang_action_t mod_enqueue(rlm_rcode_t *p_result, void **rctx_out, void
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_radius_udp_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_radius_udp_t);
+	rlm_radius_udp_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_radius_udp_t);
 	udp_thread_t			*thread = talloc_get_type_abort(mctx->thread, udp_thread_t);
 
 	static fr_trunk_io_funcs_t	io_funcs = {
@@ -2796,9 +2796,9 @@ static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_radius_t		*parent = talloc_get_type_abort(mctx->inst->parent->data, rlm_radius_t);
-	rlm_radius_udp_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_radius_udp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_radius_t		*parent = talloc_get_type_abort(mctx->mi->parent->data, rlm_radius_t);
+	rlm_radius_udp_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_radius_udp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	if (!parent) {
 		ERROR("IO module cannot be instantiated directly");
diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c
index 77dec2ca06..c23e00171c 100644
--- a/src/modules/rlm_radutmp/rlm_radutmp.c
+++ b/src/modules/rlm_radutmp/rlm_radutmp.c
@@ -179,7 +179,7 @@ static NAS_PORT *nas_port_find(NAS_PORT *nas_port_list, uint32_t nasaddr, uint16
  */
 static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_radutmp_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_radutmp_t);
+	rlm_radutmp_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_radutmp_t);
 	rlm_radutmp_env_t	*env = talloc_get_type_abort(mctx->env_data, rlm_radutmp_env_t);
 	rlm_rcode_t		rcode = RLM_MODULE_OK;
 	struct radutmp		ut, u;
diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c
index 1c0adf8868..1e3820e540 100644
--- a/src/modules/rlm_redis/rlm_redis.c
+++ b/src/modules/rlm_redis/rlm_redis.c
@@ -264,7 +264,7 @@ static xlat_action_t redis_remap_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      xlat_ctx_t const *xctx,
 				      request_t *request, fr_value_box_list_t *in)
 {
-	rlm_redis_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_redis_t);
+	rlm_redis_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_redis_t);
 
 	fr_socket_t			node_addr;
 	fr_pool_t			*pool;
@@ -326,7 +326,7 @@ static xlat_action_t redis_node_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     xlat_ctx_t const *xctx,
 				     request_t *request, fr_value_box_list_t *in)
 {
-	rlm_redis_t const			*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_redis_t);
+	rlm_redis_t const			*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_redis_t);
 
 	fr_redis_cluster_key_slot_t const	*key_slot;
 	fr_redis_cluster_node_t const		*node;
@@ -380,7 +380,7 @@ static xlat_action_t redis_lua_func_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 					 xlat_ctx_t const *xctx,
 					 request_t *request, fr_value_box_list_t *in)
 {
-	rlm_redis_t			*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_redis_t);
+	rlm_redis_t			*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_redis_t);
 	redis_lua_func_inst_t const	*xlat_inst = talloc_get_type_abort_const(xctx->inst, redis_lua_func_inst_t);
 	redis_lua_func_t		*func = xlat_inst->func;
 
@@ -590,7 +590,7 @@ static xlat_action_t redis_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				xlat_ctx_t const *xctx,
 				request_t *request, fr_value_box_list_t *in)
 {
-	rlm_redis_t const	*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_redis_t);
+	rlm_redis_t const	*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_redis_t);
 	xlat_action_t		action = XLAT_ACTION_DONE;
 	fr_redis_conn_t		*conn;
 
@@ -777,11 +777,11 @@ finish:
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_redis_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_redis_t);
+	rlm_redis_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_redis_t);
 	fr_socket_t *nodes;
 	int ret, i;
 
-	inst->cluster = fr_redis_cluster_alloc(inst, mctx->inst->conf, &inst->conf, true, NULL, NULL, NULL);
+	inst->cluster = fr_redis_cluster_alloc(inst, mctx->mi->conf, &inst->conf, true, NULL, NULL, NULL);
 	if (!inst->cluster) return -1;
 
 	/*
@@ -860,7 +860,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_redis_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_redis_t);
+	rlm_redis_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_redis_t);
 	xlat_t		*xlat;
 
 	xlat = xlat_func_register_module(inst, mctx, NULL, redis_xlat, FR_TYPE_VOID);
diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
index 5fe9a0dec4..787d1e438b 100644
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
@@ -1100,7 +1100,7 @@ finish:
 
 static unlang_action_t CC_HINT(nonnull) mod_alloc(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_redis_ippool_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_redis_ippool_t);
+	rlm_redis_ippool_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_redis_ippool_t);
 	redis_ippool_alloc_call_env_t	*env = talloc_get_type_abort(mctx->env_data, redis_ippool_alloc_call_env_t);
 	uint32_t			lease_time;
 
@@ -1130,7 +1130,7 @@ static unlang_action_t CC_HINT(nonnull) mod_alloc(rlm_rcode_t *p_result, module_
 
 static unlang_action_t CC_HINT(nonnull) mod_update(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_redis_ippool_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_redis_ippool_t);
+	rlm_redis_ippool_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_redis_ippool_t);
 	redis_ippool_update_call_env_t	*env = talloc_get_type_abort(mctx->env_data, redis_ippool_update_call_env_t);
 
 	CHECK_POOL_NAME
@@ -1192,7 +1192,7 @@ static unlang_action_t CC_HINT(nonnull) mod_update(rlm_rcode_t *p_result, module
 
 static unlang_action_t CC_HINT(nonnull) mod_release(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_redis_ippool_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_redis_ippool_t);
+	rlm_redis_ippool_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_redis_ippool_t);
 	redis_ippool_release_call_env_t	*env = talloc_get_type_abort(mctx->env_data, redis_ippool_release_call_env_t);
 
 	CHECK_POOL_NAME
@@ -1234,9 +1234,9 @@ static unlang_action_t CC_HINT(nonnull) mod_bulk_release(rlm_rcode_t *p_result,
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
 	static bool			done_hash = false;
-	CONF_SECTION			*subcs = cf_section_find(mctx->inst->conf, "redis", NULL);
+	CONF_SECTION			*subcs = cf_section_find(mctx->mi->conf, "redis", NULL);
 
-	rlm_redis_ippool_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_redis_ippool_t);
+	rlm_redis_ippool_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_redis_ippool_t);
 
 	fr_assert(subcs);
 
diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c
index ce1b90f832..df0870f3f6 100644
--- a/src/modules/rlm_rediswho/rlm_rediswho.c
+++ b/src/modules/rlm_rediswho/rlm_rediswho.c
@@ -196,8 +196,8 @@ static unlang_action_t mod_accounting_all(rlm_rcode_t *p_result, rlm_rediswho_t
 
 static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rediswho_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rediswho_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_rediswho_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rediswho_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	rlm_rcode_t		rcode;
 	fr_pair_t		*vp;
 	fr_dict_enum_value_t	*dv;
@@ -231,8 +231,8 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_rediswho_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_rediswho_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_rediswho_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_rediswho_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	inst->cluster = fr_redis_cluster_alloc(inst, conf, &inst->conf, true, NULL, NULL, NULL);
 	if (!inst->cluster) return -1;
diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c
index fd52816284..a0c28f0263 100644
--- a/src/modules/rlm_rest/io.c
+++ b/src/modules/rlm_rest/io.c
@@ -60,7 +60,7 @@ void rest_io_xlat_signal(xlat_ctx_t const *xctx, request_t *request, fr_signal_t
 	rlm_rest_xlat_rctx_t		*our_rctx = talloc_get_type_abort(xctx->rctx, rlm_rest_xlat_rctx_t);
 	fr_curl_io_request_t		*randle = talloc_get_type_abort(our_rctx->handle, fr_curl_io_request_t);
 
-	rest_io_module_signal(MODULE_CTX(xctx->mctx->inst,
+	rest_io_module_signal(MODULE_CTX(xctx->mctx->mi,
 			      t,
 			      xctx->mctx->env_data,
 			      randle),
diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 6c0e2a62d2..7030641a94 100644
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <ctype.h>
 #include <string.h>
@@ -1651,7 +1651,7 @@ size_t rest_get_handle_data(char const **out, fr_curl_io_request_t *randle)
 static int rest_request_config_body(module_ctx_t const *mctx, rlm_rest_section_t const *section,
 				    request_t *request, fr_curl_io_request_t *randle, rest_read_t func)
 {
-	rlm_rest_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const *inst = talloc_get_type_abort(mctx->mi->data, rlm_rest_t);
 	rlm_rest_curl_context_t	*uctx = talloc_get_type_abort(randle->uctx, rlm_rest_curl_context_t);
 	ssize_t len;
 
@@ -1728,7 +1728,7 @@ int rest_request_config(module_ctx_t const *mctx, rlm_rest_section_t const *sect
 			http_body_type_t type,
 			char const *uri, char const *body_data)
 {
-	rlm_rest_t const	*inst = talloc_get_type_abort(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const	*inst = talloc_get_type_abort(mctx->mi->data, rlm_rest_t);
 	rlm_rest_call_env_t 	*call_env = talloc_get_type_abort(mctx->env_data, rlm_rest_call_env_t);
 	rlm_rest_curl_context_t *ctx = talloc_get_type_abort(randle->uctx, rlm_rest_curl_context_t);
 	CURL			*candle = randle->candle;
diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index 51f1c2dc73..ea128f50da 100644
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -513,7 +513,7 @@ static xlat_action_t rest_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 			       xlat_ctx_t const *xctx, request_t *request,
 			       fr_value_box_list_t *in)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_rest_t);
 	rlm_rest_thread_t		*t = talloc_get_type_abort(xctx->mctx->thread, rlm_rest_thread_t);
 
 	fr_curl_io_request_t		*randle = NULL;
@@ -627,7 +627,7 @@ static xlat_action_t rest_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 	 *
 	 *  @todo We could extract the User-Name and password from the URL string.
 	 */
-	ret = rest_request_config(MODULE_CTX(xctx->mctx->inst, t, xctx->env_data, NULL),
+	ret = rest_request_config(MODULE_CTX(xctx->mctx->mi, t, xctx->env_data, NULL),
 				  section, request, randle, section->request.method,
 				  section->request.body,
 				  uri_vb->vb_strvalue, in_vb ? in_vb->vb_strvalue : NULL);
@@ -647,7 +647,7 @@ static xlat_action_t rest_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 
 static unlang_action_t mod_authorize_result(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rest_t);
 	rlm_rest_section_t const 	*section = &inst->authenticate;
 	fr_curl_io_request_t		*handle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t);
 
@@ -733,7 +733,7 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rest_t);
 	rlm_rest_thread_t		*t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t);
 	rlm_rest_section_t const	*section = &inst->authorize;
 
@@ -761,7 +761,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 static unlang_action_t mod_authenticate_result(rlm_rcode_t *p_result,
 					       module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rest_t);
 	rlm_rest_section_t const 	*section = &inst->authenticate;
 	fr_curl_io_request_t		*handle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t);
 
@@ -844,7 +844,7 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rest_t);
 	rlm_rest_thread_t		*t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t);
 	rlm_rest_call_env_t 		*call_env = talloc_get_type_abort(mctx->env_data, rlm_rest_call_env_t);
 	rlm_rest_section_t const	*section = &inst->authenticate;
@@ -903,7 +903,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
 
 static unlang_action_t mod_accounting_result(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rest_t);
 	rlm_rest_section_t const 	*section = &inst->authenticate;
 	fr_curl_io_request_t		*handle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t);
 
@@ -954,7 +954,7 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rest_t);
 	rlm_rest_thread_t		*t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t);
 	rlm_rest_section_t const	*section = &inst->accounting;
 
@@ -981,7 +981,7 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo
 
 static unlang_action_t mod_post_auth_result(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rest_t);
 	rlm_rest_section_t const 	*section = &inst->authenticate;
 	fr_curl_io_request_t		*handle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t);
 
@@ -1032,7 +1032,7 @@ finish:
  */
 static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_rest_t);
 	rlm_rest_thread_t		*t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t);
 	rlm_rest_section_t const	*section = &inst->post_auth;
 
@@ -1261,7 +1261,7 @@ static int rest_conn_alloc(fr_curl_io_request_t *randle, void *uctx)
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_rest_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_rest_t);
 	rlm_rest_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_rest_thread_t);
 	fr_curl_handle_t	*mhandle;
 
@@ -1311,8 +1311,8 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
  */
 static int instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_rest_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_rest_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_rest_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_rest_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	inst->xlat.request.method_str = "GET";
 	inst->xlat.request.body = REST_HTTP_BODY_NONE;
@@ -1344,7 +1344,7 @@ static int instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_rest_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_rest_t);
+	rlm_rest_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_rest_t);
 	xlat_t		*xlat;
 
 	xlat = xlat_func_register_module(inst, mctx, NULL, rest_xlat, FR_TYPE_STRING);
diff --git a/src/modules/rlm_securid/rlm_securid.c b/src/modules/rlm_securid/rlm_securid.c
index 029bbf9761..e4dad5ca7f 100644
--- a/src/modules/rlm_securid/rlm_securid.c
+++ b/src/modules/rlm_securid/rlm_securid.c
@@ -429,7 +429,7 @@ static SECURID_AUTH_RC securidAuth(void *instance, request_t *request,
 /******************************************/
 static int mod_detach(module_detach_ctx_t *mctx)
 {
-	rlm_securid_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_securid_t);
+	rlm_securid_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_securid_t);
 
 	/* delete session tree */
 	if (inst->session_tree) {
@@ -445,7 +445,7 @@ static int mod_detach(module_detach_ctx_t *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_securid_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_securid_t);
+	rlm_securid_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_securid_t);
 
 	/*
 	 *	Lookup sessions in the tree.  We don't free them in
@@ -468,7 +468,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
 	int			rcode;
-	rlm_securid_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_securid_t);
+	rlm_securid_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_securid_t);
 	char		 	buffer[FR_MAX_STRING_LEN]="";
 	fr_pair_t		*username, *password;
 	fr_pair_t		*vp;
diff --git a/src/modules/rlm_sigtran/rlm_sigtran.c b/src/modules/rlm_sigtran/rlm_sigtran.c
index f2840e0027..47bf919e0b 100644
--- a/src/modules/rlm_sigtran/rlm_sigtran.c
+++ b/src/modules/rlm_sigtran/rlm_sigtran.c
@@ -34,7 +34,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX_ARGS mctx->inst->name
+#define LOG_PREFIX_ARGS mctx->mi->name
 
 #include <osmocom/core/linuxlist.h>
 
@@ -199,7 +199,7 @@ fr_dict_attr_autoload_t rlm_sigtran_dict_attr[] = {
 
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_sigtran_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_sigtran_t);
+	rlm_sigtran_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_sigtran_t);
 	rlm_sigtran_thread_t const	*t = talloc_get_type_abort_const(mctx->thread, rlm_sigtran_thread_t);
 
 	return sigtran_client_map_send_auth_info(p_result, inst, request, inst->conn, t->fd);
@@ -331,8 +331,8 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_sigtran_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sigtran_t);
-	CONF_SECTION const *conf = mctx->inst->conf;
+	rlm_sigtran_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_sigtran_t);
+	CONF_SECTION const *conf = mctx->mi->conf;
 
 	/*
 	 *	Translate traffic mode string to integer
@@ -397,7 +397,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_sigtran_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sigtran_t);
+	rlm_sigtran_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_sigtran_t);
 
 	/*
 	 *	If we're just checking the config we didn't start the
diff --git a/src/modules/rlm_smtp/rlm_smtp.c b/src/modules/rlm_smtp/rlm_smtp.c
index 8d33321707..7e722eed99 100644
--- a/src/modules/rlm_smtp/rlm_smtp.c
+++ b/src/modules/rlm_smtp/rlm_smtp.c
@@ -584,7 +584,7 @@ static void smtp_io_module_signal(module_ctx_t const *mctx, request_t *request,
  */
 static unlang_action_t smtp_io_module_resume(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_smtp_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_smtp_t);
+	rlm_smtp_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_smtp_t);
 	fr_curl_io_request_t     	*randle = talloc_get_type_abort(mctx->rctx, fr_curl_io_request_t);
 	fr_curl_tls_t const		*tls = &inst->tls;
 	long 				curl_out;
@@ -631,7 +631,7 @@ static unlang_action_t smtp_io_module_resume(rlm_rcode_t *p_result, module_ctx_t
  */
 static unlang_action_t CC_HINT(nonnull) mod_mail(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_smtp_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_smtp_t);
+	rlm_smtp_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_smtp_t);
 	rlm_smtp_thread_t       	*t = talloc_get_type_abort(mctx->thread, rlm_smtp_thread_t);
 	rlm_smtp_env_t			*call_env = talloc_get_type_abort(mctx->env_data, rlm_smtp_env_t);
 	fr_curl_io_request_t     	*randle = NULL;
@@ -776,7 +776,7 @@ static unlang_action_t CC_HINT(nonnull(1,2)) mod_authenticate(rlm_rcode_t *p_res
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_smtp_t			*inst = talloc_get_type_abort(mctx->inst->data, rlm_smtp_t);
+	rlm_smtp_t			*inst = talloc_get_type_abort(mctx->mi->data, rlm_smtp_t);
 
 	inst->conn_config.reuse.num_children = 1;
 	inst->conn_config.reuse.child_pool_size = sizeof(fr_mail_ctx_t);
@@ -901,7 +901,7 @@ static int smtp_persist_conn_init(fr_curl_io_request_t *randle, void *uctx)
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_smtp_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_smtp_t);
+	rlm_smtp_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_smtp_t);
 	rlm_smtp_thread_t    	*t = talloc_get_type_abort(mctx->thread, rlm_smtp_thread_t);
 	fr_curl_handle_t    	*mhandle;
 
diff --git a/src/modules/rlm_sometimes/rlm_sometimes.c b/src/modules/rlm_sometimes/rlm_sometimes.c
index 2bf85cc0f6..c0b190f227 100644
--- a/src/modules/rlm_sometimes/rlm_sometimes.c
+++ b/src/modules/rlm_sometimes/rlm_sometimes.c
@@ -48,8 +48,8 @@ static const conf_parser_t module_config[] = {
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_sometimes_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sometimes_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_sometimes_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_sometimes_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	/*
 	 *	Convert the rcode string to an int, and get rid of it
@@ -74,7 +74,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 static unlang_action_t sometimes_return(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request,
 					fr_packet_t *packet, fr_packet_t *reply)
 {
-	rlm_sometimes_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_sometimes_t);
+	rlm_sometimes_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_sometimes_t);
 	uint32_t		hash;
 	fr_pair_t		*vp;
 	float			value;
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
index 8d6da1ab54..9943ed03c9 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
@@ -709,7 +709,7 @@ static int sql_affected_rows(UNUSED rlm_sql_handle_t *handle, UNUSED rlm_sql_con
 
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_sql_cassandra_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_cassandra_t);
+	rlm_sql_cassandra_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_cassandra_t);
 
 	if (inst->ssl) cass_ssl_free(inst->ssl);
 	if (inst->session) cass_session_free(inst->session);	/* also synchronously closes the session */
@@ -722,9 +722,9 @@ static int mod_detach(module_detach_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_sql_t const		*parent = talloc_get_type_abort(mctx->inst->parent->data, rlm_sql_t);
+	rlm_sql_t const		*parent = talloc_get_type_abort(mctx->mi->parent->data, rlm_sql_t);
 	rlm_sql_config_t const	*config = &parent->config;
-	rlm_sql_cassandra_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_cassandra_t);
+	rlm_sql_cassandra_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_cassandra_t);
 	bool			do_tls = false;
 	bool			do_latency_aware_routing = false;
 	CassCluster 		*cluster;
@@ -749,8 +749,8 @@ do {\
 	 *	This has to be done before we call cf_section_parse
 	 *	as it sets default values, and creates the section.
 	 */
-	if (cf_section_find(mctx->inst->conf, "tls", NULL)) do_tls = true;
-	if (cf_section_find(mctx->inst->conf, "latency_aware_routing", NULL)) do_latency_aware_routing = true;
+	if (cf_section_find(mctx->mi->conf, "tls", NULL)) do_tls = true;
+	if (cf_section_find(mctx->mi->conf, "latency_aware_routing", NULL)) do_latency_aware_routing = true;
 
 	DEBUG4("Configuring CassCluster structure");
 	cluster = inst->cluster = cass_cluster_new();
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index b14fc5af48..849711c355 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -143,7 +143,7 @@ static int _sql_socket_destructor(rlm_sql_mysql_conn_t *conn)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_sql_mysql_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_mysql_t);
+	rlm_sql_mysql_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_mysql_t);
 	int			warnings;
 
 	warnings = fr_table_value_by_str(server_warnings_table, inst->warnings_str, -1);
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
index 267c612aa2..56fe6a65fa 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
@@ -157,7 +157,7 @@ static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED si
 
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_sql_oracle_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_oracle_t);
+	rlm_sql_oracle_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_oracle_t);
 
 	if (inst->pool) OCISessionPoolDestroy((dvoid *)inst->pool, (dvoid *)inst->error, OCI_DEFAULT );
 	if (inst->error) OCIHandleFree((dvoid *)inst->error, OCI_HTYPE_ERROR);
@@ -168,15 +168,15 @@ static int mod_detach(module_detach_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_sql_t const		*parent = talloc_get_type_abort(mctx->inst->parent->data, rlm_sql_t);
+	rlm_sql_t const		*parent = talloc_get_type_abort(mctx->mi->parent->data, rlm_sql_t);
 	rlm_sql_config_t const	*config = &parent->config;
-	rlm_sql_oracle_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_oracle_t);
+	rlm_sql_oracle_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_oracle_t);
 	char  			errbuff[512];
 	sb4 			errcode = 0;
 	OraText 		*sql_password = NULL;
 	OraText 		*sql_login = NULL;
 
-	if (!cf_section_find(mctx->inst->conf, "spool", NULL)) {
+	if (!cf_section_find(mctx->mi->conf, "spool", NULL)) {
 		ERROR("Couldn't load mctx->configuration of session pool(\"spool\" section in driver mctx->config)");
 		return RLM_SQL_ERROR;
 	}
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index ee26f06a7c..364de3453a 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -546,9 +546,9 @@ static size_t sql_escape_func(request_t *request, char *out, size_t outlen, char
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_sql_t const		*parent = talloc_get_type_abort(mctx->inst->parent->data, rlm_sql_t);
+	rlm_sql_t const		*parent = talloc_get_type_abort(mctx->mi->parent->data, rlm_sql_t);
 	rlm_sql_config_t const	*config = &parent->config;
-	rlm_sql_postgresql_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_postgresql_t);
+	rlm_sql_postgresql_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_postgresql_t);
 	char 			application_name[NAMEDATALEN];
 	char			*db_string;
 
@@ -559,7 +559,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 		CONF_SECTION	*cs;
 		char const	*name;
 
-		cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+		cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 
 		name = cf_section_name2(cs);
 		if (!name) name = cf_section_name1(cs);
@@ -647,7 +647,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	{
 		CONF_SECTION *cs;
 
-		cs = cf_section_find(mctx->inst->conf, "states", NULL);
+		cs = cf_section_find(mctx->mi->conf, "states", NULL);
 		if (cs && (sql_state_entries_from_cs(inst->states, cs) < 0)) return -1;
 	}
 
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index 8d3d44208b..52500df2c0 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -670,9 +670,9 @@ static int sql_affected_rows(rlm_sql_handle_t *handle,
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_sql_t const		*parent = talloc_get_type_abort(mctx->inst->parent->data, rlm_sql_t);
+	rlm_sql_t const		*parent = talloc_get_type_abort(mctx->mi->parent->data, rlm_sql_t);
 	rlm_sql_config_t const	*config = &parent->config;
-	rlm_sql_sqlite_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_sqlite_t);
+	rlm_sql_sqlite_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_sqlite_t);
 	bool			exists;
 	struct stat		buf;
 	int			fd;
@@ -700,7 +700,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 		return -1;
 	}
 
-	if (cf_pair_find(mctx->inst->conf, "bootstrap")) {
+	if (cf_pair_find(mctx->mi->conf, "bootstrap")) {
 		inst->bootstrap = true;
 	}
 
@@ -719,10 +719,10 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 		if (p) {
 			size_t len = (p - inst->filename) + 1;
 
-			buff = talloc_array(mctx->inst->conf, char, len);
+			buff = talloc_array(mctx->mi->conf, char, len);
 			strlcpy(buff, inst->filename, len);
 		} else {
-			MEM(buff = talloc_typed_strdup(mctx->inst->conf, inst->filename));
+			MEM(buff = talloc_typed_strdup(mctx->mi->conf, inst->filename));
 		}
 
 		ret = fr_mkdir(NULL, buff, -1, 0700, NULL, NULL);
@@ -756,13 +756,13 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 		/*
 		 *	Execute multiple bootstrap SQL files in order
 		 */
-		for (cp = cf_pair_find(mctx->inst->conf, "bootstrap");
+		for (cp = cf_pair_find(mctx->mi->conf, "bootstrap");
 		     cp;
-		     cp = cf_pair_find_next(mctx->inst->conf, cp, "bootstrap")) {
+		     cp = cf_pair_find_next(mctx->mi->conf, cp, "bootstrap")) {
 			p = cf_pair_value(cp);
 			if (!p) continue;
 
-			ret = sql_loadfile(mctx->inst->conf, db, p);
+			ret = sql_loadfile(mctx->mi->conf, db, p);
 			if (ret < 0) goto unlink;
 		}
 
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 7986477480..b182f8dea5 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -27,7 +27,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exfile.h>
@@ -376,7 +376,7 @@ static xlat_action_t sql_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 	sql_xlat_call_env_t	*call_env = talloc_get_type_abort(xctx->env_data, sql_xlat_call_env_t);
 	rlm_sql_handle_t	*handle = NULL;
 	rlm_sql_row_t		row;
-	rlm_sql_t const		*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_sql_t);
+	rlm_sql_t const		*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_sql_t);
 	sql_rcode_t		rcode;
 	xlat_action_t		ret = XLAT_ACTION_DONE;
 	char const		*p;
@@ -939,7 +939,7 @@ static xlat_action_t sql_group_xlat_resume(TALLOC_CTX *ctx, fr_dcursor_t *out, x
 					   request_t *request, fr_value_box_list_t *in)
 {
 	sql_group_xlat_ctx_t	*xlat_ctx = talloc_get_type_abort(xctx->rctx, sql_group_xlat_ctx_t);
-	rlm_sql_t const		*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_sql_t);
+	rlm_sql_t const		*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_sql_t);
 	fr_value_box_t		*arg = fr_value_box_list_head(in);
 	char const		*p = arg->vb_strvalue;
 	fr_value_box_t		*query, *vb;
@@ -970,7 +970,7 @@ static xlat_action_t sql_group_xlat(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t
 {
 	sql_group_xlat_call_env_t	*call_env = talloc_get_type_abort(xctx->env_data, sql_group_xlat_call_env_t);
 	sql_group_xlat_ctx_t		*xlat_ctx;
-	rlm_sql_t const			*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_sql_t);
+	rlm_sql_t const			*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_sql_t);
 
 	if (!call_env->membership_query) {
 		RWARN("Cannot check group membership - group_membership_query not set");
@@ -1386,7 +1386,7 @@ static unlang_action_t mod_authorize_resume(rlm_rcode_t *p_result, int *priority
  */
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_sql_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_sql_t);
+	rlm_sql_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_sql_t);
 	sql_autz_call_env_t	*call_env = talloc_get_type_abort(mctx->env_data, sql_autz_call_env_t);
 	sql_autz_ctx_t		*autz_ctx;
 
@@ -1564,7 +1564,7 @@ next:
  */
 static unlang_action_t CC_HINT(nonnull) mod_sql_redundant(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_sql_t const			*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_sql_t);
+	rlm_sql_t const			*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_sql_t);
 	sql_redundant_call_env_t	*call_env = talloc_get_type_abort(mctx->env_data, sql_redundant_call_env_t);
 	sql_redundant_ctx_t		*redundant_ctx;
 
@@ -1746,7 +1746,7 @@ static int query_call_env_parse(TALLOC_CTX *ctx, call_env_parsed_head_t *out, tm
 
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_sql_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_t);
+	rlm_sql_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_t);
 
 	if (inst->pool) fr_pool_free(inst->pool);
 
@@ -1765,13 +1765,13 @@ static int mod_detach(module_detach_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_sql_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_sql_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	xlat_t			*xlat;
 	xlat_arg_parser_t	*sql_xlat_arg;
 	rlm_sql_escape_uctx_t	*uctx;
 
-	inst->name = mctx->inst->name;	/* Need this for functions in sql.c */
+	inst->name = mctx->mi->name;	/* Need this for functions in sql.c */
 	inst->driver = (rlm_sql_driver_t const *)inst->driver_submodule->module->exported; /* Public symbol exported by the submodule */
 
 	/*
@@ -1785,7 +1785,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 		if (inst->config.group_attribute) {
 			group_attribute = inst->config.group_attribute;
 		} else if (cf_section_name2(conf)) {
-			snprintf(buffer, sizeof(buffer), "%s-SQL-Group", mctx->inst->name);
+			snprintf(buffer, sizeof(buffer), "%s-SQL-Group", mctx->mi->name);
 			group_attribute = buffer;
 		} else {
 			group_attribute = "SQL-Group";
@@ -1836,7 +1836,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	 */
 	xlat = xlat_func_register_module(inst, mctx, NULL, sql_xlat, FR_TYPE_VOID);	/* Returns an integer sometimes */
 	if (!xlat) {
-		cf_log_perr(conf, "Failed registering %s expansion", mctx->inst->name);
+		cf_log_perr(conf, "Failed registering %s expansion", mctx->mi->name);
 		return -1;
 	}
 	xlat_func_call_env_set(xlat, &xlat_method_env);
@@ -1861,15 +1861,15 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 	/*
 	 *	Register the SQL map processor function
 	 */
-	if (inst->driver->sql_fields) map_proc_register(inst, mctx->inst->name, mod_map_proc, sql_map_verify, 0, (fr_value_box_safe_for_t)inst->driver);
+	if (inst->driver->sql_fields) map_proc_register(inst, mctx->mi->name, mod_map_proc, sql_map_verify, 0, (fr_value_box_safe_for_t)inst->driver);
 
 	return 0;
 }
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_sql_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sql_t);
-	CONF_SECTION	*conf = mctx->inst->conf;
+	rlm_sql_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sql_t);
+	CONF_SECTION	*conf = mctx->mi->conf;
 
 	/*
 	 *	We need authorize_group_check_query or authorize_group_reply_query
diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index da73b8ac03..6aeeb87da5 100644
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -383,7 +383,7 @@ static unlang_action_t mod_authorize_resume(rlm_rcode_t *p_result, UNUSED int *p
  */
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_sqlcounter_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlcounter_t);
+	rlm_sqlcounter_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sqlcounter_t);
 	sqlcounter_call_env_t	*env = talloc_get_type_abort(mctx->env_data, sqlcounter_call_env_t);
 	fr_pair_t		*limit, *vp;
 	sqlcounter_rctx_t	*rctx;
@@ -452,8 +452,8 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_sqlcounter_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlcounter_t);
-	CONF_SECTION    	*conf = mctx->inst->conf;
+	rlm_sqlcounter_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sqlcounter_t);
+	CONF_SECTION    	*conf = mctx->mi->conf;
 
 	fr_assert(inst->query && *inst->query);
 
@@ -491,8 +491,8 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_sqlcounter_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlcounter_t);
-	CONF_SECTION    	*conf = mctx->inst->conf;
+	rlm_sqlcounter_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sqlcounter_t);
+	CONF_SECTION    	*conf = mctx->mi->conf;
 	fr_dict_attr_flags_t	flags = (fr_dict_attr_flags_t) { .internal = 1, .length = 8 };
 	module_instance_t const	*sql_inst;
 
diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index d7de3eb016..2d877488ec 100644
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -225,8 +225,8 @@ finish:
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_sqlippool_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t);
-	inst->name = talloc_asprintf(inst, "%s - %s", mctx->inst->name, inst->sql_name);
+	rlm_sqlippool_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_sqlippool_t);
+	inst->name = talloc_asprintf(inst, "%s - %s", mctx->mi->name, inst->sql_name);
 
 	return 0;
 }
@@ -244,8 +244,8 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
 	module_instance_t	*sql;
-	rlm_sqlippool_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_sqlippool_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_sqlippool_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	sql = module_rlm_by_name(NULL, inst->sql_name);
 	if (!sql) {
@@ -474,7 +474,7 @@ static unlang_action_t mod_alloc_resume(rlm_rcode_t *p_result, UNUSED int *prior
  */
 static unlang_action_t CC_HINT(nonnull) mod_alloc(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_sqlippool_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t);
+	rlm_sqlippool_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_sqlippool_t);
 	ippool_alloc_call_env_t	*env = talloc_get_type_abort(mctx->env_data, ippool_alloc_call_env_t);
 	rlm_sql_t const		*sql = inst->sql;
 	rlm_sql_handle_t	*handle;
@@ -549,7 +549,7 @@ static unlang_action_t CC_HINT(nonnull) mod_alloc(rlm_rcode_t *p_result, module_
  */
 static unlang_action_t CC_HINT(nonnull) mod_common(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_sqlippool_t			*inst = talloc_get_type_abort(mctx->inst->data, rlm_sqlippool_t);
+	rlm_sqlippool_t			*inst = talloc_get_type_abort(mctx->mi->data, rlm_sqlippool_t);
 	ippool_common_call_env_t	*env = talloc_get_type_abort(mctx->env_data, ippool_common_call_env_t);
 	rlm_sql_t const			*sql = inst->sql;
 	rlm_sql_handle_t		*handle;
diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c
index 5d9f42778c..91e117b835 100644
--- a/src/modules/rlm_stats/rlm_stats.c
+++ b/src/modules/rlm_stats/rlm_stats.c
@@ -163,7 +163,7 @@ static void coalesce(uint64_t final_stats[FR_RADIUS_CODE_MAX], rlm_stats_thread_
  */
 static unlang_action_t CC_HINT(nonnull) mod_stats(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_stats_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_stats_t);
+	rlm_stats_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_stats_t);
 	rlm_stats_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_stats_thread_t);
 	int			i;
 	uint32_t		stats_type;
@@ -360,7 +360,7 @@ static int8_t data_cmp(const void *one, const void *two)
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_stats_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_stats_t);
+	rlm_stats_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_stats_t);
 	rlm_stats_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_stats_thread_t);
 
 	(void) talloc_set_type(t, rlm_stats_thread_t);
@@ -407,7 +407,7 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_stats_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_stats_t);
+	rlm_stats_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_stats_t);
 
 	pthread_mutex_init(&inst->mutex, NULL);
 	fr_dlist_init(&inst->list, rlm_stats_thread_t, entry);
@@ -421,7 +421,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_stats_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_stats_t);
+	rlm_stats_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_stats_t);
 
 	pthread_mutex_destroy(&inst->mutex);
 
diff --git a/src/modules/rlm_tacacs/rlm_tacacs.c b/src/modules/rlm_tacacs/rlm_tacacs.c
index 87d4146270..24b30ab88f 100644
--- a/src/modules/rlm_tacacs/rlm_tacacs.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs.c
@@ -130,7 +130,7 @@ static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *parent,
 
 static void mod_tacacs_signal(module_ctx_t const *mctx, request_t *request, fr_signal_t action)
 {
-	rlm_tacacs_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_tacacs_t);
+	rlm_tacacs_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_tacacs_t);
 	rlm_tacacs_io_t	const	*io = (rlm_tacacs_io_t const *)inst->io_submodule->module;		/* Public symbol exported by the module */
 
 	/*
@@ -151,7 +151,7 @@ static void mod_tacacs_signal(module_ctx_t const *mctx, request_t *request, fr_s
  */
 static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_tacacs_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_tacacs_t);
+	rlm_tacacs_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_tacacs_t);
 	rlm_rcode_t		rcode;
 	unlang_action_t		ua;
 
@@ -188,10 +188,10 @@ static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, modul
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
 	size_t i, num_types;
-	rlm_tacacs_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_tacacs_t);
+	rlm_tacacs_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_tacacs_t);
 
 	inst->io = (rlm_tacacs_io_t const *)inst->io_submodule->module;	/* Public symbol exported by the module */
-	inst->name = mctx->inst->name;
+	inst->name = mctx->mi->name;
 
 	/*
 	 *	These limits are specific to TACACS, and cannot be over-ridden, due to 8-bit ID fields!
diff --git a/src/modules/rlm_tacacs/rlm_tacacs_tcp.c b/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
index 2bb33c8301..3d60240938 100644
--- a/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
@@ -1425,7 +1425,7 @@ static unlang_action_t mod_enqueue(rlm_rcode_t *p_result, void **rctx_out, UNUSE
  */
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_tacacs_tcp_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_tacacs_tcp_t);
+	rlm_tacacs_tcp_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_tacacs_tcp_t);
 	udp_thread_t			*thread = talloc_get_type_abort(mctx->thread, udp_thread_t);
 
 	static fr_trunk_io_funcs_t	io_funcs = {
@@ -1467,9 +1467,9 @@ static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_tacacs_t		*parent = talloc_get_type_abort(mctx->inst->parent->data, rlm_tacacs_t);
-	rlm_tacacs_tcp_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_tacacs_tcp_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_tacacs_t		*parent = talloc_get_type_abort(mctx->mi->parent->data, rlm_tacacs_t);
+	rlm_tacacs_tcp_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_tacacs_tcp_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 
 	if (!parent) {
 		ERROR("IO module cannot be instantiated directly");
diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index 9a7f6e8439..d12928183f 100644
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module_rlm.h>
@@ -418,7 +418,7 @@ static xlat_action_t test_xlat_fail(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t
 
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_test_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_test_t);
+	rlm_test_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_test_t);
 	rlm_test_thread_t *t = talloc_get_type_abort(mctx->thread, rlm_test_thread_t);
 
 	t->inst = inst;
@@ -451,7 +451,7 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_test_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_test_t);
+	rlm_test_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_test_t);
 	xlat_t *xlat;
 
 	/*
diff --git a/src/modules/rlm_totp/rlm_totp.c b/src/modules/rlm_totp/rlm_totp.c
index 8a292c3a3b..fe5059c6db 100644
--- a/src/modules/rlm_totp/rlm_totp.c
+++ b/src/modules/rlm_totp/rlm_totp.c
@@ -73,8 +73,8 @@ static const conf_parser_t module_config[] = {
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_totp_t   *inst = talloc_get_type_abort(mctx->inst->data, rlm_totp_t);
-	CONF_SECTION *conf = mctx->inst->conf;
+	rlm_totp_t   *inst = talloc_get_type_abort(mctx->mi->data, rlm_totp_t);
+	CONF_SECTION *conf = mctx->mi->conf;
 
 	inst->name = cf_section_name2(conf);
 	if (!inst->name) inst->name = cf_section_name1(conf);
@@ -94,7 +94,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_totp_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_totp_t);
+	rlm_totp_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_totp_t);
 
 	FR_INTEGER_BOUND_CHECK("time_step", inst->totp.time_step, >=, 5);
 	FR_INTEGER_BOUND_CHECK("time_step", inst->totp.time_step, <=, 120);
@@ -120,7 +120,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
 	rlm_totp_call_env_t	*env_data = talloc_get_type_abort(mctx->env_data, rlm_totp_call_env_t);
-	rlm_totp_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_totp_t);
+	rlm_totp_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_totp_t);
 	fr_value_box_t		*user_password = &env_data->user_password;
 	fr_value_box_t		*secret = &env_data->secret;
 	fr_value_box_t		*key = &env_data->key;
diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c
index f6c77c5aa8..3cacc7b742 100644
--- a/src/modules/rlm_unbound/rlm_unbound.c
+++ b/src/modules/rlm_unbound/rlm_unbound.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module_rlm.h>
@@ -348,7 +348,7 @@ static xlat_action_t xlat_unbound(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				  xlat_ctx_t const *xctx,
 				  request_t *request, fr_value_box_list_t *in)
 {
-	rlm_unbound_t const		*inst = talloc_get_type_abort_const(xctx->mctx->inst->data, rlm_unbound_t);
+	rlm_unbound_t const		*inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_unbound_t);
 	rlm_unbound_thread_t		*t = talloc_get_type_abort(xctx->mctx->thread, rlm_unbound_thread_t);
 	fr_value_box_t			*host_vb = fr_value_box_list_head(in);
 	fr_value_box_t			*query_vb = fr_value_box_list_next(in, host_vb);
@@ -421,7 +421,7 @@ static xlat_action_t xlat_unbound(TALLOC_CTX *ctx, fr_dcursor_t *out,
 
 static int mod_thread_instantiate(module_thread_inst_ctx_t const *mctx)
 {
-	rlm_unbound_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_unbound_t);
+	rlm_unbound_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_unbound_t);
 	rlm_unbound_thread_t	*t = talloc_get_type_abort(mctx->thread, rlm_unbound_thread_t);
 	int			res;
 
@@ -486,13 +486,13 @@ static int mod_thread_detach(module_thread_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_unbound_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_unbound_t);
+	rlm_unbound_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_unbound_t);
 	xlat_t		*xlat;
 
-	inst->name = mctx->inst->name;
+	inst->name = mctx->mi->name;
 
 	if (inst->timeout > 10000) {
-		cf_log_err(mctx->inst->conf, "timeout must be 0 to 10000");
+		cf_log_err(mctx->mi->conf, "timeout must be 0 to 10000");
 		return -1;
 	}
 
diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index e2f6bf5d57..46ee5a6050 100644
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -26,7 +26,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX mctx->inst->name
+#define LOG_PREFIX mctx->mi->name
 
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/server/base.h>
@@ -162,7 +162,7 @@ static xlat_action_t unix_group_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     xlat_ctx_t const *xctx,
 				     request_t *request, fr_value_box_list_t *in)
 {
-	rlm_unix_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_unix_t);
+	rlm_unix_t const	*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_unix_t);
 	fr_value_box_t		*arg = fr_value_box_list_head(in);
 	char const		*p = arg->vb_strvalue;
 	fr_value_box_t		*vb;
@@ -182,7 +182,7 @@ static xlat_action_t unix_group_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_unix_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_unix_t);
+	rlm_unix_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_unix_t);
 	xlat_t			*xlat;
 	xlat_arg_parser_t	*xlat_arg;
 
@@ -373,7 +373,7 @@ static char *uue(void *in)
  */
 static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_unix_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_unix_t);
+	rlm_unix_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_unix_t);
 	fr_pair_t		*vp;
 	FILE			*fp;
 	struct utmp		ut;
diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index 28727dc056..d4d4efb43b 100644
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -163,7 +163,7 @@ static unlang_action_t CC_HINT(nonnull) mod_preacct(rlm_rcode_t *p_result, modul
  */
 static unlang_action_t CC_HINT(nonnull) mod_post_auth(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_wimax_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_wimax_t);
+	rlm_wimax_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_wimax_t);
 	fr_pair_t		*msk, *emsk, *vp;
 	fr_pair_t		*mn_nai, *ip, *fa_rk;
 	EVP_MD_CTX		*hmac_ctx;
diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c
index c9a1063ae8..040eafc607 100644
--- a/src/modules/rlm_winbind/rlm_winbind.c
+++ b/src/modules/rlm_winbind/rlm_winbind.c
@@ -243,7 +243,7 @@ static xlat_action_t winbind_group_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				     xlat_ctx_t const *xctx,
 				     request_t *request, fr_value_box_list_t *in)
 {
-	rlm_winbind_t const	*inst = talloc_get_type_abort(xctx->mctx->inst->data, rlm_winbind_t);
+	rlm_winbind_t const	*inst = talloc_get_type_abort(xctx->mctx->mi->data, rlm_winbind_t);
 	winbind_group_xlat_call_env_t	*env = talloc_get_type_abort(xctx->env_data, winbind_group_xlat_call_env_t);
 	fr_value_box_t		*arg = fr_value_box_list_head(in);
 	char const		*p = arg->vb_strvalue;
@@ -315,8 +315,8 @@ static xlat_arg_parser_t const winbind_group_xlat_arg[] = {
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_winbind_t			*inst = talloc_get_type_abort(mctx->inst->data, rlm_winbind_t);
-	CONF_SECTION			*conf = mctx->inst->conf;
+	rlm_winbind_t			*inst = talloc_get_type_abort(mctx->mi->data, rlm_winbind_t);
+	CONF_SECTION			*conf = mctx->mi->conf;
 
 	inst->wb_pool = module_rlm_connection_pool_init(conf, inst, mod_conn_create, NULL, NULL, NULL, NULL);
 	if (!inst->wb_pool) {
@@ -324,10 +324,10 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 		return -1;
 	}
 
-	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->inst->name, -1);
+	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, mctx->mi->name, -1);
 	if (!inst->auth_type) {
 		WARN("Failed to find 'authenticate %s {...}' section.  Winbind authentication will likely not work",
-		     mctx->inst->name);
+		     mctx->mi->name);
 	}
 
 	return 0;
@@ -343,7 +343,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
  */
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_winbind_t *inst = talloc_get_type_abort(mctx->inst->data, rlm_winbind_t);
+	rlm_winbind_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_winbind_t);
 
 	fr_pool_free(inst->wb_pool);
 
@@ -364,7 +364,7 @@ static int mod_detach(module_detach_ctx_t const *mctx)
  */
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_winbind_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_winbind_t);
+	rlm_winbind_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_winbind_t);
 	winbind_autz_call_env_t	*env = talloc_get_type_abort(mctx->env_data, winbind_autz_call_env_t);
 	fr_pair_t		*vp;
 
@@ -377,7 +377,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 
 	if (!inst->auth_type) {
 		WARN("No 'authenticate %s {...}' section or 'Auth-Type = %s' set.  Cannot setup Winbind authentication",
-		     mctx->inst->name, mctx->inst->name);
+		     mctx->mi->name, mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -395,7 +395,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
  */
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_winbind_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_winbind_t);
+	rlm_winbind_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_winbind_t);
 	winbind_auth_call_env_t	*env = talloc_get_type_abort(mctx->env_data, winbind_auth_call_env_t);
 
 	/*
@@ -537,8 +537,8 @@ static const call_env_method_t winbind_group_xlat_call_env = {
  */
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_winbind_t		*inst = talloc_get_type_abort(mctx->inst->data, rlm_winbind_t);
-	CONF_SECTION		*conf = mctx->inst->conf;
+	rlm_winbind_t		*inst = talloc_get_type_abort(mctx->mi->data, rlm_winbind_t);
+	CONF_SECTION		*conf = mctx->mi->conf;
 	xlat_t			*xlat;
 
 	/*
diff --git a/src/modules/rlm_yubikey/decrypt.c b/src/modules/rlm_yubikey/decrypt.c
index 9fdb0ef094..3fd970ccc5 100644
--- a/src/modules/rlm_yubikey/decrypt.c
+++ b/src/modules/rlm_yubikey/decrypt.c
@@ -20,7 +20,7 @@
  */
 unlang_action_t rlm_yubikey_decrypt(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request, char const *passcode)
 {
-	rlm_yubikey_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_yubikey_t);
+	rlm_yubikey_t const *inst = talloc_get_type_abort(mctx->mi->data, rlm_yubikey_t);
 	uint32_t counter, timestamp;
 	yubikey_token_st token;
 
diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c
index 4877b1e167..3a59db4356 100644
--- a/src/modules/rlm_yubikey/rlm_yubikey.c
+++ b/src/modules/rlm_yubikey/rlm_yubikey.c
@@ -194,10 +194,10 @@ static void mod_unload(void)
 #ifndef HAVE_YUBIKEY
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	rlm_yubikey_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_yubikey_t);
+	rlm_yubikey_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_yubikey_t);
 
 	if (inst->decrypt) {
-		cf_log_err(mctx->inst->conf, "Requires libyubikey for OTP decryption");
+		cf_log_err(mctx->mi->conf, "Requires libyubikey for OTP decryption");
 		return -1;
 	}
 	return 0;
@@ -216,15 +216,15 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
  */
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	rlm_yubikey_t	*inst = talloc_get_type_abort(mctx->inst->data, rlm_yubikey_t);
-	CONF_SECTION    *conf = mctx->inst->conf;
+	rlm_yubikey_t	*inst = talloc_get_type_abort(mctx->mi->data, rlm_yubikey_t);
+	CONF_SECTION    *conf = mctx->mi->conf;
 
-	inst->name = mctx->inst->name;
+	inst->name = mctx->mi->name;
 
 	inst->auth_type = fr_dict_enum_by_name(attr_auth_type, inst->name, -1);
 	if (!inst->auth_type) {
 		WARN("Failed to find 'authenticate %s {...}' section.  Yubikey authentication will likely not work",
-		     mctx->inst->name);
+		     mctx->mi->name);
 	}
 
 	if (inst->validate) {
@@ -252,7 +252,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 #ifdef HAVE_YKCLIENT
 static int mod_detach(module_detach_ctx_t const *mctx)
 {
-	rlm_yubikey_ykclient_detach(talloc_get_type_abort(mctx->inst->data, rlm_yubikey_t));
+	rlm_yubikey_ykclient_detach(talloc_get_type_abort(mctx->mi->data, rlm_yubikey_t));
 	return 0;
 }
 #endif
@@ -277,7 +277,7 @@ static int CC_HINT(nonnull) otp_string_valid(rlm_yubikey_t const *inst, char con
  */
 static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_yubikey_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_yubikey_t);
+	rlm_yubikey_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_yubikey_t);
 	char const		*passcode;
 	size_t			len;
 	fr_pair_t		*vp, *password;
@@ -367,7 +367,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 
 	if (!inst->auth_type) {
 		WARN("No 'authenticate %s {...}' section or 'Auth-Type = %s' set.  Cannot setup Yubikey authentication",
-		     mctx->inst->name, mctx->inst->name);
+		     mctx->mi->name, mctx->mi->name);
 		RETURN_MODULE_NOOP;
 	}
 
@@ -382,7 +382,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
  */
 static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 {
-	rlm_yubikey_t const	*inst = talloc_get_type_abort_const(mctx->inst->data, rlm_yubikey_t);
+	rlm_yubikey_t const	*inst = talloc_get_type_abort_const(mctx->mi->data, rlm_yubikey_t);
 	rlm_rcode_t		rcode = RLM_MODULE_NOOP;
 	char const		*passcode = NULL;
 	fr_pair_t const	*vp;
diff --git a/src/modules/rlm_yubikey/validate.c b/src/modules/rlm_yubikey/validate.c
index 5369f3cddd..0f5825c50d 100644
--- a/src/modules/rlm_yubikey/validate.c
+++ b/src/modules/rlm_yubikey/validate.c
@@ -149,7 +149,7 @@ int rlm_yubikey_ykclient_detach(rlm_yubikey_t *inst)
 unlang_action_t rlm_yubikey_validate(rlm_rcode_t *p_result, module_ctx_t const *mctx,
 				     request_t *request, char const *passcode)
 {
-	rlm_yubikey_t const *inst = talloc_get_type_abort(mctx->inst->data, rlm_yubikey_t);
+	rlm_yubikey_t const *inst = talloc_get_type_abort(mctx->mi->data, rlm_yubikey_t);
 	rlm_rcode_t rcode = RLM_MODULE_OK;
 	ykclient_rc status;
 	ykclient_handle_t *yandle;
diff --git a/src/process/arp/base.c b/src/process/arp/base.c
index 059e4a5e26..f826f20cc3 100644
--- a/src/process/arp/base.c
+++ b/src/process/arp/base.c
@@ -182,7 +182,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_arp_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_arp_t);
 	fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code));
 
 	request->component = "arp";
diff --git a/src/process/bfd/base.c b/src/process/bfd/base.c
index 7bcde3c7a5..50101113b9 100644
--- a/src/process/bfd/base.c
+++ b/src/process/bfd/base.c
@@ -231,7 +231,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_bfd_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_bfd_t);
 	fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code));
 
 	request->component = "bfd";
diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c
index aabf946f38..f6838260b1 100644
--- a/src/process/dhcpv4/base.c
+++ b/src/process/dhcpv4/base.c
@@ -394,7 +394,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_dhcpv4_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_dhcpv4_t);
 	fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code));
 
 	request->component = "dhcpv4";
diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c
index 1a8ea82268..5769e12cf0 100644
--- a/src/process/dhcpv6/base.c
+++ b/src/process/dhcpv6/base.c
@@ -416,7 +416,7 @@ RECV(for_any_server)
 {
 	CONF_SECTION			*cs;
 	fr_process_state_t const	*state;
-	process_dhcpv6_t const		*inst = mctx->inst->data;
+	process_dhcpv6_t const		*inst = mctx->mi->data;
 	process_dhcpv6_client_fields_t	*rctx = NULL;
 
 	PROCESS_TRACE;
@@ -451,7 +451,7 @@ RECV(for_this_server)
 {
 	CONF_SECTION			*cs;
 	fr_process_state_t const	*state;
-	process_dhcpv6_t const		*inst = mctx->inst->data;
+	process_dhcpv6_t const		*inst = mctx->mi->data;
 	process_dhcpv6_client_fields_t	*rctx;
 
 	PROCESS_TRACE;
@@ -594,7 +594,7 @@ void status_code_add(process_dhcpv6_t const *inst, request_t *request, fr_value_
  */
 RESUME(send_to_client)
 {
-	process_dhcpv6_t		*inst = talloc_get_type_abort(mctx->inst->data, process_dhcpv6_t);
+	process_dhcpv6_t		*inst = talloc_get_type_abort(mctx->mi->data, process_dhcpv6_t);
 	process_dhcpv6_client_fields_t	*fields = talloc_get_type_abort(mctx->rctx, process_dhcpv6_client_fields_t);
 	fr_process_state_t const	*state;
 
@@ -678,7 +678,7 @@ RECV(from_relay)
 {
 	CONF_SECTION			*cs;
 	fr_process_state_t const	*state;
-	process_dhcpv6_t const		*inst = mctx->inst->data;
+	process_dhcpv6_t const		*inst = mctx->mi->data;
 	process_dhcpv6_relay_fields_t	*rctx = NULL;
 
 	rctx = dhcpv6_relay_fields_store(request);
@@ -696,7 +696,7 @@ RECV(from_relay)
  */
 RESUME(send_to_relay)
 {
-	process_dhcpv6_t		*inst = talloc_get_type_abort(mctx->inst->data, process_dhcpv6_t);
+	process_dhcpv6_t		*inst = talloc_get_type_abort(mctx->mi->data, process_dhcpv6_t);
 	process_dhcpv6_relay_fields_t	*fields = talloc_get_type_abort(mctx->rctx, process_dhcpv6_relay_fields_t);
 	fr_process_state_t const	*state;
 
@@ -733,7 +733,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_dhcpv6_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_dhcpv6_t);
 	fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code));
 
 	request->component = "dhcpv6";
@@ -758,9 +758,9 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	process_dhcpv6_t	*inst = talloc_get_type_abort(mctx->inst->data, process_dhcpv6_t);
+	process_dhcpv6_t	*inst = talloc_get_type_abort(mctx->mi->data, process_dhcpv6_t);
 
-	inst->server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 
 	return 0;
 }
diff --git a/src/process/dns/base.c b/src/process/dns/base.c
index 9de8e062e1..387b3aff6c 100644
--- a/src/process/dns/base.c
+++ b/src/process/dns/base.c
@@ -388,7 +388,7 @@ RECV(request)
  */
 RESUME(recv_request)
 {
-	process_dns_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_dns_t);
+	process_dns_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_dns_t);
 	fr_process_state_t const	*state;
 	fr_pair_t			*rcode = NULL;
 
@@ -488,7 +488,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_dns_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_dns_t);
 	fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code));
 
 	request->component = "dns";
diff --git a/src/process/eap_aka/base.c b/src/process/eap_aka/base.c
index b506605dfa..89f54d5de7 100644
--- a/src/process/eap_aka/base.c
+++ b/src/process/eap_aka/base.c
@@ -235,7 +235,7 @@ static virtual_server_compile_t const compile_list[] = {
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 
 	inst->type = FR_EAP_METHOD_AKA;
 
diff --git a/src/process/eap_aka_prime/base.c b/src/process/eap_aka_prime/base.c
index 7877f99027..3edba89620 100644
--- a/src/process/eap_aka_prime/base.c
+++ b/src/process/eap_aka_prime/base.c
@@ -236,7 +236,7 @@ static virtual_server_compile_t const compile_list[] = {
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 
 	inst->type = FR_EAP_METHOD_AKA_PRIME;
 
diff --git a/src/process/eap_sim/base.c b/src/process/eap_sim/base.c
index 39241f859a..da67a4216f 100644
--- a/src/process/eap_sim/base.c
+++ b/src/process/eap_sim/base.c
@@ -223,7 +223,7 @@ static virtual_server_compile_t compile_list[] = {
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->inst->data, eap_aka_sim_process_conf_t);
+	eap_aka_sim_process_conf_t	*inst = talloc_get_type_abort(mctx->mi->data, eap_aka_sim_process_conf_t);
 
 	inst->type = FR_EAP_METHOD_SIM;
 
diff --git a/src/process/ldap_sync/base.c b/src/process/ldap_sync/base.c
index a36e06ae7b..7e065aacab 100644
--- a/src/process/ldap_sync/base.c
+++ b/src/process/ldap_sync/base.c
@@ -105,7 +105,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 {
 	fr_process_state_t const	*state;
 
-	(void) talloc_get_type_abort_const(mctx->inst->data, process_ldap_sync_t);
+	(void) talloc_get_type_abort_const(mctx->mi->data, process_ldap_sync_t);
 
 	PROCESS_TRACE;
 
diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 2dbae6f936..5d516abfee 100644
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -329,7 +329,7 @@ RESUME(generic_radius_response)
 
 RECV(access_request)
 {
-	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
+	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
 
 	/*
 	 *	Only reject if the state has already been thawed.
@@ -352,7 +352,7 @@ RESUME(access_request)
 	CONF_SECTION			*cs;
 	fr_dict_enum_value_t const		*dv;
 	fr_process_state_t const	*state;
-	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
+	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
 
 	PROCESS_TRACE;
 
@@ -555,7 +555,7 @@ RESUME(auth_type)
 RESUME(access_accept)
 {
 	fr_pair_t			*vp;
-	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
+	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
 
 	PROCESS_TRACE;
 
@@ -581,7 +581,7 @@ RESUME(access_accept)
 
 RESUME(access_reject)
 {
-	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
+	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
 
 	PROCESS_TRACE;
 
@@ -592,7 +592,7 @@ RESUME(access_reject)
 
 RESUME(access_challenge)
 {
-	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
+	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
 
 	PROCESS_TRACE;
 
@@ -655,7 +655,7 @@ RESUME(accounting_request)
 	CONF_SECTION			*cs;
 	fr_dict_enum_value_t const	*dv;
 	fr_process_state_t const	*state;
-	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
+	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
 
 	PROCESS_TRACE;
 
@@ -756,7 +756,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 {
 	fr_process_state_t const *state;
 
-	(void) talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
+	(void) talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
 
 	PROCESS_TRACE;
 
@@ -841,7 +841,7 @@ static xlat_action_t xlat_func_radius_secret_verify(TALLOC_CTX *ctx, fr_dcursor_
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	process_radius_t	*inst = talloc_get_type_abort(mctx->inst->data, process_radius_t);
+	process_radius_t	*inst = talloc_get_type_abort(mctx->mi->data, process_radius_t);
 
 	inst->auth.state_tree = fr_state_tree_init(inst, attr_state, main_config->spawn_workers, inst->auth.max_session,
 						   inst->auth.session_timeout, inst->auth.state_server_id,
@@ -852,9 +852,9 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	process_radius_t	*inst = talloc_get_type_abort(mctx->inst->data, process_radius_t);
+	process_radius_t	*inst = talloc_get_type_abort(mctx->mi->data, process_radius_t);
 
-	inst->server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 	if (virtual_server_section_attribute_define(inst->server_cs, "authenticate", attr_auth_type) < 0) return -1;
 
 	return 0;
diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index 05916dc6be..cbda6e4e83 100644
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -380,7 +380,7 @@ RESUME(auth_start)
 	CONF_SECTION			*cs;
 	fr_dict_enum_value_t const	*dv;
 	fr_process_state_t const	*state;
-	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
 	PROCESS_TRACE;
 
@@ -629,7 +629,7 @@ RESUME(auth_type)
 
 RESUME(auth_pass)
 {
-	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
 	PROCESS_TRACE;
 
@@ -641,7 +641,7 @@ RESUME(auth_pass)
 
 RESUME(auth_fail)
 {
-	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
 	PROCESS_TRACE;
 
@@ -654,7 +654,7 @@ RESUME(auth_fail)
 
 RESUME(auth_restart)
 {
-	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
 	PROCESS_TRACE;
 
@@ -664,7 +664,7 @@ RESUME(auth_restart)
 
 RESUME(auth_get)
 {
-	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 	process_tacacs_session_t	*session;
 	fr_pair_t			*vp, *copy;
 
@@ -753,7 +753,7 @@ send_reply:
 
 RECV(auth_cont)
 {
-	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 	process_tacacs_session_t	*session;
 
 	if ((state_create(request->request_ctx, &request->request_pairs, request, false) < 0) ||
@@ -821,7 +821,7 @@ RECV(auth_cont)
  */
 RECV(auth_cont_abort)
 {
-	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
 	if ((state_create(request->request_ctx, &request->request_pairs, request, false) < 0) ||
 	    (fr_state_to_request(inst->auth.state_tree, request) < 0)) {
@@ -958,7 +958,7 @@ RESUME(accounting_request)
 	CONF_SECTION			*cs;
 	fr_dict_enum_value_t const		*dv;
 	fr_process_state_t const	*state;
-	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
 	PROCESS_TRACE;
 
@@ -1030,7 +1030,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 	fr_assert(FR_TACACS_PACKET_CODE_VALID(request->packet->code));
 
 	request->component = "tacacs";
@@ -1053,7 +1053,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	process_tacacs_t	*inst = talloc_get_type_abort(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t	*inst = talloc_get_type_abort(mctx->mi->data, process_tacacs_t);
 
 	inst->auth.state_tree = fr_state_tree_init(inst, attr_tacacs_state, main_config->spawn_workers, inst->auth.max_session,
 						   inst->auth.session_timeout, inst->auth.state_server_id,
@@ -1063,9 +1063,9 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	process_tacacs_t	*inst = talloc_get_type_abort(mctx->inst->data, process_tacacs_t);
+	process_tacacs_t	*inst = talloc_get_type_abort(mctx->mi->data, process_tacacs_t);
 
-	inst->server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 	if (virtual_server_section_attribute_define(inst->server_cs, "authenticate", attr_auth_type) < 0) return -1;
 
 	FR_INTEGER_BOUND_CHECK("session.max_rounds", inst->auth.max_rounds, >=, 1);
diff --git a/src/process/test/base.c b/src/process/test/base.c
index 6aa05aaa2b..1a33ffdb79 100644
--- a/src/process/test/base.c
+++ b/src/process/test/base.c
@@ -91,7 +91,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_test_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_test_t);
 	fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code));
 
 	request->component = "test";
diff --git a/src/process/tls/base.c b/src/process/tls/base.c
index 85a68830b1..936daa9509 100644
--- a/src/process/tls/base.c
+++ b/src/process/tls/base.c
@@ -137,7 +137,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_tls_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_tls_t);
 
 	request->component = "tls";
 	request->module = NULL;
diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c
index 39623b0385..5f90270c7c 100644
--- a/src/process/ttls/base.c
+++ b/src/process/ttls/base.c
@@ -222,7 +222,7 @@ RESUME(access_request)
 	CONF_SECTION			*cs;
 	fr_dict_enum_value_t const	*dv;
 	fr_process_state_t const	*state;
-	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t);
+	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_ttls_t);
 
 	PROCESS_TRACE;
 
@@ -388,7 +388,7 @@ RESUME(auth_type)
 RESUME(access_accept)
 {
 	fr_pair_t			*vp;
-	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t);
+	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_ttls_t);
 
 	PROCESS_TRACE;
 
@@ -413,7 +413,7 @@ RESUME(access_accept)
 
 RESUME(access_reject)
 {
-	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t);
+	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_ttls_t);
 
 	PROCESS_TRACE;
 
@@ -425,7 +425,7 @@ RESUME(access_challenge)
 {
 	CONF_SECTION			*cs;
 	fr_process_state_t const	*state;
-	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t);
+	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_ttls_t);
 
 	PROCESS_TRACE;
 
@@ -486,7 +486,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 {
 	fr_process_state_t const *state;
 
-	(void) talloc_get_type_abort_const(mctx->inst->data, process_ttls_t);
+	(void) talloc_get_type_abort_const(mctx->mi->data, process_ttls_t);
 
 	PROCESS_TRACE;
 
@@ -505,7 +505,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 static int mod_instantiate(module_inst_ctx_t const *mctx)
 {
-	process_ttls_t	*inst = talloc_get_type_abort(mctx->inst->data, process_ttls_t);
+	process_ttls_t	*inst = talloc_get_type_abort(mctx->mi->data, process_ttls_t);
 
 	inst->auth.state_tree = fr_state_tree_init(inst, attr_state, main_config->spawn_workers, inst->auth.session.max,
 						   inst->auth.session.timeout, inst->auth.session.state_server_id,
@@ -516,9 +516,9 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
 static int mod_bootstrap(module_inst_ctx_t const *mctx)
 {
-	process_ttls_t	*inst = talloc_get_type_abort(mctx->inst->data, process_ttls_t);
+	process_ttls_t	*inst = talloc_get_type_abort(mctx->mi->data, process_ttls_t);
 
-	inst->server_cs = cf_item_to_section(cf_parent(mctx->inst->conf));
+	inst->server_cs = cf_item_to_section(cf_parent(mctx->mi->conf));
 	if (virtual_server_section_attribute_define(inst->server_cs, "authenticate", attr_auth_type) < 0) return -1;
 
 	return 0;
diff --git a/src/process/vmps/base.c b/src/process/vmps/base.c
index 3c8dcbe920..b602af1358 100644
--- a/src/process/vmps/base.c
+++ b/src/process/vmps/base.c
@@ -207,7 +207,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
 
 	PROCESS_TRACE;
 
-	(void)talloc_get_type_abort_const(mctx->inst->data, process_vmps_t);
+	(void)talloc_get_type_abort_const(mctx->mi->data, process_vmps_t);
 	fr_assert(PROCESS_PACKET_CODE_VALID(request->packet->code));
 
 	request->component = "vmps";