diff --git a/drivers/isimodem/audio-settings.c b/drivers/isimodem/audio-settings.c
index fd21dec1..86faa0b4 100644
--- a/drivers/isimodem/audio-settings.c
+++ b/drivers/isimodem/audio-settings.c
@@ -72,7 +72,7 @@ static void isi_call_verify_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_ind_subscribe(asd->client, CALL_SERVER_STATUS_IND,
 					isi_call_server_status_ind_cb,
diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c
index ea425e29..fbd892db 100644
--- a/drivers/isimodem/call-barring.c
+++ b/drivers/isimodem/call-barring.c
@@ -388,7 +388,7 @@ static void reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	ofono_call_barring_register(barr);
 }
diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c
index 888314de..294f4949 100644
--- a/drivers/isimodem/call-forwarding.c
+++ b/drivers/isimodem/call-forwarding.c
@@ -415,7 +415,7 @@ static void reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	ofono_call_forwarding_register(cf);
 }
diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c
index 9270f5fa..e9a4f608 100644
--- a/drivers/isimodem/call-settings.c
+++ b/drivers/isimodem/call-settings.c
@@ -363,7 +363,7 @@ static void reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	ofono_call_settings_register(cs);
 }
diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c
index 62dd2d1e..17c5e0bd 100644
--- a/drivers/isimodem/devinfo.c
+++ b/drivers/isimodem/devinfo.c
@@ -210,7 +210,7 @@ static void reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	ofono_devinfo_register(info);
 }
diff --git a/drivers/isimodem/gprs.c b/drivers/isimodem/gprs.c
index d4d7ebf7..d6b29a31 100644
--- a/drivers/isimodem/gprs.c
+++ b/drivers/isimodem/gprs.c
@@ -269,7 +269,7 @@ static void gpds_reachable_cb(const GIsiMessage *msg, void *opaque)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_ind_subscribe(gd->client, GPDS_DETACH_IND,
 					detach_ind_cb, gprs);
diff --git a/drivers/isimodem/isiutil.h b/drivers/isimodem/isiutil.h
index fa14821c..a5a880e6 100644
--- a/drivers/isimodem/isiutil.h
+++ b/drivers/isimodem/isiutil.h
@@ -58,7 +58,7 @@ static inline struct isi_cb_data *isi_cb_data_new(void *user, void *cb,
 		f(&e, ##args);				\
 	} while (0)
 
-#define ISI_VERSION_DBG(msg)					\
+#define ISI_RESOURCE_DBG(msg)					\
 	DBG("QSO: %s [0x%02X] v%03d.%03d",			\
 		pn_resource_name(g_isi_msg_resource((msg))),	\
 		g_isi_msg_resource((msg)),			\
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c
index 1a9bc9f0..cc48579f 100644
--- a/drivers/isimodem/network-registration.c
+++ b/drivers/isimodem/network-registration.c
@@ -974,7 +974,7 @@ static void pn_network_reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	if (nd == NULL || nd->client != NULL)
 		return;
@@ -1004,7 +1004,7 @@ static void pn_modem_network_reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	if (nd == NULL || nd->client != NULL)
 		return;
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c
index 4c68e31a..266bd053 100644
--- a/drivers/isimodem/phonebook.c
+++ b/drivers/isimodem/phonebook.c
@@ -299,7 +299,7 @@ static void reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	ofono_phonebook_register(pb);
 }
diff --git a/drivers/isimodem/radio-settings.c b/drivers/isimodem/radio-settings.c
index a2a521bb..1fb37982 100644
--- a/drivers/isimodem/radio-settings.c
+++ b/drivers/isimodem/radio-settings.c
@@ -287,7 +287,7 @@ static void wran_reachable_cb(const GIsiMessage *msg, void *opaque)
 	if (g_isi_msg_error(msg) < 0)
 		return;
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	rd->wran_object = g_isi_msg_object(msg);
 
@@ -309,7 +309,7 @@ static void gss_reachable_cb(const GIsiMessage *msg, void *opaque)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	ofono_radio_settings_register(rs);
 }
diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c
index f5fa75d0..722c9a50 100644
--- a/drivers/isimodem/sim.c
+++ b/drivers/isimodem/sim.c
@@ -876,7 +876,7 @@ static void sim_reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_verify(sd->sec_client, sec_reachable_cb, sim, NULL);
 }
diff --git a/drivers/isimodem/sms.c b/drivers/isimodem/sms.c
index 6f6b2477..edf99a78 100644
--- a/drivers/isimodem/sms.c
+++ b/drivers/isimodem/sms.c
@@ -653,7 +653,7 @@ static void sms_reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_verify(sd->sim, sim_reachable_cb, sms, NULL);
 }
diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c
index ee5c0958..ab49e3ad 100644
--- a/drivers/isimodem/ussd.c
+++ b/drivers/isimodem/ussd.c
@@ -231,7 +231,7 @@ static void ussd_reachable_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_ind_subscribe(ud->client, SS_GSM_USSD_RECEIVE_IND,
 					ussd_ind_cb, ussd);
diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 2cbd0460..ff1e2b58 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -1773,7 +1773,7 @@ static void call_verify_cb(const GIsiMessage *msg, void *data)
 		return;
 	}
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_ind_subscribe(ivc->client, CALL_STATUS_IND,
 					isi_call_status_ind_cb, ovc);
diff --git a/plugins/isiusb.c b/plugins/isiusb.c
index 7252d26a..69a6d603 100644
--- a/plugins/isiusb.c
+++ b/plugins/isiusb.c
@@ -207,7 +207,7 @@ static void reachable_cb(const GIsiMessage *msg, void *data)
 	if (!g_isi_msg_error(msg) < 0)
 		return;
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_ind_subscribe(isi->client, MTC_STATE_INFO_IND,
 					mtc_state_ind_cb, om);
diff --git a/plugins/n900.c b/plugins/n900.c
index b6af2cb2..44e2e75d 100644
--- a/plugins/n900.c
+++ b/plugins/n900.c
@@ -241,7 +241,7 @@ static void mtc_reachable_cb(const GIsiMessage *msg, void *data)
 	if (!g_isi_msg_error(msg) < 0)
 		return;
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_ind_subscribe(isi->client, MTC_STATE_INFO_IND,
 					mtc_state_ind_cb, modem);
diff --git a/plugins/u8500.c b/plugins/u8500.c
index d47d8545..3e9f22bd 100644
--- a/plugins/u8500.c
+++ b/plugins/u8500.c
@@ -235,7 +235,7 @@ static void reachable_cb(const GIsiMessage *msg, void *data)
 	if (!g_isi_msg_error(msg) < 0)
 		return;
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	g_isi_client_ind_subscribe(isi->client, MCE_MODEM_STATE_IND,
 					mce_state_ind_cb, om);
@@ -538,7 +538,7 @@ static void u8500_devinfo_reachable_cb(const GIsiMessage *msg, void *data)
 	if (g_isi_msg_error(msg) < 0)
 		return;
 
-	ISI_VERSION_DBG(msg);
+	ISI_RESOURCE_DBG(msg);
 
 	ofono_devinfo_register(info);
 }