9 files changed, 13 insertions, 13 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 64f47631..62fb10a0 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -995,7 +995,7 @@ function printbanner(session)
 	end
 end
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "console";
 	listener = console_listener;
 	default_port = 5582;
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index e9b24f69..dabed021 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -249,7 +249,7 @@ function listener.associate_session(conn, session)
 	sessions[conn] = session;
 end
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "c2s";
 	listener = listener;
 	default_port = 5222;
@@ -259,7 +259,7 @@ module:add_item("net-provider", {
 	};
 });
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "legacy_ssl";
 	listener = listener;
 	encryption = "ssl";
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index cff54f61..6270b403 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -307,7 +307,7 @@ function listener.ondisconnect(conn, err)
 	end
 end
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "component";
 	listener = listener;
 	default_port = 5347;
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 090b522b..22441faa 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -123,7 +123,7 @@ function module.add_host(module)
 	end
 end
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "http";
 	listener = server.listener;
 	default_port = 5280;
@@ -132,7 +132,7 @@ module:add_item("net-provider", {
 	};
 });
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "https";
 	listener = server.listener;
 	default_port = 5281;
diff --git a/plugins/mod_net_multiplex.lua b/plugins/mod_net_multiplex.lua
index 44e1c1ee..d666b907 100644
--- a/plugins/mod_net_multiplex.lua
+++ b/plugins/mod_net_multiplex.lua
@@ -57,7 +57,7 @@ function listener.ondisconnect(conn, err)
 	buffers[conn] = nil; -- warn if no buffer?
 end
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "multiplex";
 	config_prefix = "";
 	listener = listener;
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 321ed0d7..65379f5b 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -498,7 +498,7 @@ end
 
 s2sout.set_listener(listener);
 
-module:add_item("net-provider", {
+module:provides("net", {
 	name = "s2s";
 	listener = listener;
 	default_port = 5269;
diff --git a/plugins/mod_storage_internal.lua b/plugins/mod_storage_internal.lua
index d8fdfc6f..039202dd 100644
--- a/plugins/mod_storage_internal.lua
+++ b/plugins/mod_storage_internal.lua
@@ -2,7 +2,7 @@ local datamanager = require "core.storagemanager".olddm;
 
 local host = module.host;
 
-local driver = { name = "internal" };
+local driver = {};
 local driver_mt = { __index = driver };
 
 function driver:open(store)
@@ -24,4 +24,4 @@ function driver:purge(user)
 	return datamanager.purge(user, host);
 end
 
-module:add_item("data-driver", driver);
+module:provides("storage", driver);
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index e05a475d..c9a45fca 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -365,7 +365,7 @@ function list_store:scan(username, from, to, jid, typ)
 	return nil, "not-implemented"
 end
 
-local driver = { name = "sql" };
+local driver = {};
 
 function driver:open(store, typ)
 	if not typ then -- default key-value store
@@ -399,4 +399,4 @@ function driver:purge(username)
 	return commit(true, changed);
 end
 
-module:add_item("data-driver", driver);
+module:provides("storage", driver);
diff --git a/plugins/storage/mod_xep0227.lua b/plugins/storage/mod_xep0227.lua
index b6d2e627..ac0441b1 100644
--- a/plugins/storage/mod_xep0227.lua
+++ b/plugins/storage/mod_xep0227.lua
@@ -160,4 +160,4 @@ function driver:open(host, datastore, typ)
 	return instance;
 end
 
-module:add_item("data-driver", driver);
+module:provides("storage", driver);