diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index e033e0e4b2d..415d7321f60 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -275,7 +275,7 @@ sub SharedLibrary($$)
 		push (@{$self->{shared_modules}}, "bin/$ctx->{LIBRARY_REALNAME}");
 		push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
 
-		$self->{install_plugins} .= "\t\@echo Install $installdir/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)/\n";
+		$self->{install_plugins} .= "\t\@echo Install $installdir/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
 		$self->{install_plugins} .= "\t\@mkdir -p \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/\n";
 		$self->{install_plugins} .= "\t\@cp $installdir/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
 		$self->{uninstall_plugins} .= "\t\@echo Uninstall \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
diff --git a/source/client/cifsdd.c b/source/client/cifsdd.c
index 6db18dce4ff..a168a919464 100644
--- a/source/client/cifsdd.c
+++ b/source/client/cifsdd.c
@@ -295,7 +295,7 @@ static void cifsdd_help_message(poptContext pctx,
 		const char * parg,
 		void * pdata)
 {
-	static const char const notes[] = 
+	static const char notes[] = 
 "FILE can be a local filename or a UNC path of the form //server/share/path.\n";
 
 	char prefix[24];
diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 173d7bc5a46..1c006b3e096 100644
--- a/source/lib/registry/config.mk
+++ b/source/lib/registry/config.mk
@@ -39,6 +39,7 @@ INIT_FUNCTION = registry_dir_init
 SUBSYSTEM = registry
 OBJ_FILES = \
 		reg_backend_dir.o
+REQUIRED_SUBSYSTEMS = LIBTALLOC
 # End MODULE registry_dir
 ################################################
 
diff --git a/source/main.mk b/source/main.mk
index 28acf96beca..b1ecdce572e 100644
--- a/source/main.mk
+++ b/source/main.mk
@@ -1,4 +1,4 @@
-all: basics bin/asn1_compile bin/compile_et binaries
+all: basics bin/asn1_compile bin/compile_et binaries libraries modules
 
 include heimdal_build/config.mk
 include config.mk
@@ -87,7 +87,7 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
 	 -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
 
 install: showlayout installbin installdat installswat installmisc installlib \
-	installheader installpc
+	installheader installpc installplugins
 
 # DESTDIR is used here to prevent packagers wasting their time
 # duplicating the Makefile. Remove it and you will have the privilege
@@ -151,7 +151,8 @@ installmisc: installdirs
 installpc: installdirs
 	@$(SHELL) $(srcdir)/script/installpc.sh $(srcdir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)
 
-uninstall: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader
+uninstall: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader \
+	uninstallplugins
 
 uninstallmisc:
 	#FIXME
diff --git a/source/ntptr/config.mk b/source/ntptr/config.mk
index b2300c22b2d..c4bccd7a68a 100644
--- a/source/ntptr/config.mk
+++ b/source/ntptr/config.mk
@@ -1,10 +1,10 @@
-# NTPTR Server subsystem
+# ntptr server subsystem
 
 ################################################
 # Start MODULE ntptr_simple_ldb
 [MODULE::ntptr_simple_ldb]
 INIT_FUNCTION = ntptr_simple_ldb_init
-SUBSYSTEM = NTPTR
+SUBSYSTEM = ntptr
 OBJ_FILES = \
 		simple_ldb/ntptr_simple_ldb.o
 REQUIRED_SUBSYSTEMS = \
@@ -13,12 +13,12 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 
 ################################################
-# Start SUBSYSTEM NTPTR
-[SUBSYSTEM::NTPTR]
+# Start SUBSYSTEM ntptr
+[SUBSYSTEM::ntptr]
 PRIVATE_PROTO_HEADER = ntptr_proto.h
 OBJ_FILES = \
 		ntptr_base.o \
 		ntptr_interface.o
 #
-# End SUBSYSTEM NTPTR
+# End SUBSYSTEM ntptr
 ################################################
diff --git a/source/ntptr/ntptr_base.c b/source/ntptr/ntptr_base.c
index c55e9832e68..ccd29b4ca34 100644
--- a/source/ntptr/ntptr_base.c
+++ b/source/ntptr/ntptr_base.c
@@ -71,7 +71,7 @@ NTSTATUS ntptr_register(const void *_ops)
 
 NTSTATUS ntptr_init(void)
 {
-	init_module_fn static_init[] = STATIC_NTPTR_MODULES;
+	init_module_fn static_init[] = STATIC_ntptr_MODULES;
 	init_module_fn *shared_init = load_samba_modules(NULL, "ntptr");
 
 	run_init_functions(static_init);
diff --git a/source/rpc_server/config.mk b/source/rpc_server/config.mk
index 2ef28a0af38..94b65d63c49 100644
--- a/source/rpc_server/config.mk
+++ b/source/rpc_server/config.mk
@@ -16,7 +16,7 @@ OBJ_FILES = \
 [MODULE::dcerpc_dcom]
 ENABLE = NO
 INIT_FUNCTION = dcerpc_server_dcom_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		dcom/oxidresolver.o \
 		dcom/rot.o \
@@ -33,7 +33,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_rpcecho
 [MODULE::dcerpc_rpcecho]
 INIT_FUNCTION = dcerpc_server_rpcecho_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		echo/rpc_echo.o
 REQUIRED_SUBSYSTEMS = NDR_ECHO
@@ -44,7 +44,7 @@ REQUIRED_SUBSYSTEMS = NDR_ECHO
 # Start MODULE dcerpc_epmapper
 [MODULE::dcerpc_epmapper]
 INIT_FUNCTION = dcerpc_server_epmapper_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		epmapper/rpc_epmapper.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
@@ -55,7 +55,7 @@ REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 # Start MODULE dcerpc_remote
 [MODULE::dcerpc_remote]
 INIT_FUNCTION = dcerpc_server_remote_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		remote/dcesrv_remote.o
 REQUIRED_SUBSYSTEMS = \
@@ -67,7 +67,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_srvsvc
 [MODULE::dcerpc_srvsvc]
 INIT_FUNCTION = dcerpc_server_srvsvc_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		srvsvc/dcesrv_srvsvc.o
 REQUIRED_SUBSYSTEMS = \
@@ -79,7 +79,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_wkssvc
 [MODULE::dcerpc_wkssvc]
 INIT_FUNCTION = dcerpc_server_wkssvc_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		wkssvc/dcesrv_wkssvc.o
 REQUIRED_SUBSYSTEMS = \
@@ -91,7 +91,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_unixinfo
 [MODULE::dcerpc_unixinfo]
 INIT_FUNCTION = dcerpc_server_unixinfo_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		unixinfo/dcesrv_unixinfo.o
 REQUIRED_SUBSYSTEMS = \
@@ -105,7 +105,7 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_samr]
 INIT_FUNCTION = dcerpc_server_samr_init
 PRIVATE_PROTO_HEADER = samr/proto.h
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		samr/dcesrv_samr.o \
 		samr/samr_password.o
@@ -120,7 +120,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_winreg
 [MODULE::dcerpc_winreg]
 INIT_FUNCTION = dcerpc_server_winreg_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OUTPUT_TYPE = MERGEDOBJ
 OBJ_FILES = \
 		winreg/rpc_winreg.o
@@ -133,7 +133,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_netlogon
 [MODULE::dcerpc_netlogon]
 INIT_FUNCTION = dcerpc_server_netlogon_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		netlogon/dcerpc_netlogon.o
 REQUIRED_SUBSYSTEMS = \
@@ -147,7 +147,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_lsa
 [MODULE::dcerpc_lsarpc]
 INIT_FUNCTION = dcerpc_server_lsarpc_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		lsa/dcesrv_lsa.o
 REQUIRED_SUBSYSTEMS = \
@@ -161,14 +161,14 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_spoolss
 [MODULE::dcerpc_spoolss]
 INIT_FUNCTION = dcerpc_server_spoolss_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OUTPUT_TYPE = MERGEDOBJ
 OBJ_FILES = \
 		spoolss/dcesrv_spoolss.o
 REQUIRED_SUBSYSTEMS = \
 		DCERPC_COMMON \
 		NDR_SPOOLSS \
-		NTPTR
+		ntptr
 # End MODULE dcerpc_spoolss
 ################################################
 
@@ -176,7 +176,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_drsuapi
 [MODULE::dcerpc_drsuapi]
 INIT_FUNCTION = dcerpc_server_drsuapi_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		drsuapi/dcesrv_drsuapi.o
 REQUIRED_SUBSYSTEMS = \
@@ -190,7 +190,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_dssetup
 [MODULE::dcerpc_dssetup]
 INIT_FUNCTION = dcerpc_server_dssetup_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		dssetup/dcesrv_dssetup.o
 REQUIRED_SUBSYSTEMS = \
@@ -201,8 +201,8 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 
 ################################################
-# Start SUBSYSTEM DCERPC_SERVER
-[SUBSYSTEM::DCERPC_SERVER]
+# Start SUBSYSTEM dcerpc_server
+[SUBSYSTEM::dcerpc_server]
 PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
 OBJ_FILES = \
 		dcerpc_server.o \
diff --git a/source/rpc_server/dcerpc_server.c b/source/rpc_server/dcerpc_server.c
index 1229d26323c..ab40a642c4c 100644
--- a/source/rpc_server/dcerpc_server.c
+++ b/source/rpc_server/dcerpc_server.c
@@ -1322,7 +1322,7 @@ static NTSTATUS dcesrv_init(struct event_context *event_context, const struct mo
 
 NTSTATUS server_service_rpc_init(void)
 {
-	init_module_fn static_init[] = STATIC_DCERPC_SERVER_MODULES;
+	init_module_fn static_init[] = STATIC_dcerpc_server_MODULES;
 	init_module_fn *shared_init = load_samba_modules(NULL, "rpc_server");
 
 	run_init_functions(static_init);
diff --git a/source/smbd/config.mk b/source/smbd/config.mk
index 3dfe129db70..5a0f9203615 100644
--- a/source/smbd/config.mk
+++ b/source/smbd/config.mk
@@ -1,110 +1,110 @@
 # server subsystem
 
 ################################################
-# Start MODULE server_service_auth
-[MODULE::server_service_auth]
+# Start MODULE service_auth
+[MODULE::service_auth]
 INIT_FUNCTION = server_service_auth_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		auth
 # End MODULE server_auth
 ################################################
 
 ################################################
-# Start MODULE server_service_smb
-[MODULE::server_service_smb]
+# Start MODULE service_smb
+[MODULE::service_smb]
 INIT_FUNCTION = server_service_smb_init
 OUTPUT_TYPE = MERGEDOBJ
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		SMB
 # End MODULE server_smb
 ################################################
 
 ################################################
-# Start MODULE server_service_rpc
-[MODULE::server_service_rpc]
+# Start MODULE service_rpc
+[MODULE::service_rpc]
 INIT_FUNCTION = server_service_rpc_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 OUTPUT_TYPE = MERGEDOBJ
 REQUIRED_SUBSYSTEMS = \
-		DCERPC_SERVER
+		dcerpc_server
 # End MODULE server_rpc
 ################################################
 
 ################################################
-# Start MODULE server_service_ldap
-[MODULE::server_service_ldap]
+# Start MODULE service_ldap
+[MODULE::service_ldap]
 INIT_FUNCTION = server_service_ldap_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		LDAP
 # End MODULE server_ldap
 ################################################
 
 ################################################
-# Start MODULE server_service_nbtd
-[MODULE::server_service_nbtd]
+# Start MODULE service_nbtd
+[MODULE::service_nbtd]
 INIT_FUNCTION = server_service_nbtd_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		NBTD
-# End MODULE server_service_nbtd
+# End MODULE service_nbtd
 ################################################
 
 ################################################
-# Start MODULE server_service_wrepl
-[MODULE::server_service_wrepl]
+# Start MODULE service_wrepl
+[MODULE::service_wrepl]
 INIT_FUNCTION = server_service_wrepl_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		WREPL_SRV
-# End MODULE server_service_wrepl
+# End MODULE service_wrepl
 ################################################
 
 ################################################
-# Start MODULE server_service_cldapd
-[MODULE::server_service_cldap]
+# Start MODULE service_cldapd
+[MODULE::service_cldap]
 INIT_FUNCTION = server_service_cldapd_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		CLDAPD
-# End MODULE server_service_cldapd
+# End MODULE service_cldapd
 ################################################
 
 ################################################
-# Start MODULE server_service_web
-[MODULE::server_service_web]
+# Start MODULE service_web
+[MODULE::service_web]
 INIT_FUNCTION = server_service_web_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		WEB
-# End MODULE server_service_web
+# End MODULE service_web
 ################################################
 
 ################################################
-# Start MODULE server_service_web
-[MODULE::server_service_kdc]
+# Start MODULE service_web
+[MODULE::service_kdc]
 INIT_FUNCTION = server_service_kdc_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		KDC
-# End MODULE server_service_web
+# End MODULE service_web
 ################################################
 
 ################################################
-# Start MODULE server_service_winbind
-[MODULE::server_service_winbind]
+# Start MODULE service_winbind
+[MODULE::service_winbind]
 INIT_FUNCTION = server_service_winbind_init
-SUBSYSTEM = SERVER_SERVICE
+SUBSYSTEM = service
 REQUIRED_SUBSYSTEMS = \
 		WINBIND
-# End MODULE server_service_winbind
+# End MODULE service_winbind
 ################################################
 
 #######################
-# Start SUBSYSTEM SERVICE
-[SUBSYSTEM::SERVER_SERVICE]
+# Start SUBSERVICE
+[SUBSYSTEM::service]
 PRIVATE_PROTO_HEADER = service.h
 OBJ_FILES = \
 		service.o \
@@ -123,8 +123,8 @@ MANPAGE = smbd.8
 OBJ_FILES = \
 		server.o
 REQUIRED_SUBSYSTEMS = \
-		PROCESS_MODEL \
-		SERVER_SERVICE \
+		process_model \
+		service \
 		CONFIG \
 		LIBBASIC \
 		PIDFILE \
diff --git a/source/smbd/process_model.c b/source/smbd/process_model.c
index 5010d745db2..5a01ad4fab3 100644
--- a/source/smbd/process_model.c
+++ b/source/smbd/process_model.c
@@ -82,7 +82,7 @@ NTSTATUS register_process_model(const void *_ops)
 
 NTSTATUS process_model_init(void)
 {
-	init_module_fn static_init[] = STATIC_PROCESS_MODEL_MODULES;
+	init_module_fn static_init[] = STATIC_process_model_MODULES;
 	init_module_fn *shared_init = load_samba_modules(NULL, "process_model");
 
 	run_init_functions(static_init);
diff --git a/source/smbd/process_model.mk b/source/smbd/process_model.mk
index e09db012fbd..c9fb73d0d38 100644
--- a/source/smbd/process_model.mk
+++ b/source/smbd/process_model.mk
@@ -4,7 +4,7 @@
 # Start MODULE process_model_single
 [MODULE::process_model_single]
 INIT_FUNCTION = process_model_single_init 
-SUBSYSTEM = PROCESS_MODEL
+SUBSYSTEM = process_model
 OBJ_FILES = \
 		process_single.o
 # End MODULE process_model_single
@@ -14,7 +14,7 @@ OBJ_FILES = \
 # Start MODULE process_model_standard
 [MODULE::process_model_standard]
 INIT_FUNCTION = process_model_standard_init 
-SUBSYSTEM = PROCESS_MODEL
+SUBSYSTEM = process_model
 OBJ_FILES = \
 		process_standard.o
 REQUIRED_SUBSYSTEMS = EXT_LIB_SETPROCTITLE
@@ -25,7 +25,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_SETPROCTITLE
 # Start MODULE process_model_thread
 [MODULE::process_model_thread]
 INIT_FUNCTION = process_model_thread_init 
-SUBSYSTEM = PROCESS_MODEL
+SUBSYSTEM = process_model
 OBJ_FILES = \
 		process_thread.o
 REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
@@ -33,11 +33,11 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
 ################################################
 
 ################################################
-# Start SUBSYSTEM PROCESS_MODEL
-[SUBSYSTEM::PROCESS_MODEL]
+# Start SUBSYSTEM process_model
+[SUBSYSTEM::process_model]
 PRIVATE_PROTO_HEADER = process_model_proto.h
 OBJ_FILES = \
 		process_model.o
 #
-# End SUBSYSTEM PROCESS_MODEL
+# End SUBSYSTEM process_model
 ################################################
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 057cdfd5e89..db2a13f29f5 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -166,7 +166,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 	BOOL interactive = False;
 	int opt;
 	poptContext pc;
-	init_module_fn static_init[] = STATIC_SERVER_SERVICE_MODULES;
+	init_module_fn static_init[] = STATIC_service_MODULES;
 	init_module_fn *shared_init;
 	struct event_context *event_ctx;
 	NTSTATUS status;