diff --git a/ircd/m.cc b/ircd/m.cc
index 85a5d90c2..c5b58908e 100644
--- a/ircd/m.cc
+++ b/ircd/m.cc
@@ -240,8 +240,6 @@ ircd::m::module_names
 	"m_command",
 	"m_control",
 	"well_known",
-	"webhook",
-	"stats",
 	"federation_backfill_ids",
 	"federation_backfill",
 	"federation_event_auth",
@@ -315,9 +313,11 @@ ircd::m::module_names
 	"client_thirdparty_protocols",
 	"client_versions",
 	"client_voip_turnserver",
-	"index",
+	"web_root",
+	"web_hook",
 	"m_listen",
 	"m_vm",
+	"stats",
 };
 
 /// This is a list of modules that are considered "optional" and any loading
@@ -325,7 +325,7 @@ ircd::m::module_names
 decltype(ircd::m::module_names_optional)
 ircd::m::module_names_optional
 {
-
+	"web_hook",
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 921430b81..7aa309510 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -64,8 +64,8 @@ net_dns_la_CPPFLAGS = $(AM_CPPFLAGS) @BOOST_CPPFLAGS@
 net_dns_la_LDFLAGS = $(AM_LDFLAGS) @BOOST_LDFLAGS@
 net_dns_la_LIBADD = $(AM_LIBS) @BOOST_LIBS@
 console_la_SOURCES = console.cc
-index_la_SOURCES = index.cc
-webhook_la_SOURCES = webhook.cc
+web_root_la_SOURCES = web_root.cc
+web_hook_la_SOURCES = web_hook.cc
 well_known_la_SOURCES = well_known.cc
 
 module_LTLIBRARIES = \
@@ -73,8 +73,8 @@ module_LTLIBRARIES = \
 	stats.la \
 	net_dns.la \
 	console.la \
-	index.la \
-	webhook.la \
+	web_root.la \
+	web_hook.la \
 	well_known.la \
 	###
 
diff --git a/modules/webhook.cc b/modules/web_hook.cc
similarity index 99%
rename from modules/webhook.cc
rename to modules/web_hook.cc
index 2c03f200f..408b21ed5 100644
--- a/modules/webhook.cc
+++ b/modules/web_hook.cc
@@ -13,7 +13,7 @@ using namespace ircd;
 mapi::header
 IRCD_MODULE
 {
-	"Webhook Handler"
+	"Web hook Handler"
 };
 
 conf::item<std::string>
diff --git a/modules/index.cc b/modules/web_root.cc
similarity index 98%
rename from modules/index.cc
rename to modules/web_root.cc
index 70fb0de23..62dcc4111 100644
--- a/modules/index.cc
+++ b/modules/web_root.cc
@@ -65,7 +65,7 @@ root_delete
 	root_resource, "DELETE", non_get_root
 };
 
-/// legacy; will be removed
+/// LEGACY
 conf::item<std::string>
 webroot_path
 {
@@ -74,9 +74,9 @@ webroot_path
 };
 
 conf::item<std::string>
-index_path
+root_path
 {
-	{ "name",       "ircd.index.path"         },
+	{ "name",       "ircd.web.root.path"      },
 	{ "default",    string_view{webroot_path} },
 };
 
@@ -85,7 +85,7 @@ init_files()
 {
 	const string_view &path
 	{
-		index_path
+		root_path
 	};
 
 	if(empty(path))