s4-smbtorture: Make test names lowercase and dot-separated.

This is consistent with the test names used by selftest, should
make the names less confusing and easier to integrate with other tools.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Dec 11 04:16:13 CET 2010 on sn-devel-104

117 files changed, 649 insertions, 672 deletions

diff --git a/source4/auth/credentials/tests/simple.c b/source4/auth/credentials/tests/simple.c
index c059878318..6c722750d6 100644
--- a/source4/auth/credentials/tests/simple.c
+++ b/source4/auth/credentials/tests/simple.c
@@ -106,8 +106,7 @@ static bool test_parse_string(struct torture_context *tctx)
 
 struct torture_suite *torture_local_credentials(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, 
-							   "CREDENTIALS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "credentials");
 
 	torture_suite_add_simple_test(suite, "init", test_init);
 	torture_suite_add_simple_test(suite, "init anonymous", 
diff --git a/source4/dsdb/common/tests/dsdb_dn.c b/source4/dsdb/common/tests/dsdb_dn.c
index d01e858a0d..bad649cde8 100644
--- a/source4/dsdb/common/tests/dsdb_dn.c
+++ b/source4/dsdb/common/tests/dsdb_dn.c
@@ -344,15 +344,15 @@ static bool torture_dsdb_dn_invalid(struct torture_context *torture)
 
 struct torture_suite *torture_dsdb_dn(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "DSDB-DN");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "dsdb.dn");
 
 	if (suite == NULL) {
 		return NULL;
 	}
 
-	torture_suite_add_simple_test(suite, "VALID", torture_dsdb_dn_valid);
-	torture_suite_add_simple_test(suite, "INVALID", torture_dsdb_dn_invalid);
-	torture_suite_add_simple_test(suite, "ATTRS", torture_dsdb_dn_attrs);
+	torture_suite_add_simple_test(suite, "valid", torture_dsdb_dn_valid);
+	torture_suite_add_simple_test(suite, "invalid", torture_dsdb_dn_invalid);
+	torture_suite_add_simple_test(suite, "attrs", torture_dsdb_dn_attrs);
 
 	suite->description = talloc_strdup(suite, "DSDB DN tests");
 
diff --git a/source4/dsdb/schema/tests/schema_syntax.c b/source4/dsdb/schema/tests/schema_syntax.c
index 0f939fe170..326c94ff5a 100644
--- a/source4/dsdb/schema/tests/schema_syntax.c
+++ b/source4/dsdb/schema/tests/schema_syntax.c
@@ -238,7 +238,7 @@ struct torture_suite *torture_dsdb_syntax(TALLOC_CTX *mem_ctx)
 	typedef bool (*pfn_run)(struct torture_context *, void *);
 
 	struct torture_tcase *tc;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "DSDB-SYNTAX");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "dsdb.syntax");
 
 	if (suite == NULL) {
 		return NULL;
diff --git a/source4/lib/messaging/tests/irpc.c b/source4/lib/messaging/tests/irpc.c
index 4db1fe74cb..4d0b6b4378 100644
--- a/source4/lib/messaging/tests/irpc.c
+++ b/source4/lib/messaging/tests/irpc.c
@@ -271,7 +271,7 @@ static bool irpc_setup(struct torture_context *tctx, void **_data)
 
 struct torture_suite *torture_local_irpc(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "IRPC");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "irpc");
 	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "irpc");
 	int i;
 	uint32_t *values = talloc_array(tcase, uint32_t, 5);
diff --git a/source4/lib/messaging/tests/messaging.c b/source4/lib/messaging/tests/messaging.c
index bf6f13bc67..82fdf2f73e 100644
--- a/source4/lib/messaging/tests/messaging.c
+++ b/source4/lib/messaging/tests/messaging.c
@@ -136,7 +136,7 @@ static bool test_ping_speed(struct torture_context *tctx)
 
 struct torture_suite *torture_local_messaging(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *s = torture_suite_create(mem_ctx, "MESSAGING");
+	struct torture_suite *s = torture_suite_create(mem_ctx, "messaging");
 	torture_suite_add_simple_test(s, "ping_speed", test_ping_speed);
 	return s;
 }
diff --git a/source4/lib/registry/tests/diff.c b/source4/lib/registry/tests/diff.c
index d6a5bd53f2..5568171f75 100644
--- a/source4/lib/registry/tests/diff.c
+++ b/source4/lib/registry/tests/diff.c
@@ -276,7 +276,7 @@ static bool diff_setup_dotreg_tcase (struct torture_context *tctx, void **data)
 struct torture_suite *torture_registry_diff(TALLOC_CTX *mem_ctx)
 {
 	struct torture_tcase *tcase;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "DIFF");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "diff");
 
 	tcase = torture_suite_add_tcase(suite, "PReg");
 	torture_tcase_set_fixture(tcase, diff_setup_preg_tcase, NULL);
diff --git a/source4/lib/registry/tests/generic.c b/source4/lib/registry/tests/generic.c
index a69a6148d5..2e0863c17a 100644
--- a/source4/lib/registry/tests/generic.c
+++ b/source4/lib/registry/tests/generic.c
@@ -154,7 +154,7 @@ static bool test_reg_val_description_nullname(struct torture_context *ctx)
 
 struct torture_suite *torture_registry(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "REGISTRY");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "registry");
 	torture_suite_add_simple_test(suite, "str_regtype",
 				      test_str_regtype);
 	torture_suite_add_simple_test(suite, "reg_val_data_string dword",
diff --git a/source4/lib/registry/tests/hive.c b/source4/lib/registry/tests/hive.c
index 4ae9a5bcbf..71d3f0a3f8 100644
--- a/source4/lib/registry/tests/hive.c
+++ b/source4/lib/registry/tests/hive.c
@@ -457,7 +457,7 @@ static bool test_dir_refuses_null_location(struct torture_context *tctx)
 struct torture_suite *torture_registry_hive(TALLOC_CTX *mem_ctx)
 {
 	struct torture_tcase *tcase;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "HIVE");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "hive");
 
 	torture_suite_add_simple_test(suite, "dir-refuses-null-location",
 				      test_dir_refuses_null_location);
diff --git a/source4/lib/registry/tests/registry.c b/source4/lib/registry/tests/registry.c
index 3003468b15..50aefc8786 100644
--- a/source4/lib/registry/tests/registry.c
+++ b/source4/lib/registry/tests/registry.c
@@ -579,7 +579,7 @@ static void tcase_add_tests(struct torture_tcase *tcase)
 struct torture_suite *torture_registry_registry(TALLOC_CTX *mem_ctx)
 {
 	struct torture_tcase *tcase;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "REGISTRY");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "registry");
 
 	tcase = torture_suite_add_tcase(suite, "local");
 	torture_tcase_set_fixture(tcase, setup_local_registry, NULL);
diff --git a/source4/lib/socket/testsuite.c b/source4/lib/socket/testsuite.c
index 0195064a80..2489277433 100644
--- a/source4/lib/socket/testsuite.c
+++ b/source4/lib/socket/testsuite.c
@@ -188,8 +188,7 @@ static bool test_tcp(struct torture_context *tctx)
 
 struct torture_suite *torture_local_socket(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, 
-													   "SOCKET");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "socket");
 
 	torture_suite_add_simple_test(suite, "udp", test_udp);
 	torture_suite_add_simple_test(suite, "tcp", test_tcp);
diff --git a/source4/libcli/resolve/testsuite.c b/source4/libcli/resolve/testsuite.c
index 86e133b524..873a82f7b9 100644
--- a/source4/libcli/resolve/testsuite.c
+++ b/source4/libcli/resolve/testsuite.c
@@ -82,7 +82,7 @@ static bool test_sync_resolve(struct torture_context *tctx)
 
 struct torture_suite *torture_local_resolve(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "RESOLVE");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "resolve");
 
 	torture_suite_add_simple_test(suite, "async", test_async_resolve);
 	torture_suite_add_simple_test(suite, "sync", test_sync_resolve);
diff --git a/source4/libcli/security/tests/sddl.c b/source4/libcli/security/tests/sddl.c
index 788453714e..ca4715b744 100644
--- a/source4/libcli/security/tests/sddl.c
+++ b/source4/libcli/security/tests/sddl.c
@@ -93,7 +93,7 @@ static const char *examples[] = {
 /* test a set of example SDDL strings */
 struct torture_suite *torture_local_sddl(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SDDL");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "sddl");
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(examples); i++) {
diff --git a/source4/librpc/tests/binding_string.c b/source4/librpc/tests/binding_string.c
index dfb6d2967a..425b2f8315 100644
--- a/source4/librpc/tests/binding_string.c
+++ b/source4/librpc/tests/binding_string.c
@@ -162,7 +162,7 @@ static bool test_no_transport(struct torture_context *tctx)
 struct torture_suite *torture_local_binding_string(TALLOC_CTX *mem_ctx)
 {
 	int i;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "BINDING");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "binding");
 
 	for (i = 0; i < ARRAY_SIZE(test_strings); i++) {
 		torture_suite_add_simple_tcase_const(suite, test_strings[i],
diff --git a/source4/param/tests/loadparm.c b/source4/param/tests/loadparm.c
index 2e44a29eed..fb269a1a9f 100644
--- a/source4/param/tests/loadparm.c
+++ b/source4/param/tests/loadparm.c
@@ -147,7 +147,7 @@ static bool test_lp_service(struct torture_context *tctx)
 
 struct torture_suite *torture_local_loadparm(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "LOADPARM");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "loadparm");
 
 	torture_suite_add_simple_test(suite, "create", test_create);
 	torture_suite_add_simple_test(suite, "set_option", test_set_option);
diff --git a/source4/param/tests/share.c b/source4/param/tests/share.c
index 36a74b35c9..33a18621da 100644
--- a/source4/param/tests/share.c
+++ b/source4/param/tests/share.c
@@ -198,7 +198,7 @@ static bool teardown(struct torture_context *tctx, void *data)
 
 struct torture_suite *torture_local_share(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SHARE");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "share");
 	struct torture_tcase *tcase;
 
 	share_init();
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index d3c7277f89..1d03a53ce8 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -41,11 +41,11 @@ samba4.base.charset.*.Testing partial surrogate
 .*net.api.delshare.*				# DelShare isn't implemented yet
 samba4.rap.*netservergetinfo
 samba4.smb2.persistent.handles1
-samba4.winbind.struct.*.SHOW_SEQUENCE     # Not yet working in winbind
-samba4.winbind.struct.*.GETPWENT          # Not yet working in winbind
-samba4.winbind.struct.*.SETPWENT          # Not yet working in winbind
-samba4.winbind.struct.*.LOOKUP_NAME_SID   # Not yet working in winbind
-samba4.winbind.struct.*.LIST_GROUPS
+samba4.winbind.struct.*.show_sequence     # Not yet working in winbind
+samba4.winbind.struct.*.getpwent          # Not yet working in winbind
+samba4.winbind.struct.*.setpwent          # Not yet working in winbind
+samba4.winbind.struct.*.lookup_name_sid   # Not yet working in winbind
+samba4.winbind.struct.*.list_groups
 samba4.*base.delaywrite.*update of write time and SMBwrite truncate$
 samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand$
 samba4.*base.delaywrite.*delayed update of write time 3a$
@@ -60,23 +60,23 @@ samba4.ntvfs.cifs.base.maximum_allowed
 samba4.base.createx_access # this test is broken for non-administrator users
 samba4.smb2.oplock # oplocks in the s4 SMB2 server are a mess
 samba4.raw.lock.*.async # bug 6960
-samba4.smb2.lock.*.MULTIPLE-UNLOCK # bug 6959
-samba4.raw.sfileinfo.*.END-OF-FILE # bug 6962
-samba4.raw.oplock.*.BATCH22 # bug 6963
+samba4.smb2.lock.*.multiple-unlock # bug 6959
+samba4.raw.sfileinfo.*.end-of-file # bug 6962
+samba4.raw.oplock.*.batch22 # bug 6963
 samba4.raw.lock.*.zerobyteread # bug 6974
-samba4.smb2.lock.*.ZEROBYTEREAD # bug 6974
-samba4.raw.streams.*.DELETE
-samba4.raw.streams.*.CREATEDISP
-samba4.raw.streams.*.SUMTAB
-samba4.raw.acls.*.CREATE_DIR
-samba4.raw.acls.*.CREATE_FILE
-samba4.smb2.create.*.ACLDIR
-samba4.smb2.acls.*.GENERIC
-samba4.smb2.acls.*.INHERITFLAGS
-samba4.smb2.acls.*.OWNER
-samba4.smb2.compound.*.RELATED1
-samba4.smb2.compound.*.RELATED2
-samba4.smb2.compound.*.INVALID2
+samba4.smb2.lock.*.zerobyteread # bug 6974
+samba4.raw.streams.*.delete
+samba4.raw.streams.*.createdisp
+samba4.raw.streams.*.sumtab
+samba4.raw.acls.*.create_dir
+samba4.raw.acls.*.create_file
+samba4.smb2.create.*.acldir
+samba4.smb2.acls.*.generic
+samba4.smb2.acls.*.inheritflags
+samba4.smb2.acls.*.owner
+samba4.smb2.compound.*.related1
+samba4.smb2.compound.*.related2
+samba4.smb2.compound.*.invalid2
 samba4.ldap.acl.*.search.* # ACL search behaviour not enabled by default
 samba4.ldap.acl.*.ntSecurityDescriptor.* # ACL extended checks on search not enabled by default
 
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index d8a04e4ec0..c2b47c9872 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -100,12 +100,6 @@ def skiptestsuite(name, reason):
     print "skipping %s (%s)" % (name, reason)
 
 
-def normalize_testname(name):
-    """Normalize a smbtorture test suite name.
-    """
-    return name.lower().replace(" ", "_").replace("-", ".")
-
-
 def planperltestsuite(name, path):
     """Run a perl test suite.
 
@@ -124,8 +118,9 @@ def planpythontestsuite(env, module):
     else:
         plantestsuite_idlist(module, env, "PYTHONPATH=$PYTHONPATH:%s/../lib/subunit/python:%s/../lib/testtools %s -m subunit.run $LISTOPT %s" % (samba4srcdir, samba4srcdir, python, module))
 
+
 def plansmbtorturetestsuite(name, env, options):
-    modname = "samba4.%s" % normalize_testname(name)
+    modname = "samba4.%s" % name
     cmdline = "%s %s %s" % (valgrindify(smb4torture), options, name)
     plantestsuite_loadlist(modname, env, cmdline)
 
@@ -195,7 +190,7 @@ for options in ['-U"$USERNAME%$PASSWORD"']:
     plantestsuite("samba4.ldb.ldapi with options %s(dc:local)" % options, "dc:local",
             "%s/test_ldb.sh ldapi $PREFIX_ABS/dc/private/ldapi %s" % (bbdir, options))
 
-for t in smb4torture_testsuites("LDAP-"):
+for t in smb4torture_testsuites("ldap."):
     plansmbtorturetestsuite(t, "dc", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
 
 ldbdir = os.path.join(samba4srcdir, "lib/ldb")
@@ -211,17 +206,17 @@ else:
 
 # add tests to this list as they start passing, so we test
 # that they stay passing
-ncacn_np_tests = ["RPC-SCHANNEL", "RPC-JOIN", "RPC-LSA", "RPC-DSSETUP", "RPC-ALTERCONTEXT", "RPC-MULTIBIND", "RPC-NETLOGON", "RPC-HANDLES", "RPC-SAMSYNC", "RPC-SAMBA3-SESSIONKEY", "RPC-SAMBA3-GETUSERNAME", "RPC-SAMBA3-LSA", "RPC-SAMBA3-BIND", "RPC-SAMBA3-NETLOGON", "RPC-ASYNCBIND", "RPC-LSALOOKUP", "RPC-LSA-GETUSER", "RPC-SCHANNEL2", "RPC-AUTHCONTEXT"]
-ncalrpc_tests = ["RPC-SCHANNEL", "RPC-JOIN", "RPC-LSA", "RPC-DSSETUP", "RPC-ALTERCONTEXT", "RPC-MULTIBIND", "RPC-NETLOGON", "RPC-DRSUAPI", "RPC-ASYNCBIND", "RPC-LSALOOKUP", "RPC-LSA-GETUSER", "RPC-SCHANNEL2", "RPC-AUTHCONTEXT"]
-drs_rpc_tests = smb4torture_testsuites("DRS-RPC")
-ncacn_ip_tcp_tests = ["RPC-SCHANNEL", "RPC-JOIN", "RPC-LSA", "RPC-DSSETUP", "RPC-ALTERCONTEXT", "RPC-MULTIBIND", "RPC-NETLOGON", "RPC-HANDLES", "RPC-ASYNCBIND", "RPC-LSALOOKUP", "RPC-LSA-GETUSER", "RPC-SCHANNEL2", "RPC-AUTHCONTEXT", "RPC-OBJECTUUID"] + drs_rpc_tests
-slow_ncacn_np_tests = ["RPC-SAMLOGON", "RPC-SAMR-USERS", "RPC-SAMR-LARGE-DC", "RPC-SAMR-USERS-PRIVILEGES", "RPC-SAMR-PASSWORDS", "RPC-SAMR-PASSWORDS-PWDLASTSET"]
-slow_ncacn_ip_tcp_tests = ["RPC-SAMR", "RPC-CRACKNAMES"]
+ncacn_np_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.handles", "rpc.samsync", "rpc.samba3-sessionkey", "rpc.samba3-getusername", "rpc.samba3-lsa", "rpc.samba3-bind", "rpc.samba3-netlogon", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"]
+ncalrpc_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.drsuapi", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"]
+drs_rpc_tests = smb4torture_testsuites("drs.rpc")
+ncacn_ip_tcp_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.handles", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext", "rpc.objectuuid"] + drs_rpc_tests
+slow_ncacn_np_tests = ["rpc.samlogon", "rpc.samr.users", "rpc.samr.large-dc", "rpc.samr.users.privileges", "rpc.samr.passwords", "rpc.samr.passwords.pwdlastset"]
+slow_ncacn_ip_tcp_tests = ["rpc.samr", "rpc.cracknames"]
 
-all_rpc_tests = ncalrpc_tests + ncacn_np_tests + ncacn_ip_tcp_tests + slow_ncacn_np_tests + slow_ncacn_ip_tcp_tests + ["RPC-LSA-SECRETS", "RPC-PAC", "RPC-SAMBA3-SHARESEC", "RPC-COUNTCALLS"]
+all_rpc_tests = ncalrpc_tests + ncacn_np_tests + ncacn_ip_tcp_tests + slow_ncacn_np_tests + slow_ncacn_ip_tcp_tests + ["rpc.lsa.secrets", "rpc.pac", "rpc.samba3-sharesec", "rpc.countcalls"]
 
 # Make sure all tests get run
-rpc_tests = smb4torture_testsuites("RPC-")
+rpc_tests = smb4torture_testsuites("rpc.")
 auto_rpc_tests = filter(lambda t: t not in all_rpc_tests, rpc_tests)
 
 for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
@@ -235,15 +230,15 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
         elif transport == "ncacn_ip_tcp":
             tests = ncacn_ip_tcp_tests
         for t in tests:
-            plantestsuite_loadlist("samba4.%s on %s with %s" % (normalize_testname(t), transport, bindoptions), env, [valgrindify(smb4torture), "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
-        plantestsuite_loadlist("samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions), env, [valgrindify(smb4torture), "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=torture:share=tmp', 'RPC-SAMBA3-SHARESEC'])
+            plantestsuite_loadlist("samba4.%s on %s with %s" % (t, transport, bindoptions), env, [valgrindify(smb4torture), "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
+        plantestsuite_loadlist("samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions), env, [valgrindify(smb4torture), "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=torture:share=tmp', 'rpc.samba3-sharesec'])
 
 for bindoptions in [""] + validate_list + ["bigendian"]:
     for t in auto_rpc_tests:
-        plantestsuite_loadlist("samba4.%s with %s" % (normalize_testname(t), bindoptions), "dc", [valgrindify(smb4torture), "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
+        plantestsuite_loadlist("samba4.%s with %s" % (t, bindoptions), "dc", [valgrindify(smb4torture), "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
 
-t = "RPC-COUNTCALLS"
-plantestsuite_loadlist("samba4.%s" % normalize_testname(t), "dc:local", [valgrindify(smb4torture), "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
+t = "rpc.countcalls"
+plantestsuite_loadlist("samba4.%s" % t, "dc:local", [valgrindify(smb4torture), "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
 
 for transport in ["ncacn_np", "ncacn_ip_tcp"]:
     env = "dc"
@@ -252,14 +247,14 @@ for transport in ["ncacn_np", "ncacn_ip_tcp"]:
     elif transport == "ncacn_ip_tcp":
         tests = slow_ncacn_ip_tcp_tests
     for t in tests:
-        plantestsuite_loadlist("samba4.%s on %s" % (normalize_testname(t), transport), env, [valgrindify(smb4torture), "%s:$SERVER" % transport, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
+        plantestsuite_loadlist("samba4.%s on %s" % (t, transport), env, [valgrindify(smb4torture), "%s:$SERVER" % transport, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
 
 # Tests for the DFS referral calls implementation
-for t in smb4torture_testsuites("DFS-"):
+for t in smb4torture_testsuites("dfs."):
     plansmbtorturetestsuite(t, "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
 
-# Tests for the NET API (NET-API-BECOME-DC tested below against all the roles)
-net_tests = filter(lambda x: "NET-API-BECOME-DC" not in x, smb4torture_testsuites("NET-"))
+# Tests for the NET API (net.api.become.dc tested below against all the roles)
+net_tests = filter(lambda x: "net.api.become.dc" not in x, smb4torture_testsuites("net."))
 for t in net_tests:
     plansmbtorturetestsuite(t, "dc", '$SERVER[%s] -U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
 
@@ -281,26 +276,26 @@ for ntlmoptions in [
     "-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes",
     "-k no --option=usespnego=no"]:
     name = "rpc.lsa.secrets on %s with with %s" % (transport, ntlmoptions)
-    plantestsuite_loadlist("samba4.%s" % name, "dc", [smb4torture, "%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'RPC-LSA-SECRETS'])
+    plantestsuite_loadlist("samba4.%s" % name, "dc", [smb4torture, "%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
 
 transports = ["ncacn_np", "ncacn_ip_tcp"]
 
 #Kerberos varies between functional levels, so it is important to check this on all of them
 for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
     transport = "ncacn_np"
-    plantestsuite_loadlist("samba4.rpc.pac on %s" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-PAC'])
+    plantestsuite_loadlist("samba4.rpc.pac on %s" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.pac'])
     for transport in transports:
-        plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'RPC-LSA-SECRETS'])
-        plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use target principal" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:target_hostname=$NETBIOSNAME', 'RPC-LSA-SECRETS'])
-        plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use Samba3 style login" % transport, env, [smb4torture, "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=gensec:fake_gssapi_krb5=yes", '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', "RPC-LSA-SECRETS-none*"])
-        plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use Samba3 style login, use target principal" % transport, env, [smb4torture, "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:fake_gssapi_krb5=yes', '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', "RPC-LSA-SECRETS-none*"])
-        plantestsuite_loadlist("samba4.rpc.echo on %s" % (transport, ), env, [smb4torture, "%s:$SERVER[]" % (transport,), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-ECHO'])
+        plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
+        plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use target principal" % (transport,), env, [smb4torture, "%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
+        plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use Samba3 style login" % transport, env, [smb4torture, "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=gensec:fake_gssapi_krb5=yes", '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', "rpc.lsa.secrets.none*"])
+        plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos - use Samba3 style login, use target principal" % transport, env, [smb4torture, "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:fake_gssapi_krb5=yes', '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', "rpc.lsa.secrets.none*"])
+        plantestsuite_loadlist("samba4.rpc.echo on %s" % (transport, ), env, [smb4torture, "%s:$SERVER[]" % (transport,), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
 
         # Echo tests test bulk Kerberos encryption of DCE/RPC
         for bindoptions in ["connect", "spnego", "spnego,sign", "spnego,seal"] + validate_list + ["padcheck", "bigendian", "bigendian,seal"]:
             echooptions = "--option=socket:testnonblock=True --option=torture:quick=yes -k yes"
-            plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, echooptions), env, [smb4torture, "%s:$SERVER[%s]" % (transport, bindoptions), echooptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-ECHO'])
-    plansmbtorturetestsuite("NET-API-BECOME-DC", env, '$SERVER[%s] -U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
+            plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, echooptions), env, [smb4torture, "%s:$SERVER[%s]" % (transport, bindoptions), echooptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
+    plansmbtorturetestsuite("net.api.become.dc", env, '$SERVER[%s] -U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
 
 for transport in transports:
     for bindoptions in ["sign", "seal"]:
@@ -318,36 +313,36 @@ for transport in transports:
                 env = "dc:local"
             else:
                 env = "dc"
-            plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, ntlmoptions), env, [smb4torture, "%s:$SERVER[%s]" % (transport, bindoptions), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-ECHO'])
+            plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, ntlmoptions), env, [smb4torture, "%s:$SERVER[%s]" % (transport, bindoptions), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
 
-plantestsuite_loadlist("samba4.rpc.echo on ncacn_np over smb2", "dc", [smb4torture, 'ncacn_np:$SERVER[smb2]', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'RPC-ECHO'])
+plantestsuite_loadlist("samba4.rpc.echo on ncacn_np over smb2", "dc", [smb4torture, 'ncacn_np:$SERVER[smb2]', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
 
-plantestsuite_loadlist("samba4.ntp.signd", "dc:local", [smb4torture, 'ncacn_np:$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'NTP-SIGND'])
+plantestsuite_loadlist("samba4.ntp.signd", "dc:local", [smb4torture, 'ncacn_np:$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'ntp.signd'])
 
 # Tests against the NTVFS POSIX backend
 ntvfsargs = ["--option=torture:sharedelay=10000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=50000"]
 
-smb2 = smb4torture_testsuites("SMB2-")
+smb2 = smb4torture_testsuites("smb2.")
 #The QFILEINFO-IPC test needs to be on ipc$
-raw = filter(lambda x: "RAW-QFILEINFO-IPC" not in x, smb4torture_testsuites("RAW-"))
-base = smb4torture_testsuites("BASE-")
+raw = filter(lambda x: "raw.qfileinfo.ipc" not in x, smb4torture_testsuites("raw."))
+base = smb4torture_testsuites("base.")
 
 for t in base + raw + smb2:
     plansmbtorturetestsuite(t, "dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD' + " " + " ".join(ntvfsargs))
 
-plansmbtorturetestsuite("RAW-QFILEINFO-IPC", "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
+plansmbtorturetestsuite("raw.qfileinfo.ipc", "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
 
-for t in smb4torture_testsuites("RAP-"):
+for t in smb4torture_testsuites("rap."):
     plansmbtorturetestsuite(t, "dc", '//$SERVER/IPC\$ -U$USERNAME%$PASSWORD')
 
 # Tests against the NTVFS CIFS backend
 for t in base + raw:
-    plantestsuite_loadlist("samba4.ntvfs.cifs.%s" % normalize_testname(t), "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/cifs', '-U$USERNAME%$PASSWORD'] + ntvfsargs + [t])
+    plantestsuite_loadlist("samba4.ntvfs.cifs.%s" % t, "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/cifs', '-U$USERNAME%$PASSWORD'] + ntvfsargs + [t])
 
 plansmbtorturetestsuite('ECHO-UDP', 'dc:local', '//$SERVER/whatever')
 
 # Local tests
-for t in smb4torture_testsuites("LOCAL-"):
+for t in smb4torture_testsuites("local."):
     plansmbtorturetestsuite(t, "none", "ncalrpc:")
 
 tdbtorture4 = binpath("tdbtorture")
@@ -356,7 +351,7 @@ if os.path.exists(tdbtorture4):
 else:
     skiptestsuite("tdb.stress", "Using system TDB, tdbtorture not available")
 
-plansmbtorturetestsuite("DRS-UNIT", "none", "ncalrpc:")
+plansmbtorturetestsuite("drs.unit", "none", "ncalrpc:")
 
 # Pidl tests
 for f in sorted(os.listdir(os.path.join(samba4srcdir, "../pidl/tests"))):
@@ -389,19 +384,19 @@ plantestsuite("samba4.blackbox.wbinfo(member:local)", "member:local", [os.path.j
 plantestsuite("samba4.blackbox.chgdcpass(dc)", "dc", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "LOCALDC\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/dc'])
 
 # Tests using the "Simple" NTVFS backend
-for t in ["BASE-RW1"]:
-    plantestsuite_loadlist("samba4.ntvfs.simple.%s" % normalize_testname(t), "dc", [valgrindify(smb4torture), "//$SERVER/simple", '-U$USERNAME%$PASSWORD', t])
+for t in ["base.rw1"]:
+    plantestsuite_loadlist("samba4.ntvfs.simple.%s" % t, "dc", [valgrindify(smb4torture), "//$SERVER/simple", '-U$USERNAME%$PASSWORD', t])
 
 # Domain Member Tests
-plantestsuite_loadlist("samba4.rpc.echo against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'RPC-ECHO'])
-plantestsuite_loadlist("samba4.rpc.echo against member server with domain creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', 'RPC-ECHO'])
-plantestsuite_loadlist("samba4.rpc.samr against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "RPC-SAMR"])
-plantestsuite_loadlist("samba4.rpc.samr.users against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "RPC-SAMR-USERS"])
-plantestsuite_loadlist("samba4.rpc.samr.passwords against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "RPC-SAMR-PASSWORDS"])
+plantestsuite_loadlist("samba4.rpc.echo against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'rpc.echo'])
+plantestsuite_loadlist("samba4.rpc.echo against member server with domain creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', 'rpc.echo'])
+plantestsuite_loadlist("samba4.rpc.samr against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr"])
+plantestsuite_loadlist("samba4.rpc.samr.users against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr.users"])
+plantestsuite_loadlist("samba4.rpc.samr.passwords against member server with local creds", "member", [valgrindify(smb4torture), 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr.passwords"])
 plantestsuite("samba4.blackbox.smbclient against member server with local creds", "member", [os.path.join(samba4srcdir, "client/tests/test_smbclient.sh"), '$NETBIOSNAME', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX'])
 
 # RPC Proxy
-plantestsuite_loadlist("samba4.rpc.echo against rpc proxy with domain creds", "rpc_proxy", [valgrindify(smb4torture), 'ncacn_ip_tcp:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', "RPC-ECHO"])
+plantestsuite_loadlist("samba4.rpc.echo against rpc proxy with domain creds", "rpc_proxy", [valgrindify(smb4torture), 'ncacn_ip_tcp:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', "rpc.echo"])
 
 # Tests SMB signing
 for mech in [
@@ -413,7 +408,7 @@ for mech in [
     for signing in ["--signing=on", "--signing=required"]:
         signoptions = "%s %s" % (mech, signing)
         name = "smb.signing on with %s" % signoptions
-        plantestsuite_loadlist("samba4.%s" % name, "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'BASE-XCOPY'])
+        plantestsuite_loadlist("samba4.%s" % name, "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy'])
 
 for mech in [
     "-k no",
@@ -423,7 +418,7 @@ for mech in [
     "-k yes --option=gensec:fake_gssapi_krb5=yes --option=gensec:gssapi_krb5=no"]:
     signoptions = "%s --signing=off" % mech
     name = "smb.signing on with %s" % signoptions
-    plantestsuite_loadlist("samba4.%s domain-creds" % name, "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'BASE-XCOPY'])
+    plantestsuite_loadlist("samba4.%s domain-creds" % name, "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
 
 for mech in [
     "-k no",
@@ -431,19 +426,19 @@ for mech in [
     "-k no --option=gensec:spengo=no"]:
     signoptions = "%s --signing=off" % mech
     name = "smb.signing on with %s" % signoptions
-    plantestsuite_loadlist("samba4.%s local-creds" % name, "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'BASE-XCOPY'])
-plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'BASE-XCOPY'])
-plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'BASE-XCOPY'])
-plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "member",  [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'BASE-XCOPY'])
+    plantestsuite_loadlist("samba4.%s local-creds" % name, "member", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy'])
+plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'base.xcopy'])
+plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'base.xcopy'])
+plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "member",  [valgrindify(smb4torture), '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'base.xcopy'])
 
-nbt_tests = smb4torture_testsuites("NBT-")
+nbt_tests = smb4torture_testsuites("nbt.")
 for t in nbt_tests:
     plansmbtorturetestsuite(t, "dc", "//$SERVER/_none_ -U\"$USERNAME%$PASSWORD\"")
 
 wb_opts = ["--option=\"torture:strict mode=no\"", "--option=\"torture:timelimit=1\"", "--option=\"torture:winbindd_separator=/\"", "--option=\"torture:winbindd_netbios_name=$SERVER\"", "--option=\"torture:winbindd_netbios_domain=$DOMAIN\""]
 
-winbind_struct_tests = smb4torture_testsuites("WINBIND-STRUCT")
-winbind_ndr_tests = smb4torture_testsuites("WINBIND-NDR")
+winbind_struct_tests = smb4torture_testsuites("winbind.struct")
+winbind_ndr_tests = smb4torture_testsuites("winbind.ndr")
 for env in ["dc", "member"]:
     for t in winbind_struct_tests:
         plansmbtorturetestsuite(t, env, "%s //_none_/_none_" % " ".join(wb_opts))
@@ -529,10 +524,10 @@ plansambapythontestsuite("samba4.drs.fsmo.python(vampire_dc)", "vampire_dc", os.
 plansambapythontestsuite("samba4.drs.repl_schema.python(vampire_dc)", "vampire_dc", os.path.join(samba4srcdir, 'torture/drs/python'), "repl_schema", environ={'DC1': "$DC_SERVER", 'DC2': '$VAMPIRE_DC_SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
 
 # This makes sure we test the rid allocation code
-t = "RPC-SAMR-LARGE-DC"
-plantestsuite_loadlist("samba4.%s.one" % normalize_testname(t), "vampire_dc", [valgrindify(smb4torture), '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
-plantestsuite_loadlist("samba4.%s.two" % normalize_testname(t), "vampire_dc", [valgrindify(smb4torture), '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
+t = "rpc.samr.large-dc"
+plantestsuite_loadlist("samba4.%s.one" % t, "vampire_dc", [valgrindify(smb4torture), '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
+plantestsuite_loadlist("samba4.%s.two" % t, "vampire_dc", [valgrindify(smb4torture), '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
 
 # some RODC testing
-plantestsuite_loadlist("samba4.rpc.echo", "rodc", [smb4torture, 'ncacn_np:$SERVER', "-k", "yes", '-U$USERNAME%$PASSWORD', '-W' '$DOMAIN', 'RPC-ECHO'])
+plantestsuite_loadlist("samba4.rpc.echo", "rodc", [smb4torture, 'ncacn_np:$SERVER', "-k", "yes", '-U$USERNAME%$PASSWORD', '-W' '$DOMAIN', 'rpc.echo'])
 plantestsuite("samba4.blackbox.provision-backend.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision-backend.sh"), '$PREFIX/provision'])
diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index d7639ac9cf..db8651c0a5 100644
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -151,8 +151,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 
 struct torture_suite *torture_ntlmssp(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, 
-													   "NTLMSSP");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "ntlmssp");
 
 	torture_suite_add_simple_test(suite, "NTLMSSP self check",
 								   torture_ntlmssp_self_check);
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 4133e75ffa..13796bd3db 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -730,7 +730,7 @@ static bool torture_pac_saved_check(struct torture_context *tctx)
 
 struct torture_suite *torture_pac(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "PAC");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "pac");
 
 	torture_suite_add_simple_test(suite, "self check", 
 				      torture_pac_self_check);
diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 6d3447d772..88dedaa541 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -383,7 +383,7 @@ static bool setpathinfo_aliases(struct torture_context *tctx,
 /* look for aliased info levels in trans2 calls */
 struct torture_suite *torture_trans2_aliases(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "ALIASES");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "aliases");
 
 	torture_suite_add_1smb_test(suite, "QFILEINFO aliases", qfsinfo_aliases);
 	torture_suite_add_1smb_test(suite, "QFSINFO aliases", qfileinfo_aliases);
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 3ed829193f..d7bac459c3 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1869,61 +1869,61 @@ static bool run_birthtimetest(struct torture_context *tctx,
 
 NTSTATUS torture_base_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "BASE");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "base");
 
-	torture_suite_add_2smb_test(suite, "FDPASS", run_fdpasstest);
+	torture_suite_add_2smb_test(suite, "fdpass", run_fdpasstest);
 	torture_suite_add_suite(suite, torture_base_locktest(suite));
-	torture_suite_add_1smb_test(suite, "UNLINK", torture_unlinktest);
-	torture_suite_add_1smb_test(suite, "ATTR",   run_attrtest);
-	torture_suite_add_1smb_test(suite, "TRANS2", run_trans2test);
-        torture_suite_add_1smb_test(suite, "BIRTHTIME", run_birthtimetest);
-	torture_suite_add_simple_test(suite, "NEGNOWAIT", run_negprot_nowait);
-	torture_suite_add_1smb_test(suite, "DIR1",  torture_dirtest1);
-	torture_suite_add_1smb_test(suite, "DIR2",  torture_dirtest2);
-	torture_suite_add_1smb_test(suite, "DENY1",  torture_denytest1);
-	torture_suite_add_2smb_test(suite, "DENY2",  torture_denytest2);
-	torture_suite_add_2smb_test(suite, "DENY3",  torture_denytest3);
-	torture_suite_add_1smb_test(suite, "DENYDOS",  torture_denydos_sharing);
-	torture_suite_add_smb_multi_test(suite, "NTDENY1", torture_ntdenytest1);
-	torture_suite_add_2smb_test(suite, "NTDENY2",  torture_ntdenytest2);
-	torture_suite_add_1smb_test(suite, "TCON",  run_tcon_test);
-	torture_suite_add_1smb_test(suite, "TCONDEV",  run_tcon_devtype_test);
-	torture_suite_add_1smb_test(suite, "VUID", run_vuidtest);
-	torture_suite_add_2smb_test(suite, "RW1",  run_readwritetest);
-	torture_suite_add_2smb_test(suite, "OPEN", run_opentest);
-	torture_suite_add_smb_multi_test(suite, "DEFER_OPEN", run_deferopen);
-	torture_suite_add_1smb_test(suite, "XCOPY", run_xcopy);
-	torture_suite_add_1smb_test(suite, "IOMETER", run_iometer);
-	torture_suite_add_1smb_test(suite, "RENAME", torture_test_rename);
+	torture_suite_add_1smb_test(suite, "unlink", torture_unlinktest);
+	torture_suite_add_1smb_test(suite, "attr",   run_attrtest);
+	torture_suite_add_1smb_test(suite, "trans2", run_trans2test);
+	torture_suite_add_1smb_test(suite, "birthtime", run_birthtimetest);
+	torture_suite_add_simple_test(suite, "negnowait", run_negprot_nowait);
+	torture_suite_add_1smb_test(suite, "dir1",  torture_dirtest1);
+	torture_suite_add_1smb_test(suite, "dir2",  torture_dirtest2);
+	torture_suite_add_1smb_test(suite, "deny1",  torture_denytest1);
+	torture_suite_add_2smb_test(suite, "deny2",  torture_denytest2);
+	torture_suite_add_2smb_test(suite, "deny3",  torture_denytest3);
+	torture_suite_add_1smb_test(suite, "denydos",  torture_denydos_sharing);
+	torture_suite_add_smb_multi_test(suite, "ntdeny1", torture_ntdenytest1);
+	torture_suite_add_2smb_test(suite, "ntdeny2",  torture_ntdenytest2);
+	torture_suite_add_1smb_test(suite, "tcon",  run_tcon_test);
+	torture_suite_add_1smb_test(suite, "tcondev",  run_tcon_devtype_test);
+	torture_suite_add_1smb_test(suite, "vuid", run_vuidtest);
+	torture_suite_add_2smb_test(suite, "rw1",  run_readwritetest);
+	torture_suite_add_2smb_test(suite, "open", run_opentest);
+	torture_suite_add_smb_multi_test(suite, "defer_open", run_deferopen);
+	torture_suite_add_1smb_test(suite, "xcopy", run_xcopy);
+	torture_suite_add_1smb_test(suite, "iometer", run_iometer);
+	torture_suite_add_1smb_test(suite, "rename", torture_test_rename);
 	torture_suite_add_suite(suite, torture_test_delete());
-	torture_suite_add_1smb_test(suite, "PROPERTIES", torture_test_properties);
-	torture_suite_add_1smb_test(suite, "MANGLE", torture_mangle);
-	torture_suite_add_1smb_test(suite, "OPENATTR", torture_openattrtest);
-        torture_suite_add_1smb_test(suite, "WINATTR", torture_winattrtest);
+	torture_suite_add_1smb_test(suite, "properties", torture_test_properties);
+	torture_suite_add_1smb_test(suite, "mangle", torture_mangle);
+	torture_suite_add_1smb_test(suite, "openattr", torture_openattrtest);
+	torture_suite_add_1smb_test(suite, "winattr", torture_winattrtest);
 	torture_suite_add_suite(suite, torture_charset(suite));
-	torture_suite_add_1smb_test(suite, "CHKPATH",  torture_chkpath_test);
-	torture_suite_add_1smb_test(suite, "SECLEAK",  torture_sec_leak);
-	torture_suite_add_simple_test(suite, "DISCONNECT",  torture_disconnect);
+	torture_suite_add_1smb_test(suite, "chkpath",  torture_chkpath_test);
+	torture_suite_add_1smb_test(suite, "secleak",  torture_sec_leak);
+	torture_suite_add_simple_test(suite, "disconnect",  torture_disconnect);
 	torture_suite_add_suite(suite, torture_delay_write());
-	torture_suite_add_simple_test(suite, "SAMBA3ERROR", torture_samba3_errorpaths);
-	torture_suite_add_1smb_test(suite, "CASETABLE", torture_casetable);
-	torture_suite_add_1smb_test(suite, "UTABLE", torture_utable);
-	torture_suite_add_simple_test(suite, "SMB", torture_smb_scan);
+	torture_suite_add_simple_test(suite, "samba3error", torture_samba3_errorpaths);
+	torture_suite_add_1smb_test(suite, "casetable", torture_casetable);
+	torture_suite_add_1smb_test(suite, "utable", torture_utable);
+	torture_suite_add_simple_test(suite, "smb", torture_smb_scan);
 	torture_suite_add_suite(suite, torture_trans2_aliases(suite));
-	torture_suite_add_1smb_test(suite, "TRANS2-SCAN", torture_trans2_scan);
-	torture_suite_add_1smb_test(suite, "NTTRANS", torture_nttrans_scan);
-	torture_suite_add_1smb_test(suite, "CREATEX_ACCESS", torture_createx_access);
-	torture_suite_add_2smb_test(suite, "CREATEX_SHAREMODES_FILE", torture_createx_sharemodes_file);
-	torture_suite_add_2smb_test(suite, "CREATEX_SHAREMODES_DIR", torture_createx_sharemodes_dir);
-	torture_suite_add_1smb_test(suite, "MAXIMUM_ALLOWED", torture_maximum_allowed);
-
-	torture_suite_add_simple_test(suite, "BENCH-HOLDCON", torture_holdcon);
-	torture_suite_add_1smb_test(suite, "BENCH-HOLDOPEN", torture_holdopen);
-	torture_suite_add_simple_test(suite, "BENCH-READWRITE", run_benchrw);
-	torture_suite_add_smb_multi_test(suite, "BENCH-TORTURE", run_torture);
-	torture_suite_add_1smb_test(suite, "SCAN-PIPE_NUMBER", run_pipe_number);
-	torture_suite_add_1smb_test(suite, "SCAN-IOCTL", torture_ioctl_test);
-	torture_suite_add_smb_multi_test(suite, "SCAN-MAXFID", run_maxfidtest);
+	torture_suite_add_1smb_test(suite, "trans2-scan", torture_trans2_scan);
+	torture_suite_add_1smb_test(suite, "nttrans", torture_nttrans_scan);
+	torture_suite_add_1smb_test(suite, "createx_access", torture_createx_access);
+	torture_suite_add_2smb_test(suite, "createx_sharemodes_file", torture_createx_sharemodes_file);
+	torture_suite_add_2smb_test(suite, "createx_sharemodes_dir", torture_createx_sharemodes_dir);
+	torture_suite_add_1smb_test(suite, "maximum_allowed", torture_maximum_allowed);
+
+	torture_suite_add_simple_test(suite, "bench-holdcon", torture_holdcon);
+	torture_suite_add_1smb_test(suite, "bench-holdopen", torture_holdopen);
+	torture_suite_add_simple_test(suite, "bench-readwrite", run_benchrw);
+	torture_suite_add_smb_multi_test(suite, "bench-torture", run_torture);
+	torture_suite_add_1smb_test(suite, "scan-pipe_number", run_pipe_number);
+	torture_suite_add_1smb_test(suite, "scan-ioctl", torture_ioctl_test);
+	torture_suite_add_smb_multi_test(suite, "scan-maxfid", run_maxfidtest);
 
 	suite->description = talloc_strdup(suite, 
 					"Basic SMB tests (imported from the original smbtorture)");
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index b4221a75b6..bdac2de18b 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -197,7 +197,7 @@ static bool test_widea(struct torture_context *tctx,
 
 struct torture_suite *torture_charset(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "CHARSET");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "charset");
 
 	torture_suite_add_1smb_test(suite, "Testing composite character (a umlaut)", test_composed); 
 	torture_suite_add_1smb_test(suite, "Testing naked diacritical (umlaut)", test_diacritical);
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index f82b32fe8d..97968fb0b8 100644
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -3102,7 +3102,7 @@ static bool test_delayed_write_update7(struct torture_context *tctx, struct smbc
 */
 struct torture_suite *torture_delay_write(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "DELAYWRITE");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "delaywrite");
 
 	torture_suite_add_2smb_test(suite, "finfo update on close", test_finfo_after_write);
 	torture_suite_add_1smb_test(suite, "delayed update of write time", test_delayed_write_update);
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 2b26b1e64a..888c5a6b46 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -1586,8 +1586,7 @@ static bool deltest23(struct torture_context *tctx,
 struct torture_suite *torture_test_delete(void)
 {
 	struct torture_suite *suite = torture_suite_create(
-		talloc_autofree_context(),
-		"DELETE");
+		talloc_autofree_context(), "delete");
 
 	torture_suite_add_2smb_test(suite, "deltest1", deltest1);
 	torture_suite_add_2smb_test(suite, "deltest2", deltest2);
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 71364ef578..86cba4e852 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -802,7 +802,7 @@ fail:
 
 struct torture_suite *torture_base_locktest(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCK");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "lock");
 	torture_suite_add_2smb_test(suite, "LOCK1", torture_locktest1);
 	torture_suite_add_1smb_test(suite, "LOCK2", torture_locktest2);
 	torture_suite_add_2smb_test(suite, "LOCK3", torture_locktest3);
diff --git a/source4/torture/dfs/domaindfs.c b/source4/torture/dfs/domaindfs.c
index 022aafff99..467e104e25 100644
--- a/source4/torture/dfs/domaindfs.c
+++ b/source4/torture/dfs/domaindfs.c
@@ -466,8 +466,8 @@ static bool test_low_referral_level(struct torture_context *tctx,
 
 NTSTATUS torture_dfs_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "DFS");
-	struct torture_suite *suite_basic = torture_suite_create(suite, "DOMAIN");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "dfs");
+	struct torture_suite *suite_basic = torture_suite_create(suite, "domain");
 
 	torture_suite_add_suite(suite, suite_basic);
 
diff --git a/source4/torture/drs/drs_init.c b/source4/torture/drs/drs_init.c
index e6b1d612f5..b0aeb411da 100644
--- a/source4/torture/drs/drs_init.c
+++ b/source4/torture/drs/drs_init.c
@@ -68,12 +68,12 @@ NTSTATUS torture_drs_init(void)
 	TALLOC_CTX *mem_ctx = talloc_autofree_context();
 
 	/* register RPC related test cases */
-	suite = torture_drs_rpc_suite(mem_ctx, "DRS-RPC");
+	suite = torture_drs_rpc_suite(mem_ctx, "drs.rpc");
 	if (!suite) return NT_STATUS_NO_MEMORY;
 	torture_register_suite(suite);
 
 	/* register DRS Unit test cases */
-	suite = torture_drs_unit_suite(mem_ctx, "DRS-UNIT");
+	suite = torture_drs_unit_suite(mem_ctx, "drs.unit");
 	if (!suite) return NT_STATUS_NO_MEMORY;
 	torture_register_suite(suite);
 
diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c
index cd9a733492..2ec3ded287 100644
--- a/source4/torture/drs/rpc/dssync.c
+++ b/source4/torture/drs/rpc/dssync.c
@@ -1038,7 +1038,7 @@ void torture_drs_rpc_dssync_tcase(struct torture_suite *suite)
 	typedef bool (*run_func) (struct torture_context *test, void *tcase_data);
 
 	struct torture_test *test;
-	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "DSSYNC");
+	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "dssync");
 
 	torture_tcase_set_fixture(tcase,
 				  torture_dssync_tcase_setup,
diff --git a/source4/torture/drs/unit/prefixmap_tests.c b/source4/torture/drs/unit/prefixmap_tests.c
index 1d39f2dab0..29941ebec6 100644
--- a/source4/torture/drs/unit/prefixmap_tests.c
+++ b/source4/torture/drs/unit/prefixmap_tests.c
@@ -846,7 +846,7 @@ static bool torture_drs_unit_prefixmap_teardown(struct torture_context *tctx, st
 
 /**
  * Test case initialization for
- * DRS-UNIT.prefixMap
+ * drs.unit.prefixMap
  */
 struct torture_tcase * torture_drs_unit_prefixmap(struct torture_suite *suite)
 {
diff --git a/source4/torture/drs/unit/schemainfo_tests.c b/source4/torture/drs/unit/schemainfo_tests.c
index f8fc5ae645..7fa55c4f42 100644
--- a/source4/torture/drs/unit/schemainfo_tests.c
+++ b/source4/torture/drs/unit/schemainfo_tests.c
@@ -633,7 +633,7 @@ static bool torture_drs_unit_schemainfo_teardown(struct torture_context *tctx,
 
 /**
  * Test case initialization for
- * DRS-UNIT.schemaInfo
+ * drs.unit.schemaInfo
  */
 struct torture_tcase * torture_drs_unit_schemainfo(struct torture_suite *suite)
 {
diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c
index 8c0eb02f04..6b132297fc 100644
--- a/source4/torture/ldap/common.c
+++ b/source4/torture/ldap/common.c
@@ -131,14 +131,14 @@ NTSTATUS torture_ldap_close(struct ldap_connection *conn)
 
 NTSTATUS torture_ldap_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "LDAP");
-	torture_suite_add_simple_test(suite, "BENCH-CLDAP", torture_bench_cldap);
-	torture_suite_add_simple_test(suite, "BASIC", torture_ldap_basic);
-	torture_suite_add_simple_test(suite, "SORT", torture_ldap_sort);
-	torture_suite_add_simple_test(suite, "CLDAP", torture_cldap);
-	torture_suite_add_simple_test(suite, "SCHEMA", torture_ldap_schema);
-	torture_suite_add_simple_test(suite, "UPTODATEVECTOR", torture_ldap_uptodatevector);
-	torture_suite_add_simple_test(suite, "NESTED-SEARCH", test_ldap_nested_search);
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "ldap");
+	torture_suite_add_simple_test(suite, "bench-cldap", torture_bench_cldap);
+	torture_suite_add_simple_test(suite, "basic", torture_ldap_basic);
+	torture_suite_add_simple_test(suite, "sort", torture_ldap_sort);
+	torture_suite_add_simple_test(suite, "cldap", torture_cldap);
+	torture_suite_add_simple_test(suite, "schema", torture_ldap_schema);
+	torture_suite_add_simple_test(suite, "uptodatevector", torture_ldap_uptodatevector);
+	torture_suite_add_simple_test(suite, "nested-search", test_ldap_nested_search);
 
 	suite->description = talloc_strdup(suite, "LDAP and CLDAP tests");
 
diff --git a/source4/torture/ldb/ldb.c b/source4/torture/ldb/ldb.c
index f5f09fae38..23f060b9b1 100644
--- a/source4/torture/ldb/ldb.c
+++ b/source4/torture/ldb/ldb.c
@@ -795,17 +795,17 @@ static bool torture_ldb_dn_invalid_extended(struct torture_context *torture)
 
 struct torture_suite *torture_ldb(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "LDB");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "ldb");
 
 	if (suite == NULL) {
 		return NULL;
 	}
 
-	torture_suite_add_simple_test(suite, "ATTRS", torture_ldb_attrs);
-	torture_suite_add_simple_test(suite, "DN-ATTRS", torture_ldb_dn_attrs);
-	torture_suite_add_simple_test(suite, "DN-EXTENDED", torture_ldb_dn_extended);
-	torture_suite_add_simple_test(suite, "DN-INVALID-EXTENDED", torture_ldb_dn_invalid_extended);
-	torture_suite_add_simple_test(suite, "DN", torture_ldb_dn);
+	torture_suite_add_simple_test(suite, "attrs", torture_ldb_attrs);
+	torture_suite_add_simple_test(suite, "dn-attrs", torture_ldb_dn_attrs);
+	torture_suite_add_simple_test(suite, "dn-extended", torture_ldb_dn_extended);
+	torture_suite_add_simple_test(suite, "dn-invalid-extended", torture_ldb_dn_invalid_extended);
+	torture_suite_add_simple_test(suite, "dn", torture_ldb_dn);
 
 	suite->description = talloc_strdup(suite, "LDB (samba-specific behaviour) tests");
 
diff --git a/source4/torture/libnet/libnet.c b/source4/torture/libnet/libnet.c
index 545f636a6c..3b9548cec9 100644
--- a/source4/torture/libnet/libnet.c
+++ b/source4/torture/libnet/libnet.c
@@ -26,40 +26,41 @@
 
 NTSTATUS torture_net_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NET");
+	struct torture_suite *suite = torture_suite_create(
+		talloc_autofree_context(), "net");
 
-	torture_suite_add_simple_test(suite, "USERINFO", torture_userinfo);
-	torture_suite_add_simple_test(suite, "USERADD", torture_useradd);
-	torture_suite_add_simple_test(suite, "USERDEL", torture_userdel);
-	torture_suite_add_simple_test(suite, "USERMOD", torture_usermod);
-	torture_suite_add_simple_test(suite, "DOMOPEN", torture_domainopen);
-	torture_suite_add_simple_test(suite, "GROUPINFO", torture_groupinfo);
-	torture_suite_add_simple_test(suite, "GROUPADD", torture_groupadd);
-	torture_suite_add_simple_test(suite, "API-LOOKUP", torture_lookup);
-	torture_suite_add_simple_test(suite, "API-LOOKUPHOST", torture_lookup_host);
-	torture_suite_add_simple_test(suite, "API-LOOKUPPDC", torture_lookup_pdc);
-	torture_suite_add_simple_test(suite, "API-LOOKUPNAME", torture_lookup_sam_name);
-	torture_suite_add_simple_test(suite, "API-CREATEUSER", torture_createuser);
-	torture_suite_add_simple_test(suite, "API-DELETEUSER", torture_deleteuser);
-	torture_suite_add_simple_test(suite, "API-MODIFYUSER", torture_modifyuser);
-	torture_suite_add_simple_test(suite, "API-USERINFO", torture_userinfo_api);
-	torture_suite_add_simple_test(suite, "API-USERLIST", torture_userlist);
-	torture_suite_add_simple_test(suite, "API-GROUPINFO", torture_groupinfo_api);
-	torture_suite_add_simple_test(suite, "API-GROUPLIST", torture_grouplist);
-	torture_suite_add_simple_test(suite, "API-CREATEGROUP", torture_creategroup);
-	torture_suite_add_simple_test(suite, "API-RPCCONN-BIND", torture_rpc_connect_binding);
-	torture_suite_add_simple_test(suite, "API-RPCCONN-SRV", torture_rpc_connect_srv);
-	torture_suite_add_simple_test(suite, "API-RPCCONN-PDC", torture_rpc_connect_pdc);
-	torture_suite_add_simple_test(suite, "API-RPCCONN-DC", torture_rpc_connect_dc);
-	torture_suite_add_simple_test(suite, "API-RPCCONN-DCINFO", torture_rpc_connect_dc_info);
-	torture_suite_add_simple_test(suite, "API-LISTSHARES", torture_listshares);
-	torture_suite_add_simple_test(suite, "API-DELSHARE", torture_delshare);
-	torture_suite_add_simple_test(suite, "API-DOMOPENLSA", torture_domain_open_lsa);
-	torture_suite_add_simple_test(suite, "API-DOMCLOSELSA", torture_domain_close_lsa);
-	torture_suite_add_simple_test(suite, "API-DOMOPENSAMR", torture_domain_open_samr);
-	torture_suite_add_simple_test(suite, "API-DOMCLOSESAMR", torture_domain_close_samr);
-	torture_suite_add_simple_test(suite, "API-BECOME-DC", torture_net_become_dc);
-	torture_suite_add_simple_test(suite, "API-DOMLIST", torture_domain_list);
+	torture_suite_add_simple_test(suite, "userinfo", torture_userinfo);
+	torture_suite_add_simple_test(suite, "useradd", torture_useradd);
+	torture_suite_add_simple_test(suite, "userdel", torture_userdel);
+	torture_suite_add_simple_test(suite, "usermod", torture_usermod);
+	torture_suite_add_simple_test(suite, "domopen", torture_domainopen);
+	torture_suite_add_simple_test(suite, "groupinfo", torture_groupinfo);
+	torture_suite_add_simple_test(suite, "groupadd", torture_groupadd);
+	torture_suite_add_simple_test(suite, "api.lookup", torture_lookup);
+	torture_suite_add_simple_test(suite, "api.lookuphost", torture_lookup_host);
+	torture_suite_add_simple_test(suite, "api.lookuppdc", torture_lookup_pdc);
+	torture_suite_add_simple_test(suite, "api.lookupname", torture_lookup_sam_name);
+	torture_suite_add_simple_test(suite, "api.createuser", torture_createuser);
+	torture_suite_add_simple_test(suite, "api.deleteuser", torture_deleteuser);
+	torture_suite_add_simple_test(suite, "api.modifyuser", torture_modifyuser);
+	torture_suite_add_simple_test(suite, "api.userinfo", torture_userinfo_api);
+	torture_suite_add_simple_test(suite, "api.userlist", torture_userlist);
+	torture_suite_add_simple_test(suite, "api.groupinfo", torture_groupinfo_api);
+	torture_suite_add_simple_test(suite, "api.grouplist", torture_grouplist);
+	torture_suite_add_simple_test(suite, "api.creategroup", torture_creategroup);
+	torture_suite_add_simple_test(suite, "api.rpcconn.bind", torture_rpc_connect_binding);
+	torture_suite_add_simple_test(suite, "api.rpcconn.srv", torture_rpc_connect_srv);
+	torture_suite_add_simple_test(suite, "api.rpcconn.pdc", torture_rpc_connect_pdc);
+	torture_suite_add_simple_test(suite, "api.rpcconn.dc", torture_rpc_connect_dc);
+	torture_suite_add_simple_test(suite, "api.rpcconn.dcinfo", torture_rpc_connect_dc_info);
+	torture_suite_add_simple_test(suite, "api.listshares", torture_listshares);
+	torture_suite_add_simple_test(suite, "api.delshare", torture_delshare);
+	torture_suite_add_simple_test(suite, "api.domopenlsa", torture_domain_open_lsa);
+	torture_suite_add_simple_test(suite, "api.domcloselsa", torture_domain_close_lsa);
+	torture_suite_add_simple_test(suite, "api.domopensamr", torture_domain_open_samr);
+	torture_suite_add_simple_test(suite, "api.domclosesamr", torture_domain_close_samr);
+	torture_suite_add_simple_test(suite, "api.become.dc", torture_net_become_dc);
+	torture_suite_add_simple_test(suite, "api.domlist", torture_domain_list);
 
 	suite->description = talloc_strdup(suite, "libnet convenience interface tests");
 
diff --git a/source4/torture/libnetapi/libnetapi.c b/source4/torture/libnetapi/libnetapi.c
index 6854bf8444..633dc6cc3e 100644
--- a/source4/torture/libnetapi/libnetapi.c
+++ b/source4/torture/libnetapi/libnetapi.c
@@ -66,12 +66,12 @@ NTSTATUS torture_libnetapi_init(void)
 {
 	struct torture_suite *suite;
 
-	suite = torture_suite_create(talloc_autofree_context(), "NETAPI");
+	suite = torture_suite_create(talloc_autofree_context(), "netapi");
 
-	torture_suite_add_simple_test(suite, "SERVER", torture_libnetapi_server);
-	torture_suite_add_simple_test(suite, "GROUP", torture_libnetapi_group);
-	torture_suite_add_simple_test(suite, "USER", torture_libnetapi_user);
-	torture_suite_add_simple_test(suite, "INITIALIZE", torture_libnetapi_initialize);
+	torture_suite_add_simple_test(suite, "server", torture_libnetapi_server);
+	torture_suite_add_simple_test(suite, "group", torture_libnetapi_group);
+	torture_suite_add_simple_test(suite, "user", torture_libnetapi_user);
+	torture_suite_add_simple_test(suite, "initialize", torture_libnetapi_initialize);
 
 	suite->description = talloc_strdup(suite, "libnetapi convenience interface tests");
 
diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c
index 982253920b..2e78c3a402 100644
--- a/source4/torture/libsmbclient/libsmbclient.c
+++ b/source4/torture/libsmbclient/libsmbclient.c
@@ -205,13 +205,13 @@ NTSTATUS torture_libsmbclient_init(void)
 {
 	struct torture_suite *suite;
 
-	suite = torture_suite_create(talloc_autofree_context(), "LIBSMBCLIENT");
+	suite = torture_suite_create(talloc_autofree_context(), "libsmbclient");
 
-	torture_suite_add_simple_test(suite, "VERSION", torture_libsmbclient_version);
-	torture_suite_add_simple_test(suite, "INITIALIZE", torture_libsmbclient_initialize);
-	torture_suite_add_simple_test(suite, "CONFIGURATION", torture_libsmbclient_configuration);
-	torture_suite_add_simple_test(suite, "OPTIONS", torture_libsmbclient_options);
-	torture_suite_add_simple_test(suite, "OPENDIR", torture_libsmbclient_opendir);
+	torture_suite_add_simple_test(suite, "version", torture_libsmbclient_version);
+	torture_suite_add_simple_test(suite, "initialize", torture_libsmbclient_initialize);
+	torture_suite_add_simple_test(suite, "configuration", torture_libsmbclient_configuration);
+	torture_suite_add_simple_test(suite, "options", torture_libsmbclient_options);
+	torture_suite_add_simple_test(suite, "opendir", torture_libsmbclient_opendir);
 
 	suite->description = talloc_strdup(suite, "libsmbclient interface tests");
 
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 62c1384d77..45c4341bc6 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -257,7 +257,7 @@ failed:
 
 struct torture_suite *torture_local_dbspeed(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *s = torture_suite_create(mem_ctx, "DBSPEED");
+	struct torture_suite *s = torture_suite_create(mem_ctx, "dbspeed");
 	torture_suite_add_simple_tcase_const(s, "tdb_speed", test_tdb_speed,
 			NULL);
 	torture_suite_add_simple_tcase_const(s, "ldb_speed", test_ldb_speed,
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index 2f29c35fb2..d044c8f877 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -75,17 +75,16 @@ NTSTATUS torture_local_init(void)
 {
 	int i;
 	struct torture_suite *suite = torture_suite_create(
-		talloc_autofree_context(),
-		"LOCAL");
+		talloc_autofree_context(), "local");
 	
-	torture_suite_add_simple_test(suite, "TALLOC", torture_local_talloc);
-	torture_suite_add_simple_test(suite, "REPLACE", torture_local_replace);
+	torture_suite_add_simple_test(suite, "talloc", torture_local_talloc);
+	torture_suite_add_simple_test(suite, "replace", torture_local_replace);
 	
 	torture_suite_add_simple_test(suite, 
-				      "CRYPTO-MD4", torture_local_crypto_md4);
-	torture_suite_add_simple_test(suite, "CRYPTO-MD5", 
+				      "crypto.md4", torture_local_crypto_md4);
+	torture_suite_add_simple_test(suite, "crypto.md5", 
 				      torture_local_crypto_md5);
-	torture_suite_add_simple_test(suite, "CRYPTO-HMACMD5", 
+	torture_suite_add_simple_test(suite, "crypto.hmacmd5", 
 				      torture_local_crypto_hmacmd5);
 
 	for (i = 0; suite_generators[i]; i++)
diff --git a/source4/torture/local/torture.c b/source4/torture/local/torture.c
index 5a8700d34d..0eb69a5db8 100644
--- a/source4/torture/local/torture.c
+++ b/source4/torture/local/torture.c
@@ -74,8 +74,7 @@ static bool test_provision(struct torture_context *tctx)
 
 struct torture_suite *torture_local_torture(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, 
-													   "TORTURE");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "torture");
 
 	torture_suite_add_simple_test(suite, "tempdir", test_tempdir);
 	torture_suite_add_simple_test(suite, "provision", test_provision);
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index b96a32b30e..b0e3364f7e 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -282,12 +282,10 @@ bool torture_nbench(struct torture_context *torture)
 
 NTSTATUS torture_nbench_init(void)
 {
-	struct torture_suite *suite = 
-		torture_suite_create(
-			talloc_autofree_context(),
-			"BENCH");
+	struct torture_suite *suite = torture_suite_create(
+						   talloc_autofree_context(), "bench");
 
-	torture_suite_add_simple_test(suite, "NBENCH", torture_nbench);
+	torture_suite_add_simple_test(suite, "nbench", torture_nbench);
 
 	suite->description = talloc_strdup(suite, "Benchmarks");
 
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 8a701ac499..36914bdcc3 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -655,7 +655,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
 */
 struct torture_suite *torture_nbt_dgram(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "DGRAM");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "dgram");
 
 	torture_suite_add_simple_test(suite, "netlogon", nbt_test_netlogon);
 	torture_suite_add_simple_test(suite, "netlogon2", nbt_test_netlogon2);
diff --git a/source4/torture/nbt/nbt.c b/source4/torture/nbt/nbt.c
index 6ea31dae86..7c45f867e7 100644
--- a/source4/torture/nbt/nbt.c
+++ b/source4/torture/nbt/nbt.c
@@ -49,7 +49,7 @@ bool torture_nbt_get_name(struct torture_context *tctx,
 NTSTATUS torture_nbt_init(void)
 {
 	struct torture_suite *suite = torture_suite_create(
-		talloc_autofree_context(), "NBT");
+		talloc_autofree_context(), "nbt");
 	/* nbt tests */
 	torture_suite_add_suite(suite, torture_nbt_register(suite));
 	torture_suite_add_suite(suite, torture_nbt_wins(suite));
diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index a05e34c0e6..d64683aa57 100644
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -108,7 +108,7 @@ static bool bench_namequery(struct torture_context *tctx)
 */
 struct torture_suite *torture_bench_nbt(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "BENCH");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "bench");
 	torture_suite_add_simple_test(suite, "namequery", bench_namequery);
 
 	return suite;
diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c
index eadee9b44d..d52ae4181e 100644
--- a/source4/torture/nbt/register.c
+++ b/source4/torture/nbt/register.c
@@ -168,7 +168,7 @@ struct torture_suite *torture_nbt_register(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite;
 
-	suite = torture_suite_create(mem_ctx, "REGISTER");
+	suite = torture_suite_create(mem_ctx, "register");
 	torture_suite_add_simple_test(suite, "register_own", nbt_register_own);
 	torture_suite_add_simple_test(suite, "refresh_own", nbt_refresh_own);
 
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index fd8463a936..0ddaa8a05a 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -533,7 +533,7 @@ static bool nbt_test_wins(struct torture_context *tctx)
 */
 struct torture_suite *torture_nbt_wins(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "WINS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "wins");
 
 	torture_suite_add_simple_test(suite, "wins", nbt_test_wins);
 
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index c77c63544c..aff620878c 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -292,8 +292,7 @@ static bool bench_wins(struct torture_context *tctx)
 */
 struct torture_suite *torture_bench_wins(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, 
-							   "BENCH-WINS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "bench-wins");
 
 	torture_suite_add_simple_test(suite, "wins", bench_wins);
 
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index ee4b8744e4..cf8db494ca 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -9739,15 +9739,14 @@ static bool torture_nbt_winsreplication_owned(struct torture_context *tctx)
 struct torture_suite *torture_nbt_winsreplication(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite = torture_suite_create(
-		mem_ctx, "WINSREPLICATION");
+		mem_ctx, "winsreplication");
 	struct torture_tcase *tcase;
 
 	tcase = torture_suite_add_simple_test(suite, "assoc_ctx1", 
 					     test_assoc_ctx1);
 	tcase->tests->dangerous = true;
 
-	torture_suite_add_simple_test(suite, "assoc_ctx2", 
-				      test_assoc_ctx2);
+	torture_suite_add_simple_test(suite, "assoc_ctx2", test_assoc_ctx2);
 	
 	torture_suite_add_simple_test(suite, "wins_replication",
 				      test_wins_replication);
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index 8c2e7f8e45..e7c11a01be 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -339,7 +339,7 @@ static bool test_compare_uuid(struct torture_context *tctx)
 
 struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "NDR");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "ndr");
 
 	torture_suite_add_suite(suite, ndr_winreg_suite(suite));
 	torture_suite_add_suite(suite, ndr_atsvc_suite(suite));
diff --git a/source4/torture/ntp/ntp_signd.c b/source4/torture/ntp/ntp_signd.c
index b651c76059..ce49d4fb85 100644
--- a/source4/torture/ntp/ntp_signd.c
+++ b/source4/torture/ntp/ntp_signd.c
@@ -284,11 +284,11 @@ static bool test_ntp_signd(struct torture_context *tctx,
 
 NTSTATUS torture_ntp_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NTP");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "ntp");
 	struct torture_rpc_tcase *tcase;
 
-	tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite, "SIGND",
-								      &ndr_table_netlogon, TEST_MACHINE_NAME);
+	tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite,
+				  "signd", &ndr_table_netlogon, TEST_MACHINE_NAME);
 
 	torture_rpc_tcase_add_test_creds(tcase, "ntp_signd", test_ntp_signd);
 
diff --git a/source4/torture/rap/printing.c b/source4/torture/rap/printing.c
index a2ee582758..a8ccac56c2 100644
--- a/source4/torture/rap/printing.c
+++ b/source4/torture/rap/printing.c
@@ -686,7 +686,7 @@ static bool test_rap_print(struct torture_context *tctx,
 
 struct torture_suite *torture_rap_printing(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "PRINTING");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "printing");
 
 	torture_suite_add_1smb_test(suite, "raw_print", test_raw_print);
 	torture_suite_add_1smb_test(suite, "rap_print", test_rap_print);
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 7583d1dd80..04c10a96b3 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -1550,8 +1550,8 @@ bool torture_rap_scan(struct torture_context *torture, struct smbcli_state *cli)
 
 NTSTATUS torture_rap_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "RAP");
-	struct torture_suite *suite_basic = torture_suite_create(suite, "BASIC");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "rap");
+	struct torture_suite *suite_basic = torture_suite_create(suite, "basic");
 
 	torture_suite_add_suite(suite, suite_basic);
 	torture_suite_add_suite(suite, torture_rap_rpc(suite));
@@ -1565,7 +1565,7 @@ NTSTATUS torture_rap_init(void)
 	torture_suite_add_1smb_test(suite_basic, "netservergetinfo",
 				    test_netservergetinfo);
 
-	torture_suite_add_1smb_test(suite, "SCAN", torture_rap_scan);
+	torture_suite_add_1smb_test(suite, "scan", torture_rap_scan);
 
 	suite->description = talloc_strdup(suite, 
 						"Remote Administration Protocol tests");
diff --git a/source4/torture/rap/rpc.c b/source4/torture/rap/rpc.c
index 6335a54b35..288d4a0301 100644
--- a/source4/torture/rap/rpc.c
+++ b/source4/torture/rap/rpc.c
@@ -88,7 +88,7 @@ static bool test_rpc_netservergetinfo(struct torture_context *tctx,
 
 struct torture_suite *torture_rap_rpc(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "RPC");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "rpc");
 
 	torture_suite_add_1smb_test(suite, "netservergetinfo",
 				    test_rpc_netservergetinfo);
diff --git a/source4/torture/rap/sam.c b/source4/torture/rap/sam.c
index 34e8742068..d452a53ee8 100644
--- a/source4/torture/rap/sam.c
+++ b/source4/torture/rap/sam.c
@@ -238,7 +238,7 @@ static bool test_usergetinfo(struct torture_context *tctx,
 
 struct torture_suite *torture_rap_sam(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAM");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "sam");
 
 	torture_suite_add_1smb_test(suite, "userpasswordset2", test_userpasswordset2);
 	torture_suite_add_1smb_test(suite, "oemchangepassword", test_oemchangepassword);
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 1d4bee1486..c1d41c6f10 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -2438,19 +2438,19 @@ done:
 */
 struct torture_suite *torture_raw_acls(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "ACLS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "acls");
 
-	torture_suite_add_1smb_test(suite, "SD", test_sd);
-	torture_suite_add_1smb_test(suite, "CREATE_FILE", test_nttrans_create_file);
-	torture_suite_add_1smb_test(suite, "CREATE_DIR", test_nttrans_create_dir);
-	torture_suite_add_1smb_test(suite, "NULLDACL", test_nttrans_create_null_dacl);
-	torture_suite_add_1smb_test(suite, "CREATOR", test_creator_sid);
-	torture_suite_add_1smb_test(suite, "GENERIC", test_generic_bits);
-	torture_suite_add_1smb_test(suite, "OWNER", test_owner_bits);
-	torture_suite_add_1smb_test(suite, "INHERITANCE", test_inheritance);
+	torture_suite_add_1smb_test(suite, "sd", test_sd);
+	torture_suite_add_1smb_test(suite, "create_file", test_nttrans_create_file);
+	torture_suite_add_1smb_test(suite, "create_dir", test_nttrans_create_dir);
+	torture_suite_add_1smb_test(suite, "nulldacl", test_nttrans_create_null_dacl);
+	torture_suite_add_1smb_test(suite, "creator", test_creator_sid);
+	torture_suite_add_1smb_test(suite, "generic", test_generic_bits);
+	torture_suite_add_1smb_test(suite, "owner", test_owner_bits);
+	torture_suite_add_1smb_test(suite, "inheritance", test_inheritance);
 
 	/* torture_suite_add_1smb_test(suite, "INHERITFLAGS", test_inheritance_flags); */
-	torture_suite_add_1smb_test(suite, "DYNAMIC", test_inheritance_dynamic);
+	torture_suite_add_1smb_test(suite, "dynamic", test_inheritance_dynamic);
 	/* XXX This test does not work against XP or Vista.
 	torture_suite_add_1smb_test(suite, "GETSET", test_sd_get_set);
 	*/
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 17757e4116..df44dd3fa2 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -2273,7 +2273,7 @@ done:
 */
 struct torture_suite *torture_raw_lock(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCK");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "lock");
 
 	torture_suite_add_1smb_test(suite, "lockx", test_lockx);
 	torture_suite_add_1smb_test(suite, "lock", test_lock);
@@ -2286,10 +2286,8 @@ struct torture_suite *torture_raw_lock(TALLOC_CTX *mem_ctx)
 	torture_suite_add_1smb_test(suite, "unlock", test_unlock);
 	torture_suite_add_1smb_test(suite, "multiple_unlock",
 	    test_multiple_unlock);
-	torture_suite_add_1smb_test(suite, "zerobytelocks",
-	    test_zerobytelocks);
-	torture_suite_add_1smb_test(suite, "zerobyteread",
-	    test_zerobyteread);
+	torture_suite_add_1smb_test(suite, "zerobytelocks", test_zerobytelocks);
+	torture_suite_add_1smb_test(suite, "zerobyteread", test_zerobyteread);
 
 	return suite;
 }
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index c8494ab22b..5661c2f6f6 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -2069,25 +2069,25 @@ static bool test_ntcreatexdir(struct torture_context *tctx,
 */
 struct torture_suite *torture_raw_open(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "OPEN");
-
-	torture_suite_add_1smb_test(suite, "BRLOCKED", test_ntcreatex_brlocked);
-	torture_suite_add_1smb_test(suite, "OPEN", test_open);
-	torture_suite_add_1smb_test(suite, "OPEN-MULTI", test_raw_open_multi);
-	torture_suite_add_1smb_test(suite, "OPENX", test_openx);
-	torture_suite_add_1smb_test(suite, "NTCREATEX", test_ntcreatex);
-	torture_suite_add_1smb_test(suite, "NTTRANS-CREATE", test_nttrans_create);
-	torture_suite_add_1smb_test(suite, "T2OPEN", test_t2open);
-	torture_suite_add_1smb_test(suite, "MKNEW", test_mknew);
-	torture_suite_add_1smb_test(suite, "CREATE", test_create);
-	torture_suite_add_1smb_test(suite, "CTEMP", test_ctemp);
-	torture_suite_add_1smb_test(suite, "CHAINED-OPENX", test_chained);
-	torture_suite_add_1smb_test(suite, "CHAINED-NTCREATEX", test_chained_ntcreatex_readx);
-	torture_suite_add_1smb_test(suite, "NO-LEADING-SLASH", test_no_leading_slash);
-	torture_suite_add_1smb_test(suite, "OPENX-OVER-DIR", test_openx_over_dir);
-	torture_suite_add_1smb_test(suite, "OPEN-FOR-DELETE", test_open_for_delete);
-	torture_suite_add_1smb_test(suite, "OPENDISP-DIR", test_ntcreatex_opendisp_dir);
-	torture_suite_add_1smb_test(suite, "NTCREATEDIR", test_ntcreatexdir);
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "open");
+
+	torture_suite_add_1smb_test(suite, "brlocked", test_ntcreatex_brlocked);
+	torture_suite_add_1smb_test(suite, "open", test_open);
+	torture_suite_add_1smb_test(suite, "open-multi", test_raw_open_multi);
+	torture_suite_add_1smb_test(suite, "openx", test_openx);
+	torture_suite_add_1smb_test(suite, "ntcreatex", test_ntcreatex);
+	torture_suite_add_1smb_test(suite, "nttrans-create", test_nttrans_create);
+	torture_suite_add_1smb_test(suite, "t2open", test_t2open);
+	torture_suite_add_1smb_test(suite, "mknew", test_mknew);
+	torture_suite_add_1smb_test(suite, "create", test_create);
+	torture_suite_add_1smb_test(suite, "ctemp", test_ctemp);
+	torture_suite_add_1smb_test(suite, "chained-openx", test_chained);
+	torture_suite_add_1smb_test(suite, "chained-ntcreatex", test_chained_ntcreatex_readx);
+	torture_suite_add_1smb_test(suite, "no-leading-slash", test_no_leading_slash);
+	torture_suite_add_1smb_test(suite, "openx-over-dir", test_openx_over_dir);
+	torture_suite_add_1smb_test(suite, "open-for-delete", test_open_for_delete);
+	torture_suite_add_1smb_test(suite, "opendisp-dir", test_ntcreatex_opendisp_dir);
+	torture_suite_add_1smb_test(suite, "ntcreatedir", test_ntcreatexdir);
 
 	return suite;
 }
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 835a1b27b6..962235cdcd 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -3860,46 +3860,46 @@ done:
 */
 struct torture_suite *torture_raw_oplock(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "OPLOCK");
-
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE1", test_raw_oplock_exclusive1);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE2", test_raw_oplock_exclusive2);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE3", test_raw_oplock_exclusive3);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE4", test_raw_oplock_exclusive4);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE5", test_raw_oplock_exclusive5);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE6", test_raw_oplock_exclusive6);
-	torture_suite_add_2smb_test(suite, "EXCLUSIVE7", test_raw_oplock_exclusive7);
-	torture_suite_add_2smb_test(suite, "BATCH1", test_raw_oplock_batch1);
-	torture_suite_add_2smb_test(suite, "BATCH2", test_raw_oplock_batch2);
-	torture_suite_add_2smb_test(suite, "BATCH3", test_raw_oplock_batch3);
-	torture_suite_add_2smb_test(suite, "BATCH4", test_raw_oplock_batch4);
-	torture_suite_add_2smb_test(suite, "BATCH5", test_raw_oplock_batch5);
-	torture_suite_add_2smb_test(suite, "BATCH6", test_raw_oplock_batch6);
-	torture_suite_add_2smb_test(suite, "BATCH7", test_raw_oplock_batch7);
-	torture_suite_add_2smb_test(suite, "BATCH8", test_raw_oplock_batch8);
-	torture_suite_add_2smb_test(suite, "BATCH9", test_raw_oplock_batch9);
-	torture_suite_add_2smb_test(suite, "BATCH10", test_raw_oplock_batch10);
-	torture_suite_add_2smb_test(suite, "BATCH11", test_raw_oplock_batch11);
-	torture_suite_add_2smb_test(suite, "BATCH12", test_raw_oplock_batch12);
-	torture_suite_add_2smb_test(suite, "BATCH13", test_raw_oplock_batch13);
-	torture_suite_add_2smb_test(suite, "BATCH14", test_raw_oplock_batch14);
-	torture_suite_add_2smb_test(suite, "BATCH15", test_raw_oplock_batch15);
-	torture_suite_add_2smb_test(suite, "BATCH16", test_raw_oplock_batch16);
-	torture_suite_add_2smb_test(suite, "BATCH17", test_raw_oplock_batch17);
-	torture_suite_add_2smb_test(suite, "BATCH18", test_raw_oplock_batch18);
-	torture_suite_add_2smb_test(suite, "BATCH19", test_raw_oplock_batch19);
-	torture_suite_add_2smb_test(suite, "BATCH20", test_raw_oplock_batch20);
-	torture_suite_add_2smb_test(suite, "BATCH21", test_raw_oplock_batch21);
-	torture_suite_add_2smb_test(suite, "BATCH22", test_raw_oplock_batch22);
-	torture_suite_add_2smb_test(suite, "BATCH23", test_raw_oplock_batch23);
-	torture_suite_add_2smb_test(suite, "BATCH24", test_raw_oplock_batch24);
-	torture_suite_add_2smb_test(suite, "BATCH25", test_raw_oplock_batch25);
-	torture_suite_add_2smb_test(suite, "BATCH26", test_raw_oplock_batch26);
-	torture_suite_add_2smb_test(suite, "STREAM1", test_raw_oplock_stream1);
-	torture_suite_add_1smb_test(suite, "DOC1", test_raw_oplock_doc);
-	torture_suite_add_2smb_test(suite, "BRL1", test_raw_oplock_brl1);
-	torture_suite_add_1smb_test(suite, "BRL2", test_raw_oplock_brl2);
-	torture_suite_add_1smb_test(suite, "BRL3", test_raw_oplock_brl3);
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "oplock");
+
+	torture_suite_add_2smb_test(suite, "exclusive1", test_raw_oplock_exclusive1);
+	torture_suite_add_2smb_test(suite, "exclusive2", test_raw_oplock_exclusive2);
+	torture_suite_add_2smb_test(suite, "exclusive3", test_raw_oplock_exclusive3);
+	torture_suite_add_2smb_test(suite, "exclusive4", test_raw_oplock_exclusive4);
+	torture_suite_add_2smb_test(suite, "exclusive5", test_raw_oplock_exclusive5);
+	torture_suite_add_2smb_test(suite, "exclusive6", test_raw_oplock_exclusive6);
+	torture_suite_add_2smb_test(suite, "exclusive7", test_raw_oplock_exclusive7);
+	torture_suite_add_2smb_test(suite, "batch1", test_raw_oplock_batch1);
+	torture_suite_add_2smb_test(suite, "batch2", test_raw_oplock_batch2);
+	torture_suite_add_2smb_test(suite, "batch3", test_raw_oplock_batch3);
+	torture_suite_add_2smb_test(suite, "batch4", test_raw_oplock_batch4);
+	torture_suite_add_2smb_test(suite, "batch5", test_raw_oplock_batch5);
+	torture_suite_add_2smb_test(suite, "batch6", test_raw_oplock_batch6);
+	torture_suite_add_2smb_test(suite, "batch7", test_raw_oplock_batch7);
+	torture_suite_add_2smb_test(suite, "batch8", test_raw_oplock_batch8);
+	torture_suite_add_2smb_test(suite, "batch9", test_raw_oplock_batch9);
+	torture_suite_add_2smb_test(suite, "batch10", test_raw_oplock_batch10);
+	torture_suite_add_2smb_test(suite, "batch11", test_raw_oplock_batch11);
+	torture_suite_add_2smb_test(suite, "batch12", test_raw_oplock_batch12);
+	torture_suite_add_2smb_test(suite, "batch13", test_raw_oplock_batch13);
+	torture_suite_add_2smb_test(suite, "batch14", test_raw_oplock_batch14);
+	torture_suite_add_2smb_test(suite, "batch15", test_raw_oplock_batch15);
+	torture_suite_add_2smb_test(suite, "batch16", test_raw_oplock_batch16);
+	torture_suite_add_2smb_test(suite, "batch17", test_raw_oplock_batch17);
+	torture_suite_add_2smb_test(suite, "batch18", test_raw_oplock_batch18);
+	torture_suite_add_2smb_test(suite, "batch19", test_raw_oplock_batch19);
+	torture_suite_add_2smb_test(suite, "batch20", test_raw_oplock_batch20);
+	torture_suite_add_2smb_test(suite, "batch21", test_raw_oplock_batch21);
+	torture_suite_add_2smb_test(suite, "batch22", test_raw_oplock_batch22);
+	torture_suite_add_2smb_test(suite, "batch23", test_raw_oplock_batch23);
+	torture_suite_add_2smb_test(suite, "batch24", test_raw_oplock_batch24);
+	torture_suite_add_2smb_test(suite, "batch25", test_raw_oplock_batch25);
+	torture_suite_add_2smb_test(suite, "batch26", test_raw_oplock_batch26);
+	torture_suite_add_2smb_test(suite, "stream1", test_raw_oplock_stream1);
+	torture_suite_add_1smb_test(suite, "doc1", test_raw_oplock_doc);
+	torture_suite_add_2smb_test(suite, "brl1", test_raw_oplock_brl1);
+	torture_suite_add_1smb_test(suite, "brl2", test_raw_oplock_brl2);
+	torture_suite_add_1smb_test(suite, "brl3", test_raw_oplock_brl3);
 
 	return suite;
 }
diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c
index 3d299a9fb0..88cb1c59a4 100644
--- a/source4/torture/raw/raw.c
+++ b/source4/torture/raw/raw.c
@@ -26,55 +26,54 @@
 NTSTATUS torture_raw_init(void)
 {
 	struct torture_suite *suite = torture_suite_create(
-		talloc_autofree_context(),
-		"RAW");
+		talloc_autofree_context(), "raw");
 	/* RAW smb tests */
-	torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock);
-	torture_suite_add_simple_test(suite, "PING-PONG", torture_ping_pong);
-	torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock);
-	torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open);
-	torture_suite_add_simple_test(suite, "BENCH-LOOKUP",
+	torture_suite_add_simple_test(suite, "bench-oplock", torture_bench_oplock);
+	torture_suite_add_simple_test(suite, "ping-pong", torture_ping_pong);
+	torture_suite_add_simple_test(suite, "bench-lock", torture_bench_lock);
+	torture_suite_add_simple_test(suite, "bench-open", torture_bench_open);
+	torture_suite_add_simple_test(suite, "bench-lookup",
 		torture_bench_lookup);
-	torture_suite_add_simple_test(suite, "BENCH-TCON",
+	torture_suite_add_simple_test(suite, "bench-tcon",
 		torture_bench_treeconnect);
-	torture_suite_add_simple_test(suite, "OFFLINE", torture_test_offline);
-	torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo);
-	torture_suite_add_1smb_test(suite, "QFILEINFO", torture_raw_qfileinfo);
-	torture_suite_add_1smb_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe);
+	torture_suite_add_simple_test(suite, "offline", torture_test_offline);
+	torture_suite_add_1smb_test(suite, "qfsinfo", torture_raw_qfsinfo);
+	torture_suite_add_1smb_test(suite, "qfileinfo", torture_raw_qfileinfo);
+	torture_suite_add_1smb_test(suite, "qfileinfo.ipc", torture_raw_qfileinfo_pipe);
 	torture_suite_add_suite(suite, torture_raw_sfileinfo(suite));
 	torture_suite_add_suite(suite, torture_raw_search(suite));
-	torture_suite_add_1smb_test(suite, "CLOSE", torture_raw_close);
+	torture_suite_add_1smb_test(suite, "close", torture_raw_close);
 	torture_suite_add_suite(suite, torture_raw_open(suite));
-	torture_suite_add_1smb_test(suite, "MKDIR", torture_raw_mkdir);
+	torture_suite_add_1smb_test(suite, "mkdir", torture_raw_mkdir);
 	torture_suite_add_suite(suite, torture_raw_oplock(suite));
-	torture_suite_add_1smb_test(suite, "HOLD-OPLOCK", torture_hold_oplock);
-	torture_suite_add_2smb_test(suite, "NOTIFY", torture_raw_notify);
-	torture_suite_add_1smb_test(suite, "MUX", torture_raw_mux);
-	torture_suite_add_1smb_test(suite, "IOCTL", torture_raw_ioctl);
-	torture_suite_add_1smb_test(suite, "CHKPATH", torture_raw_chkpath);
+	torture_suite_add_1smb_test(suite, "hold-oplock", torture_hold_oplock);
+	torture_suite_add_2smb_test(suite, "notify", torture_raw_notify);
+	torture_suite_add_1smb_test(suite, "mux", torture_raw_mux);
+	torture_suite_add_1smb_test(suite, "ioctl", torture_raw_ioctl);
+	torture_suite_add_1smb_test(suite, "chkpath", torture_raw_chkpath);
 	torture_suite_add_suite(suite, torture_raw_unlink(suite));
 	torture_suite_add_suite(suite, torture_raw_read(suite));
 	torture_suite_add_suite(suite, torture_raw_write(suite));
 	torture_suite_add_suite(suite, torture_raw_lock(suite));
-	torture_suite_add_1smb_test(suite, "CONTEXT", torture_raw_context);
+	torture_suite_add_1smb_test(suite, "context", torture_raw_context);
 	torture_suite_add_suite(suite, torture_raw_rename(suite));
-	torture_suite_add_1smb_test(suite, "SEEK", torture_raw_seek);
-	torture_suite_add_1smb_test(suite, "EAS", torture_raw_eas);
+	torture_suite_add_1smb_test(suite, "seek", torture_raw_seek);
+	torture_suite_add_1smb_test(suite, "eas", torture_raw_eas);
 	torture_suite_add_suite(suite, torture_raw_streams(suite));
 	torture_suite_add_suite(suite, torture_raw_acls(suite));
-	torture_suite_add_1smb_test(suite, "COMPOSITE", torture_raw_composite);
-	torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide);
-	torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", torture_samba3_closeerr);
-	torture_suite_add_simple_test(suite, "SAMBA3ROOTDIRFID",
+	torture_suite_add_1smb_test(suite, "composite", torture_raw_composite);
+	torture_suite_add_simple_test(suite, "samba3hide", torture_samba3_hide);
+	torture_suite_add_simple_test(suite, "samba3closeerr", torture_samba3_closeerr);
+	torture_suite_add_simple_test(suite, "samba3rootdirfid",
 				      torture_samba3_rootdirfid);
-	torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp);
-	torture_suite_add_simple_test(suite, "SAMBA3OPLOCKLOGOFF", torture_samba3_oplock_logoff);
-	torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath);
-	torture_suite_add_simple_test(suite, "SAMBA3CASEINSENSITIVE",
+	torture_suite_add_simple_test(suite, "samba3checkfsp", torture_samba3_checkfsp);
+	torture_suite_add_simple_test(suite, "samba3oplocklogoff", torture_samba3_oplock_logoff);
+	torture_suite_add_simple_test(suite, "samba3badpath", torture_samba3_badpath);
+	torture_suite_add_simple_test(suite, "samba3caseinsensitive",
 				      torture_samba3_caseinsensitive);
-	torture_suite_add_simple_test(suite, "SAMBA3POSIXTIMEDLOCK",
+	torture_suite_add_simple_test(suite, "samba3posixtimedlock",
 				      torture_samba3_posixtimedlock);
-	torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas);
+	torture_suite_add_simple_test(suite, "scan-eamax", torture_max_eas);
 
 	suite->description = talloc_strdup(suite, "Tests for the raw SMB interface");
 
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index 430f09be54..3b315afe8d 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -980,14 +980,14 @@ done:
 */
 struct torture_suite *torture_raw_read(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "READ");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "read");
 
 	torture_suite_add_1smb_test(suite, "read", test_read);
 	torture_suite_add_1smb_test(suite, "readx", test_readx);
 	torture_suite_add_1smb_test(suite, "lockread", test_lockread);
 	torture_suite_add_1smb_test(suite, "readbraw", test_readbraw);
 	torture_suite_add_1smb_test(suite, "read for execute", 
-								test_read_for_execute);
+		test_read_for_execute);
 
 	return suite;
 }
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 187645f964..ca4207119b 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -717,7 +717,7 @@ extern bool test_nttransrename(struct torture_context *tctx, struct smbcli_state
 */
 struct torture_suite *torture_raw_rename(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "RENAME");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "rename");
 
 	torture_suite_add_1smb_test(suite, "mv", test_mv);
 	/* test_trans2rename and test_nttransrename are actually in torture/raw/oplock.c to
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index f5419dc672..60c9ad0bb3 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -1510,7 +1510,7 @@ done:
 */
 struct torture_suite *torture_raw_search(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SEARCH");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "search");
 
 	torture_suite_add_1smb_test(suite, "one file search", test_one_file);
 	torture_suite_add_1smb_test(suite, "many files", test_many_files);
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 1973e7db3e..f3abf5b3de 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -1143,18 +1143,17 @@ done:
 
 struct torture_suite *torture_raw_sfileinfo(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx,
-	    "SFILEINFO");
-
-	torture_suite_add_1smb_test(suite, "BASE", torture_raw_sfileinfo_base);
-	torture_suite_add_1smb_test(suite, "RENAME",
-				      torture_raw_sfileinfo_rename);
-	torture_suite_add_1smb_test(suite, "BUG", torture_raw_sfileinfo_bug);
-	torture_suite_add_2smb_test(suite, "END-OF-FILE",
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "sfileinfo");
+
+	torture_suite_add_1smb_test(suite, "base", torture_raw_sfileinfo_base);
+	torture_suite_add_1smb_test(suite, "rename", torture_raw_sfileinfo_rename);
+	torture_suite_add_1smb_test(suite, "bug", torture_raw_sfileinfo_bug);
+	torture_suite_add_2smb_test(suite, "end-of-file",
 	    torture_raw_sfileinfo_eof);
-	torture_suite_add_2smb_test(suite, "END-OF-FILE-ACCESS",
+	torture_suite_add_2smb_test(suite, "end-of-file-access",
 	    torture_raw_sfileinfo_eof_access);
-	torture_suite_add_1smb_test(suite, "ARCHIVE", torture_raw_sfileinfo_archive);
+	torture_suite_add_1smb_test(suite, "archive",
+								torture_raw_sfileinfo_archive);
 
 	return suite;
 }
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 5d4167dbd3..1542e93422 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -1896,22 +1896,21 @@ static bool test_stream_summary_tab(struct torture_context *tctx,
 */
 struct torture_suite *torture_raw_streams(TALLOC_CTX *tctx)
 {
-	struct torture_suite *suite = torture_suite_create(tctx, "STREAMS");
-
-	torture_suite_add_1smb_test(suite, "DIR", test_stream_dir);
-	torture_suite_add_1smb_test(suite, "IO", test_stream_io);
-	torture_suite_add_1smb_test(suite, "SHAREMODES",
-	    test_stream_sharemodes);
-	torture_suite_add_1smb_test(suite, "DELETE", test_stream_delete);
-	torture_suite_add_1smb_test(suite, "NAMES", test_stream_names);
-	torture_suite_add_1smb_test(suite, "NAMES2", test_stream_names2);
-	torture_suite_add_1smb_test(suite, "RENAME", test_stream_rename);
-	torture_suite_add_1smb_test(suite, "RENAME2", test_stream_rename2);
-	torture_suite_add_1smb_test(suite, "RENAME3", test_stream_rename3);
-	torture_suite_add_1smb_test(suite, "CREATEDISP",
+	struct torture_suite *suite = torture_suite_create(tctx, "streams");
+
+	torture_suite_add_1smb_test(suite, "dir", test_stream_dir);
+	torture_suite_add_1smb_test(suite, "io", test_stream_io);
+	torture_suite_add_1smb_test(suite, "sharemodes", test_stream_sharemodes);
+	torture_suite_add_1smb_test(suite, "delete", test_stream_delete);
+	torture_suite_add_1smb_test(suite, "names", test_stream_names);
+	torture_suite_add_1smb_test(suite, "names2", test_stream_names2);
+	torture_suite_add_1smb_test(suite, "rename", test_stream_rename);
+	torture_suite_add_1smb_test(suite, "rename2", test_stream_rename2);
+	torture_suite_add_1smb_test(suite, "rename3", test_stream_rename3);
+	torture_suite_add_1smb_test(suite, "createdisp",
 	    test_stream_create_disposition);
-	torture_suite_add_1smb_test(suite, "ATTR", test_stream_attributes);
-	torture_suite_add_1smb_test(suite, "SUMTAB", test_stream_summary_tab);
+	torture_suite_add_1smb_test(suite, "attr", test_stream_attributes);
+	torture_suite_add_1smb_test(suite, "sumtab", test_stream_summary_tab);
 
 	/* torture_suite_add_1smb_test(suite, "LARGESTREAMINFO", */
 	/*     test_stream_large_streaminfo); */
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 9da036e021..d1ad78508f 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -538,11 +538,11 @@ done:
 */
 struct torture_suite *torture_raw_unlink(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "UNLINK");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "unlink");
 
 	torture_suite_add_1smb_test(suite, "unlink", test_unlink);
 	torture_suite_add_1smb_test(suite, "delete_on_close", test_delete_on_close);
-	torture_suite_add_2smb_test(suite, "UNLINK-DEFER", test_unlink_defer);
+	torture_suite_add_2smb_test(suite, "unlink-defer", test_unlink_defer);
 
 	return suite;
 }
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index 9a2161146e..12c42bf141 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -726,7 +726,7 @@ done:
 */
 struct torture_suite *torture_raw_write(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "WRITE");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "write");
 
 	torture_suite_add_1smb_test(suite, "write", test_write);
 	torture_suite_add_1smb_test(suite, "write unlock", test_writeunlock);
diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index 34058f52a1..729a7ca837 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -126,7 +126,7 @@ static bool test_JobAdd(struct torture_context *tctx, struct dcerpc_pipe *p)
 
 struct torture_suite *torture_rpc_atsvc(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "ATSVC");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "atsvc");
 	struct torture_rpc_tcase *tcase;
 	
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "atsvc", &ndr_table_atsvc);
diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c
index f6470595e3..457dbd9575 100644
--- a/source4/torture/rpc/bind.c
+++ b/source4/torture/rpc/bind.c
@@ -86,7 +86,7 @@ static void test_bind_op(struct torture_suite *suite,
 
 struct torture_suite *torture_rpc_bind(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "BIND");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "bind");
 	struct {
 		const char *test_name;
 		uint32_t flags;
diff --git a/source4/torture/rpc/browser.c b/source4/torture/rpc/browser.c
index b039b0fcc8..d3c312cb48 100644
--- a/source4/torture/rpc/browser.c
+++ b/source4/torture/rpc/browser.c
@@ -114,7 +114,7 @@ bool test_BrowserrQueryOtherDomains(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_browser(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "BROWSER");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "browser");
 	struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, "browser", &ndr_table_browser);
 
 	torture_rpc_tcase_add_test(tcase, "BrowserrQueryOtherDomains", test_BrowserrQueryOtherDomains);
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 8c06859265..8eb4f9f8e2 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -634,7 +634,7 @@ static bool test_FtRoot(struct torture_context *tctx,
 struct torture_suite *torture_rpc_dfs(TALLOC_CTX *mem_ctx)
 {
 	struct torture_rpc_tcase *tcase;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "DFS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "dfs");
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "netdfs",
 						  &ndr_table_netdfs);
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 99f101c38e..86b0d32768 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -849,10 +849,9 @@ void torture_rpc_drsuapi_tcase(struct torture_suite *suite)
 	typedef bool (*run_func) (struct torture_context *test, void *tcase_data);
 
 	struct torture_test *test;
-	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "DRSUAPI");
+	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "drsuapi");
 
-	torture_tcase_set_fixture(tcase,
-				  torture_drsuapi_tcase_setup,
+	torture_tcase_set_fixture(tcase, torture_drsuapi_tcase_setup,
 				  torture_drsuapi_tcase_teardown);
 
 #if 0
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index 5eae0ad401..259f997b47 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -1018,11 +1018,11 @@ void torture_rpc_drsuapi_cracknames_tcase(struct torture_suite *suite)
 	typedef bool (*run_func) (struct torture_context *test, void *tcase_data);
 
 	struct torture_test *test;
-	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "CRACKNAMES");
+	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "cracknames");
 
 	torture_tcase_set_fixture(tcase,
 				  torture_drsuapi_cracknames_setup,
 				  torture_drsuapi_cracknames_teardown);
 
-	test = torture_tcase_add_simple_test(tcase, "CRACKNAMES-TEST", (run_func)test_DsCrackNames);
+	test = torture_tcase_add_simple_test(tcase, "cracknames-test", (run_func)test_DsCrackNames);
 }
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index 7b152d3754..6122ff0603 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -420,7 +420,7 @@ void torture_drs_rpc_dsgetinfo_tcase(struct torture_suite *suite)
 	typedef bool (*run_func) (struct torture_context *test, void *tcase_data);
 
 	struct torture_test *test;
-	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "DSGETINFO");
+	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "dsgetinfo");
 
 	torture_tcase_set_fixture(tcase,
 				  torture_dsgetinfo_tcase_setup,
diff --git a/source4/torture/rpc/dssetup.c b/source4/torture/rpc/dssetup.c
index f8b0ef3491..9a61199564 100644
--- a/source4/torture/rpc/dssetup.c
+++ b/source4/torture/rpc/dssetup.c
@@ -55,7 +55,7 @@ bool test_DsRoleGetPrimaryDomainInformation(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_dssetup(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "DSSETUP");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "dssetup");
 	struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, "dssetup", &ndr_table_dssetup);
 
 	torture_rpc_tcase_add_test(tcase, "DsRoleGetPrimaryDomainInformation", test_DsRoleGetPrimaryDomainInformation);
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 3b19d5a6b4..643b21fa7f 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -435,8 +435,7 @@ failed:
 
 struct torture_suite *torture_rpc_echo(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(
-		mem_ctx, "ECHO");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "echo");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "echo", 
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index 6a1c987de1..2409af11ea 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -266,9 +266,9 @@ static bool test_InqObject(struct torture_context *tctx, struct dcerpc_pipe *p)
 
 struct torture_suite *torture_rpc_epmapper(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "EPMAPPER");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "epmapper");
 	struct torture_rpc_tcase *tcase;
-	
+
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "epmapper", 
 											  &ndr_table_epmapper);
 
diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c
index 3b6c70e068..0d48fc0c26 100644
--- a/source4/torture/rpc/eventlog.c
+++ b/source4/torture/rpc/eventlog.c
@@ -483,7 +483,7 @@ struct torture_suite *torture_rpc_eventlog(TALLOC_CTX *mem_ctx)
 	struct torture_rpc_tcase *tcase;
 	struct torture_test *test;
 
-	suite = torture_suite_create(mem_ctx, "EVENTLOG");
+	suite = torture_suite_create(mem_ctx, "eventlog");
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "eventlog",
 						  &ndr_table_eventlog);
 
diff --git a/source4/torture/rpc/forest_trust.c b/source4/torture/rpc/forest_trust.c
index 002a300320..70d1516750 100644
--- a/source4/torture/rpc/forest_trust.c
+++ b/source4/torture/rpc/forest_trust.c
@@ -827,7 +827,7 @@ struct torture_suite *torture_rpc_lsa_forest_trust(TALLOC_CTX *mem_ctx)
 	struct torture_suite *suite;
 	struct torture_rpc_tcase *tcase;
 
-	suite = torture_suite_create(mem_ctx, "LSA-FOREST-TRUST");
+	suite = torture_suite_create(mem_ctx, "lsa.forest.trust");
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa-forest-trust",
 						  &ndr_table_lsarpc);
diff --git a/source4/torture/rpc/frsapi.c b/source4/torture/rpc/frsapi.c
index bb2c9d8a1e..06f15a2d50 100644
--- a/source4/torture/rpc/frsapi.c
+++ b/source4/torture/rpc/frsapi.c
@@ -255,7 +255,7 @@ static bool test_InfoW(struct torture_context *tctx,
 struct torture_suite *torture_rpc_frsapi(TALLOC_CTX *mem_ctx)
 {
 	struct torture_rpc_tcase *tcase;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "FRSAPI");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "frsapi");
 	struct torture_test *test;
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "frsapi",
diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c
index 13357ac947..6b51eb5ab4 100644
--- a/source4/torture/rpc/handles.c
+++ b/source4/torture/rpc/handles.c
@@ -587,7 +587,7 @@ struct torture_suite *torture_rpc_handles(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite;
 
-	suite = torture_suite_create(mem_ctx, "HANDLES");
+	suite = torture_suite_create(mem_ctx, "handles");
 	torture_suite_add_simple_test(suite, "lsarpc", test_handles_lsa);
 	torture_suite_add_simple_test(suite, "lsarpc-shared", test_handles_lsa_shared);
 	torture_suite_add_simple_test(suite, "samr", test_handles_samr);
diff --git a/source4/torture/rpc/initshutdown.c b/source4/torture/rpc/initshutdown.c
index c314c6dbc9..28eaacd5e5 100644
--- a/source4/torture/rpc/initshutdown.c
+++ b/source4/torture/rpc/initshutdown.c
@@ -100,7 +100,7 @@ static bool test_InitEx(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_initshutdown(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "INITSHUTDOWN");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "initshutdown");
 	struct torture_rpc_tcase *tcase;
 	struct torture_test *test;
 
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index c963d4fe02..7bfd80f74c 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -2966,7 +2966,7 @@ struct torture_suite *torture_rpc_lsa_lookup_names(TALLOC_CTX *mem_ctx)
 	struct torture_suite *suite;
 	struct torture_rpc_tcase *tcase;
 
-	suite = torture_suite_create(mem_ctx, "LSA-LOOKUPNAMES");
+	suite = torture_suite_create(mem_ctx, "lsa.lookupnames");
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
 						  &ndr_table_lsarpc);
@@ -3029,7 +3029,7 @@ struct torture_suite *torture_rpc_lsa_trusted_domains(TALLOC_CTX *mem_ctx)
 
 	state->num_trusts = 12;
 
-	suite = torture_suite_create(mem_ctx, "LSA-TRUSTED-DOMAINS");
+	suite = torture_suite_create(mem_ctx, "lsa.trusted.domains");
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
 						  &ndr_table_lsarpc);
@@ -3084,7 +3084,7 @@ struct torture_suite *torture_rpc_lsa_privileges(TALLOC_CTX *mem_ctx)
 	struct torture_suite *suite;
 	struct torture_rpc_tcase *tcase;
 
-	suite = torture_suite_create(mem_ctx, "LSA-PRIVILEGES");
+	suite = torture_suite_create(mem_ctx, "lsa.privileges");
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
 						  &ndr_table_lsarpc);
diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index d474ca1656..c4b4cf9374 100644
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -397,7 +397,7 @@ struct torture_suite *torture_rpc_lsa_lookup_sids(TALLOC_CTX *mem_ctx)
 	struct torture_suite *suite;
 	struct torture_rpc_tcase *tcase;
 
-	suite = torture_suite_create(mem_ctx, "LSA-LOOKUPSIDS");
+	suite = torture_suite_create(mem_ctx, "lsa.lookupsids");
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "lsa",
 						  &ndr_table_lsarpc);
 
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 457d38e82d..c9fda65a39 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -3470,7 +3470,7 @@ static bool test_SetPassword_with_flags(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_netlogon(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "NETLOGON");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "netlogon");
 	struct torture_rpc_tcase *tcase;
 	struct torture_test *test;
 
@@ -3513,7 +3513,7 @@ struct torture_suite *torture_rpc_netlogon(TALLOC_CTX *mem_ctx)
 
 struct torture_suite *torture_rpc_netlogon_s3(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "NETLOGON-S3");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "netlogon-s3");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "netlogon",
@@ -3531,7 +3531,7 @@ struct torture_suite *torture_rpc_netlogon_s3(TALLOC_CTX *mem_ctx)
 
 struct torture_suite *torture_rpc_netlogon_admin(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "NETLOGON-ADMIN");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "netlogon.admin");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "netlogon",
diff --git a/source4/torture/rpc/ntsvcs.c b/source4/torture/rpc/ntsvcs.c
index 5007f1d28a..c1418e3ce7 100644
--- a/source4/torture/rpc/ntsvcs.c
+++ b/source4/torture/rpc/ntsvcs.c
@@ -171,7 +171,7 @@ static bool test_PNP_GetDeviceRegProp(struct torture_context *tctx,
 struct torture_suite *torture_rpc_ntsvcs(TALLOC_CTX *mem_ctx)
 {
 	struct torture_rpc_tcase *tcase;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "NTSVCS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "ntsvcs");
 	struct torture_test *test;
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "ntsvcs",
diff --git a/source4/torture/rpc/object_uuid.c b/source4/torture/rpc/object_uuid.c
index e2320bf4d2..8e7d6a7bad 100644
--- a/source4/torture/rpc/object_uuid.c
+++ b/source4/torture/rpc/object_uuid.c
@@ -77,7 +77,7 @@ static bool test_random_uuid(struct torture_context *torture)
 struct torture_suite *torture_rpc_object_uuid(TALLOC_CTX *mem_ctx)
 {
 	struct torture_suite *suite;
-	suite = torture_suite_create(mem_ctx, "OBJECTUUID");
+	suite = torture_suite_create(mem_ctx, "objectuuid");
 	torture_suite_add_simple_test(suite, "random-uuid", test_random_uuid);
 	return suite;
 }
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index eb3bc84b88..33865d7e02 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -221,8 +221,7 @@ static bool test_ServerAlive2(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_oxidresolve(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, 
-							   "OXIDRESOLVE");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "oxidresolve");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "oxidresolver", 
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 56c21b4e7e..c14adb8596 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -78,7 +78,7 @@ static bool test_RemoteActivation(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_remact(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "REMACT");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "remact");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "remact", &ndr_table_IRemoteActivation);
diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c
index 22ea204efe..33034e0190 100644
--- a/source4/torture/rpc/remote_pac.c
+++ b/source4/torture/rpc/remote_pac.c
@@ -648,7 +648,7 @@ static bool test_S2U4Self_workstation(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_remote_pac(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "PAC");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "pac");
 	struct torture_rpc_tcase *tcase;
 
 	/* It is important to use different names, so that old entries in our credential cache are not used */
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 7f3ae06d3a..d7fdc48d4d 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -454,13 +454,13 @@ _PUBLIC_ struct torture_test *torture_rpc_tcase_add_test_ex(
 
 NTSTATUS torture_rpc_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "RPC");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "rpc");
 
 	ndr_table_init();
 
-	torture_suite_add_simple_test(suite, "LSA", torture_rpc_lsa);
-	torture_suite_add_simple_test(suite, "LSALOOKUP", torture_rpc_lsa_lookup);
-	torture_suite_add_simple_test(suite, "LSA-GETUSER", torture_rpc_lsa_get_user);
+	torture_suite_add_simple_test(suite, "lsa", torture_rpc_lsa);
+	torture_suite_add_simple_test(suite, "lsalookup", torture_rpc_lsa_lookup);
+	torture_suite_add_simple_test(suite, "lsa-getuser", torture_rpc_lsa_get_user);
 	torture_suite_add_suite(suite, torture_rpc_lsa_lookup_sids(suite));
 	torture_suite_add_suite(suite, torture_rpc_lsa_lookup_names(suite));
 	torture_suite_add_suite(suite, torture_rpc_lsa_secrets(suite));
@@ -482,18 +482,18 @@ NTSTATUS torture_rpc_init(void)
 	torture_suite_add_suite(suite, torture_rpc_spoolss_win(suite));
 	torture_suite_add_suite(suite, torture_rpc_spoolss_driver(suite));
 	torture_suite_add_suite(suite, torture_rpc_spoolss_access(suite));
-	torture_suite_add_simple_test(suite, "SAMR", torture_rpc_samr);
-	torture_suite_add_simple_test(suite, "SAMR-USERS", torture_rpc_samr_users);
-	torture_suite_add_simple_test(suite, "SAMR-PASSWORDS", torture_rpc_samr_passwords);
+	torture_suite_add_simple_test(suite, "samr", torture_rpc_samr);
+	torture_suite_add_simple_test(suite, "samr.users", torture_rpc_samr_users);
+	torture_suite_add_simple_test(suite, "samr.passwords", torture_rpc_samr_passwords);
 	torture_suite_add_suite(suite, torture_rpc_netlogon(suite));
 	torture_suite_add_suite(suite, torture_rpc_netlogon_s3(suite));
 	torture_suite_add_suite(suite, torture_rpc_netlogon_admin(suite));
 	torture_suite_add_suite(suite, torture_rpc_remote_pac(suite));
-	torture_suite_add_simple_test(suite, "SAMLOGON", torture_rpc_samlogon);
-	torture_suite_add_simple_test(suite, "SAMSYNC", torture_rpc_samsync);
-	torture_suite_add_simple_test(suite, "SCHANNEL", torture_rpc_schannel);
-	torture_suite_add_simple_test(suite, "SCHANNEL2", torture_rpc_schannel2);
-	torture_suite_add_simple_test(suite, "BENCH-SCHANNEL1", torture_rpc_schannel_bench1);
+	torture_suite_add_simple_test(suite, "samlogon", torture_rpc_samlogon);
+	torture_suite_add_simple_test(suite, "samsync", torture_rpc_samsync);
+	torture_suite_add_simple_test(suite, "schannel", torture_rpc_schannel);
+	torture_suite_add_simple_test(suite, "schannel2", torture_rpc_schannel2);
+	torture_suite_add_simple_test(suite, "bench-schannel1", torture_rpc_schannel_bench1);
 	torture_suite_add_suite(suite, torture_rpc_srvsvc(suite));
 	torture_suite_add_suite(suite, torture_rpc_svcctl(suite));
 	torture_suite_add_suite(suite, torture_rpc_samr_accessmask(suite));
@@ -507,22 +507,22 @@ NTSTATUS torture_rpc_init(void)
 	torture_suite_add_suite(suite, torture_rpc_initshutdown(suite));
 	torture_suite_add_suite(suite, torture_rpc_oxidresolve(suite));
 	torture_suite_add_suite(suite, torture_rpc_remact(suite));
-	torture_suite_add_simple_test(suite, "MGMT", torture_rpc_mgmt);
-	torture_suite_add_simple_test(suite, "SCANNER", torture_rpc_scanner);
-	torture_suite_add_simple_test(suite, "AUTOIDL", torture_rpc_autoidl);
-	torture_suite_add_simple_test(suite, "COUNTCALLS", torture_rpc_countcalls);
-	torture_suite_add_simple_test(suite, "MULTIBIND", torture_multi_bind);
-	torture_suite_add_simple_test(suite, "AUTHCONTEXT", torture_bind_authcontext);
+	torture_suite_add_simple_test(suite, "mgmt", torture_rpc_mgmt);
+	torture_suite_add_simple_test(suite, "scanner", torture_rpc_scanner);
+	torture_suite_add_simple_test(suite, "autoidl", torture_rpc_autoidl);
+	torture_suite_add_simple_test(suite, "countcalls", torture_rpc_countcalls);
+	torture_suite_add_simple_test(suite, "multibind", torture_multi_bind);
+	torture_suite_add_simple_test(suite, "authcontext", torture_bind_authcontext);
 	torture_suite_add_suite(suite, torture_rpc_samba3(suite));
 	torture_rpc_drsuapi_tcase(suite);
 	torture_rpc_drsuapi_cracknames_tcase(suite);
 	torture_suite_add_suite(suite, torture_rpc_dssetup(suite));
 	torture_suite_add_suite(suite, torture_rpc_browser(suite));
-	torture_suite_add_simple_test(suite, "ALTERCONTEXT", torture_rpc_alter_context);
-	torture_suite_add_simple_test(suite, "JOIN", torture_rpc_join);
+	torture_suite_add_simple_test(suite, "altercontext", torture_rpc_alter_context);
+	torture_suite_add_simple_test(suite, "join", torture_rpc_join);
 	torture_drs_rpc_dsgetinfo_tcase(suite);
-	torture_suite_add_simple_test(suite, "BENCH-RPC", torture_bench_rpc);
-	torture_suite_add_simple_test(suite, "ASYNCBIND", torture_async_bind);
+	torture_suite_add_simple_test(suite, "bench-rpc", torture_bench_rpc);
+	torture_suite_add_simple_test(suite, "asyncbind", torture_async_bind);
 	torture_suite_add_suite(suite, torture_rpc_ntsvcs(suite));
 	torture_suite_add_suite(suite, torture_rpc_bind(suite));
 
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 06b5c8c0ef..745d4305ab 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -3346,21 +3346,21 @@ bool torture_samba3_getaliasmembership_0(struct torture_context *torture)
 
 struct torture_suite *torture_rpc_samba3(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMBA3");
-
-	torture_suite_add_simple_test(suite, "BIND", torture_bind_samba3);
-	torture_suite_add_simple_test(suite, "NETLOGON", torture_netlogon_samba3);
-	torture_suite_add_simple_test(suite, "SESSIONKEY", torture_samba3_sessionkey);
-	torture_suite_add_simple_test(suite, "SRVSVC", torture_samba3_rpc_srvsvc);
-	torture_suite_add_simple_test(suite, "SHARESEC", torture_samba3_rpc_sharesec);
-	torture_suite_add_simple_test(suite, "GETUSERNAME", torture_samba3_rpc_getusername);
-	torture_suite_add_simple_test(suite, "RANDOMAUTH2", torture_samba3_rpc_randomauth2);
-	torture_suite_add_simple_test(suite, "LSA", torture_samba3_rpc_lsa);
-	torture_suite_add_simple_test(suite, "SPOOLSS", torture_samba3_rpc_spoolss);
-	torture_suite_add_simple_test(suite, "WKSSVC", torture_samba3_rpc_wkssvc);
-	torture_suite_add_simple_test(suite, "WINREG", torture_samba3_rpc_winreg);
-	torture_suite_add_simple_test(suite, "GETALIASMEMBERSHIP-0", torture_samba3_getaliasmembership_0);
-	torture_suite_add_simple_test(suite, "REGCONFIG", torture_samba3_regconfig);
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "samba3");
+
+	torture_suite_add_simple_test(suite, "bind", torture_bind_samba3);
+	torture_suite_add_simple_test(suite, "netlogon", torture_netlogon_samba3);
+	torture_suite_add_simple_test(suite, "sessionkey", torture_samba3_sessionkey);
+	torture_suite_add_simple_test(suite, "srvsvc", torture_samba3_rpc_srvsvc);
+	torture_suite_add_simple_test(suite, "sharesec", torture_samba3_rpc_sharesec);
+	torture_suite_add_simple_test(suite, "getusername", torture_samba3_rpc_getusername);
+	torture_suite_add_simple_test(suite, "randomauth2", torture_samba3_rpc_randomauth2);
+	torture_suite_add_simple_test(suite, "lsa", torture_samba3_rpc_lsa);
+	torture_suite_add_simple_test(suite, "spoolss", torture_samba3_rpc_spoolss);
+	torture_suite_add_simple_test(suite, "wkssvc", torture_samba3_rpc_wkssvc);
+	torture_suite_add_simple_test(suite, "winreg", torture_samba3_rpc_winreg);
+	torture_suite_add_simple_test(suite, "getaliasmembership-0", torture_samba3_getaliasmembership_0);
+	torture_suite_add_simple_test(suite, "regconfig", torture_samba3_regconfig);
 
 	suite->description = talloc_strdup(suite, "samba3 DCERPC interface tests");
 
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 8d10671b40..c3e3905f94 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -8065,7 +8065,7 @@ static bool torture_rpc_samr_pwdlastset(struct torture_context *torture,
 
 struct torture_suite *torture_rpc_samr_passwords_pwdlastset(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMR-PASSWORDS-PWDLASTSET");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.passwords.pwdlastset");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "samr",
@@ -8110,7 +8110,7 @@ static bool torture_rpc_samr_users_privileges_delete_user(struct torture_context
 
 struct torture_suite *torture_rpc_samr_user_privileges(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMR-USERS-PRIVILEGES");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.users.privileges");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "samr",
@@ -8215,7 +8215,7 @@ static bool torture_rpc_samr_many_aliases(struct torture_context *torture,
 
 struct torture_suite *torture_rpc_samr_large_dc(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMR-LARGE-DC");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.large-dc");
 	struct torture_rpc_tcase *tcase;
 	struct torture_samr_context *ctx;
 
@@ -8266,7 +8266,7 @@ static bool torture_rpc_samr_badpwdcount(struct torture_context *torture,
 
 struct torture_suite *torture_rpc_samr_passwords_badpwdcount(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMR-PASSWORDS-BADPWDCOUNT");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.passwords.badpwdcount");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "samr",
@@ -8311,7 +8311,7 @@ static bool torture_rpc_samr_lockout(struct torture_context *torture,
 
 struct torture_suite *torture_rpc_samr_passwords_lockout(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMR-PASSWORDS-LOCKOUT");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.passwords.lockout");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "samr",
diff --git a/source4/torture/rpc/samr_accessmask.c b/source4/torture/rpc/samr_accessmask.c
index e6f7b05a96..118026f80f 100644
--- a/source4/torture/rpc/samr_accessmask.c
+++ b/source4/torture/rpc/samr_accessmask.c
@@ -660,13 +660,13 @@ static bool test_samr_connect(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_samr_accessmask(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMR-ACCESSMASK");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.accessmask");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "samr",
 						  &ndr_table_samr);
 
-	torture_rpc_tcase_add_test(tcase, "CONNECT", test_samr_connect);
+	torture_rpc_tcase_add_test(tcase, "connect", test_samr_connect);
 
 	/* test which bits in the accessmask to Connect5 will allow
 	 * us to call OpenDomain() */
@@ -1183,7 +1183,7 @@ static bool torture_rpc_samr_workstation_query(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_samr_workstation_auth(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SAMR-MACHINE-AUTH");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.machine.auth");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite, "samr",
diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index b7c90e4b4e..a1f863d7be 100644
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -227,7 +227,7 @@ static const bool bool_vals[] = { true, false };
 /* TEST session key correctness by pushing and pulling secrets */
 struct torture_suite *torture_rpc_lsa_secrets(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "LSA-SECRETS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "lsa.secrets");
 	int keyexchange, ntlm2, lm_key;
 
 	for (keyexchange = 0; keyexchange < ARRAY_SIZE(bool_vals); keyexchange++) {
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index dfd1c7ee33..26e53eb252 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -7820,7 +7820,7 @@ void torture_tcase_printer(struct torture_tcase *tcase)
 
 struct torture_suite *torture_rpc_spoolss_printer(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "PRINTER");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "printer");
 	struct torture_tcase *tcase;
 
 	tcase = torture_suite_add_tcase(suite, "addprinter");
@@ -7866,8 +7866,8 @@ struct torture_suite *torture_rpc_spoolss_printer(TALLOC_CTX *mem_ctx)
 
 struct torture_suite *torture_rpc_spoolss(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS");
-	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "PRINTSERVER");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "spoolss");
+	struct torture_tcase *tcase = torture_suite_add_tcase(suite, "printserver");
 
 	torture_tcase_set_fixture(tcase,
 				  torture_rpc_spoolss_setup,
@@ -9038,7 +9038,7 @@ static bool test_add_driver_adobe_cupsaddsmb(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_spoolss_driver(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS-DRIVER");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "spoolss.driver");
 
 	struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
 							"driver", &ndr_table_spoolss);
diff --git a/source4/torture/rpc/spoolss_access.c b/source4/torture/rpc/spoolss_access.c
index 1dcc44dd0f..c32c5c108e 100644
--- a/source4/torture/rpc/spoolss_access.c
+++ b/source4/torture/rpc/spoolss_access.c
@@ -857,7 +857,7 @@ static bool test_openprinter_wrap(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_spoolss_access(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS-ACCESS");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "spoolss.access");
 	struct torture_tcase *tcase;
 	struct torture_rpc_tcase *rpc_tcase;
 
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index a613e31a9e..ec29c3944f 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -585,7 +585,7 @@ static bool test_ReplyOpenPrinter(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_spoolss_notify(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS-NOTIFY");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "spoolss.notify");
 
 	struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
 							"notify", &ndr_table_spoolss);
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index b0586e1586..96c3a2455d 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -600,7 +600,7 @@ end_testWinXP:
 
 struct torture_suite *torture_rpc_spoolss_win(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SPOOLSS-WIN");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "spoolss.win");
 
 	struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, 
 							"win", &ndr_table_spoolss);
diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index 16f267326c..21b67fda3b 100644
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -1160,7 +1160,7 @@ again:
 
 struct torture_suite *torture_rpc_srvsvc(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SRVSVC");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "srvsvc");
 	struct torture_rpc_tcase *tcase;
 	struct torture_test *test;
 
diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c
index 5c4f803e05..a20cf98aa0 100644
--- a/source4/torture/rpc/svcctl.c
+++ b/source4/torture/rpc/svcctl.c
@@ -625,7 +625,7 @@ static bool test_SCManager(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_svcctl(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "SVCCTL");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "svcctl");
 	struct torture_rpc_tcase *tcase;
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "svcctl", &ndr_table_svcctl);
diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c
index 58c9755e56..227b002deb 100644
--- a/source4/torture/rpc/unixinfo.c
+++ b/source4/torture/rpc/unixinfo.c
@@ -135,7 +135,7 @@ struct torture_suite *torture_rpc_unixinfo(TALLOC_CTX *mem_ctx)
 	struct torture_suite *suite;
 	struct torture_rpc_tcase *tcase;
 
-	suite = torture_suite_create(mem_ctx, "UNIXINFO");
+	suite = torture_suite_create(mem_ctx, "unixinfo");
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "unixinfo", 
 						  &ndr_table_unixinfo);
 
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 9cca02def6..8a9a5e48bc 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -3112,7 +3112,7 @@ static bool test_Open(struct torture_context *tctx, struct dcerpc_pipe *p,
 struct torture_suite *torture_rpc_winreg(TALLOC_CTX *mem_ctx)
 {
 	struct torture_rpc_tcase *tcase;
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "WINREG");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "winreg");
 	struct torture_test *test;
 
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "winreg",
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 3121213fca..5bf64afa26 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -1366,7 +1366,7 @@ struct torture_suite *torture_rpc_wkssvc(TALLOC_CTX *mem_ctx)
 	struct torture_rpc_tcase *tcase;
 	struct torture_test *test;
 
-	suite = torture_suite_create(mem_ctx, "WKSSVC");
+	suite = torture_suite_create(mem_ctx, "wkssvc");
 	tcase = torture_suite_add_rpc_iface_tcase(suite, "wkssvc",
 						  &ndr_table_wkssvc);
 
diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c
index d723ae499b..3883ae5055 100644
--- a/source4/torture/smb2/acls.c
+++ b/source4/torture/smb2/acls.c
@@ -1855,7 +1855,7 @@ done:
 */
 struct torture_suite *torture_smb2_acls_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "ACLS");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "acls");
 
 	torture_suite_add_1smb2_test(suite, "CREATOR", test_creator_sid);
 	torture_suite_add_1smb2_test(suite, "GENERIC", test_generic_bits);
diff --git a/source4/torture/smb2/compound.c b/source4/torture/smb2/compound.c
index bb506a0139..59ed9b1e61 100644
--- a/source4/torture/smb2/compound.c
+++ b/source4/torture/smb2/compound.c
@@ -602,17 +602,16 @@ done:
 
 struct torture_suite *torture_smb2_compound_init(void)
 {
-	struct torture_suite *suite =
-	    torture_suite_create(talloc_autofree_context(), "COMPOUND");
-
-	torture_suite_add_1smb2_test(suite, "RELATED1", test_compound_related1);
-	torture_suite_add_1smb2_test(suite, "RELATED2", test_compound_related2);
-	torture_suite_add_1smb2_test(suite, "UNRELATED1", test_compound_unrelated1);
-	torture_suite_add_1smb2_test(suite, "INVALID1", test_compound_invalid1);
-	torture_suite_add_1smb2_test(suite, "INVALID2", test_compound_invalid2);
-	torture_suite_add_1smb2_test(suite, "INVALID3", test_compound_invalid3);
-	torture_suite_add_1smb2_test(suite, "INTERIM1",  test_compound_interim1);
-	torture_suite_add_1smb2_test(suite, "INTERIM2",  test_compound_interim2);
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "compound");
+
+	torture_suite_add_1smb2_test(suite, "related1", test_compound_related1);
+	torture_suite_add_1smb2_test(suite, "related2", test_compound_related2);
+	torture_suite_add_1smb2_test(suite, "unrelated1", test_compound_unrelated1);
+	torture_suite_add_1smb2_test(suite, "invalid1", test_compound_invalid1);
+	torture_suite_add_1smb2_test(suite, "invalid2", test_compound_invalid2);
+	torture_suite_add_1smb2_test(suite, "invalid3", test_compound_invalid3);
+	torture_suite_add_1smb2_test(suite, "interim1",  test_compound_interim1);
+	torture_suite_add_1smb2_test(suite, "interim2",  test_compound_interim2);
 
 	suite->description = talloc_strdup(suite, "SMB2-COMPOUND tests");
 
diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 3b88bd9588..f11c8375b1 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -1384,18 +1384,18 @@ done:
 */
 struct torture_suite *torture_smb2_create_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "CREATE");
-
-	torture_suite_add_1smb2_test(suite, "GENTEST", test_create_gentest);
-	torture_suite_add_1smb2_test(suite, "BLOB", test_create_blob);
-	torture_suite_add_1smb2_test(suite, "OPEN", test_smb2_open);
-	torture_suite_add_1smb2_test(suite, "BRLOCKED", test_smb2_open_brlocked);
-	torture_suite_add_1smb2_test(suite, "MULTI", test_smb2_open_multi);
-	torture_suite_add_1smb2_test(suite, "DELETE", test_smb2_open_for_delete);
-	torture_suite_add_1smb2_test(suite, "LEADING-SLASH", test_smb2_leading_slash);
-	torture_suite_add_1smb2_test(suite, "ACLFILE", test_create_acl_file);
-	torture_suite_add_1smb2_test(suite, "ACLDIR", test_create_acl_dir);
-	torture_suite_add_1smb2_test(suite, "NULLDACL", test_create_null_dacl);
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "create");
+
+	torture_suite_add_1smb2_test(suite, "gentest", test_create_gentest);
+	torture_suite_add_1smb2_test(suite, "blob", test_create_blob);
+	torture_suite_add_1smb2_test(suite, "open", test_smb2_open);
+	torture_suite_add_1smb2_test(suite, "brlocked", test_smb2_open_brlocked);
+	torture_suite_add_1smb2_test(suite, "multi", test_smb2_open_multi);
+	torture_suite_add_1smb2_test(suite, "delete", test_smb2_open_for_delete);
+	torture_suite_add_1smb2_test(suite, "leading-slash", test_smb2_leading_slash);
+	torture_suite_add_1smb2_test(suite, "aclfile", test_create_acl_file);
+	torture_suite_add_1smb2_test(suite, "acldir", test_create_acl_dir);
+	torture_suite_add_1smb2_test(suite, "nulldacl", test_create_null_dacl);
 
 	suite->description = talloc_strdup(suite, "SMB2-CREATE tests");
 
diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c
index dbd1a19a45..8cf0e1f35c 100644
--- a/source4/torture/smb2/dir.c
+++ b/source4/torture/smb2/dir.c
@@ -1330,16 +1330,16 @@ done:
 struct torture_suite *torture_smb2_dir_init(void)
 {
 	struct torture_suite *suite =
-	    torture_suite_create(talloc_autofree_context(), "DIR");
-
-	torture_suite_add_1smb2_test(suite, "FIND", test_find);
-	torture_suite_add_1smb2_test(suite, "FIXED", test_fixed);
-	torture_suite_add_1smb2_test(suite, "ONE", test_one_file);
-	torture_suite_add_1smb2_test(suite, "MANY", test_many_files);
-	torture_suite_add_1smb2_test(suite, "MODIFY", test_modify_search);
-	torture_suite_add_1smb2_test(suite, "SORTED", test_sorted);
-	torture_suite_add_1smb2_test(suite, "FILE-INDEX", test_file_index);
-	torture_suite_add_1smb2_test(suite, "LARGE-FILES", test_large_files);
+	    torture_suite_create(talloc_autofree_context(), "dir");
+
+	torture_suite_add_1smb2_test(suite, "find", test_find);
+	torture_suite_add_1smb2_test(suite, "fixed", test_fixed);
+	torture_suite_add_1smb2_test(suite, "one", test_one_file);
+	torture_suite_add_1smb2_test(suite, "many", test_many_files);
+	torture_suite_add_1smb2_test(suite, "modify", test_modify_search);
+	torture_suite_add_1smb2_test(suite, "sorted", test_sorted);
+	torture_suite_add_1smb2_test(suite, "file-index", test_file_index);
+	torture_suite_add_1smb2_test(suite, "large-files", test_large_files);
 	suite->description = talloc_strdup(suite, "SMB2-DIR tests");
 
 	return suite;
diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index d182744b35..7a85443f25 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -586,14 +586,14 @@ bool test_durable_open_open(struct torture_context *tctx,
 struct torture_suite *torture_smb2_durable_open_init(void)
 {
 	struct torture_suite *suite =
-	    torture_suite_create(talloc_autofree_context(), "DURABLE-OPEN");
+	    torture_suite_create(talloc_autofree_context(), "durable-open");
 
-	torture_suite_add_2smb2_test(suite, "FILE-POSITION",
+	torture_suite_add_2smb2_test(suite, "file-position",
 	    test_durable_open_file_position);
-	torture_suite_add_2smb2_test(suite, "OPLOCK", test_durable_open_oplock);
-	torture_suite_add_2smb2_test(suite, "LEASE", test_durable_open_lease);
-	torture_suite_add_1smb2_test(suite, "LOCK", test_durable_open_lock);
-	torture_suite_add_2smb2_test(suite, "OPEN", test_durable_open_open);
+	torture_suite_add_2smb2_test(suite, "oplock", test_durable_open_oplock);
+	torture_suite_add_2smb2_test(suite, "lease", test_durable_open_lease);
+	torture_suite_add_1smb2_test(suite, "lock", test_durable_open_lock);
+	torture_suite_add_2smb2_test(suite, "open", test_durable_open_open);
 
 	suite->description = talloc_strdup(suite, "SMB2-DURABLE-OPEN tests");
 
diff --git a/source4/torture/smb2/lease.c b/source4/torture/smb2/lease.c
index eda3b97eea..564394f31e 100644
--- a/source4/torture/smb2/lease.c
+++ b/source4/torture/smb2/lease.c
@@ -832,13 +832,13 @@ static bool test_lease_multibreak(struct torture_context *tctx,
 struct torture_suite *torture_smb2_lease_init(void)
 {
 	struct torture_suite *suite =
-	    torture_suite_create(talloc_autofree_context(), "LEASE");
+	    torture_suite_create(talloc_autofree_context(), "lease");
 
-	torture_suite_add_1smb2_test(suite, "REQUEST", test_lease_request);
-	torture_suite_add_1smb2_test(suite, "UPGRADE", test_lease_upgrade);
-	torture_suite_add_1smb2_test(suite, "BREAK", test_lease_break);
-	torture_suite_add_1smb2_test(suite, "OPLOCK", test_lease_oplock);
-	torture_suite_add_1smb2_test(suite, "MULTIBREAK", test_lease_multibreak);
+	torture_suite_add_1smb2_test(suite, "request", test_lease_request);
+	torture_suite_add_1smb2_test(suite, "upgrade", test_lease_upgrade);
+	torture_suite_add_1smb2_test(suite, "break", test_lease_break);
+	torture_suite_add_1smb2_test(suite, "oplock", test_lease_oplock);
+	torture_suite_add_1smb2_test(suite, "multibreak", test_lease_multibreak);
 
 	suite->description = talloc_strdup(suite, "SMB2-LEASE tests");
 
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index ad66b6236b..fe82813345 100644
--- a/source4/torture/smb2/lock.c
+++ b/source4/torture/smb2/lock.c
@@ -2853,36 +2853,36 @@ done:
 struct torture_suite *torture_smb2_lock_init(void)
 {
 	struct torture_suite *suite =
-	    torture_suite_create(talloc_autofree_context(), "LOCK");
+	    torture_suite_create(talloc_autofree_context(), "lock");
 
-	torture_suite_add_1smb2_test(suite, "VALID-REQUEST",
+	torture_suite_add_1smb2_test(suite, "valid-request",
 	    test_valid_request);
-	torture_suite_add_1smb2_test(suite, "RW-NONE", test_lock_rw_none);
-	torture_suite_add_1smb2_test(suite, "RW-SHARED", test_lock_rw_shared);
-	torture_suite_add_1smb2_test(suite, "RW-EXCLUSIVE",
+	torture_suite_add_1smb2_test(suite, "rw-none", test_lock_rw_none);
+	torture_suite_add_1smb2_test(suite, "rw-shared", test_lock_rw_shared);
+	torture_suite_add_1smb2_test(suite, "rw-exclusive",
 	    test_lock_rw_exclusive);
-	torture_suite_add_1smb2_test(suite, "AUTO-UNLOCK",
+	torture_suite_add_1smb2_test(suite, "auto-unlock",
 	    test_lock_auto_unlock);
-	torture_suite_add_1smb2_test(suite, "LOCK", test_lock);
-	torture_suite_add_1smb2_test(suite, "ASYNC", test_async);
-	torture_suite_add_1smb2_test(suite, "CANCEL", test_cancel);
-	torture_suite_add_1smb2_test(suite, "CANCEL-TDIS", test_cancel_tdis);
-	torture_suite_add_1smb2_test(suite, "CANCEL-LOGOFF",
+	torture_suite_add_1smb2_test(suite, "lock", test_lock);
+	torture_suite_add_1smb2_test(suite, "async", test_async);
+	torture_suite_add_1smb2_test(suite, "cancel", test_cancel);
+	torture_suite_add_1smb2_test(suite, "cancel-tdis", test_cancel_tdis);
+	torture_suite_add_1smb2_test(suite, "cancel-logoff",
 	    test_cancel_logoff);
-	torture_suite_add_1smb2_test(suite, "ERRORCODE", test_errorcode);
-	torture_suite_add_1smb2_test(suite, "ZEROBYTELENGTH",
+	torture_suite_add_1smb2_test(suite, "errorcode", test_errorcode);
+	torture_suite_add_1smb2_test(suite, "zerobytelength",
 	    test_zerobytelength);
-	torture_suite_add_1smb2_test(suite, "ZEROBYTEREAD",
+	torture_suite_add_1smb2_test(suite, "zerobyteread",
 	    test_zerobyteread);
-	torture_suite_add_1smb2_test(suite, "UNLOCK", test_unlock);
-	torture_suite_add_1smb2_test(suite, "MULTIPLE-UNLOCK",
+	torture_suite_add_1smb2_test(suite, "unlock", test_unlock);
+	torture_suite_add_1smb2_test(suite, "multiple-unlock",
 	    test_multiple_unlock);
-	torture_suite_add_1smb2_test(suite, "STACKING", test_stacking);
-	torture_suite_add_1smb2_test(suite, "CONTEND", test_contend);
-	torture_suite_add_1smb2_test(suite, "CONTEXT", test_context);
-	torture_suite_add_1smb2_test(suite, "RANGE", test_range);
-	torture_suite_add_2smb2_test(suite, "OVERLAP", test_overlap);
-	torture_suite_add_1smb2_test(suite, "TRUNCATE", test_truncate);
+	torture_suite_add_1smb2_test(suite, "stacking", test_stacking);
+	torture_suite_add_1smb2_test(suite, "contend", test_contend);
+	torture_suite_add_1smb2_test(suite, "context", test_context);
+	torture_suite_add_1smb2_test(suite, "range", test_range);
+	torture_suite_add_2smb2_test(suite, "overlap", test_overlap);
+	torture_suite_add_1smb2_test(suite, "truncate", test_truncate);
 
 	suite->description = talloc_strdup(suite, "SMB2-LOCK tests");
 
diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index 0115cd0478..80c560be00 100644
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -1974,22 +1974,22 @@ done:
 */
 struct torture_suite *torture_smb2_notify_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NOTIFY");
-
-	torture_suite_add_1smb2_test(suite, "VALID-REQ", test_valid_request);
-	torture_suite_add_1smb2_test(suite, "TCON", torture_smb2_notify_tcon);
-	torture_suite_add_2smb2_test(suite, "DIR", torture_smb2_notify_dir);
-	torture_suite_add_2smb2_test(suite, "MASK", torture_smb2_notify_mask);
-	torture_suite_add_1smb2_test(suite, "TDIS", torture_smb2_notify_tree_disconnect);
-	torture_suite_add_2smb2_test(suite, "MASK-CHANGE", torture_smb2_notify_mask_change);
-	torture_suite_add_2smb2_test(suite, "LOGOFF", torture_smb2_notify_ulogoff);
-	torture_suite_add_1smb2_test(suite, "TREE", torture_smb2_notify_tree);
-	torture_suite_add_2smb2_test(suite, "BASEDIR", torture_smb2_notify_basedir);
-	torture_suite_add_2smb2_test(suite, "DOUBLE", torture_smb2_notify_double);
-	torture_suite_add_1smb2_test(suite, "FILE", torture_smb2_notify_file);
-	torture_suite_add_1smb2_test(suite, "TCP", torture_smb2_notify_tcp_disconnect);
-	torture_suite_add_2smb2_test(suite, "REC", torture_smb2_notify_recursive);
-	torture_suite_add_1smb2_test(suite, "OVERFLOW", torture_smb2_notify_overflow);
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "notify");
+
+	torture_suite_add_1smb2_test(suite, "valid-req", test_valid_request);
+	torture_suite_add_1smb2_test(suite, "tcon", torture_smb2_notify_tcon);
+	torture_suite_add_2smb2_test(suite, "dir", torture_smb2_notify_dir);
+	torture_suite_add_2smb2_test(suite, "mask", torture_smb2_notify_mask);
+	torture_suite_add_1smb2_test(suite, "tdis", torture_smb2_notify_tree_disconnect);
+	torture_suite_add_2smb2_test(suite, "mask-change", torture_smb2_notify_mask_change);
+	torture_suite_add_2smb2_test(suite, "logoff", torture_smb2_notify_ulogoff);
+	torture_suite_add_1smb2_test(suite, "tree", torture_smb2_notify_tree);
+	torture_suite_add_2smb2_test(suite, "basedir", torture_smb2_notify_basedir);
+	torture_suite_add_2smb2_test(suite, "double", torture_smb2_notify_double);
+	torture_suite_add_1smb2_test(suite, "file", torture_smb2_notify_file);
+	torture_suite_add_1smb2_test(suite, "tcp", torture_smb2_notify_tcp_disconnect);
+	torture_suite_add_2smb2_test(suite, "rec", torture_smb2_notify_recursive);
+	torture_suite_add_1smb2_test(suite, "overflow", torture_smb2_notify_overflow);
 
 	suite->description = talloc_strdup(suite, "SMB2-NOTIFY tests");
 
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index 5261b58473..eeea03639a 100644
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -3361,43 +3361,43 @@ static bool test_smb2_oplock_levelII500(struct torture_context *tctx,
 struct torture_suite *torture_smb2_oplocks_init(void)
 {
 	struct torture_suite *suite =
-	    torture_suite_create(talloc_autofree_context(), "OPLOCK");
-
-	torture_suite_add_2smb2_test(suite, "EXCLUSIVE1", test_smb2_oplock_exclusive1);
-	torture_suite_add_2smb2_test(suite, "EXCLUSIVE2", test_smb2_oplock_exclusive2);
-	torture_suite_add_2smb2_test(suite, "EXCLUSIVE3", test_smb2_oplock_exclusive3);
-	torture_suite_add_2smb2_test(suite, "EXCLUSIVE4", test_smb2_oplock_exclusive4);
-	torture_suite_add_2smb2_test(suite, "EXCLUSIVE5", test_smb2_oplock_exclusive5);
-	torture_suite_add_2smb2_test(suite, "EXCLUSIVE6", test_smb2_oplock_exclusive6);
-	torture_suite_add_2smb2_test(suite, "BATCH1", test_smb2_oplock_batch1);
-	torture_suite_add_2smb2_test(suite, "BATCH2", test_smb2_oplock_batch2);
-	torture_suite_add_2smb2_test(suite, "BATCH3", test_smb2_oplock_batch3);
-	torture_suite_add_2smb2_test(suite, "BATCH4", test_smb2_oplock_batch4);
-	torture_suite_add_2smb2_test(suite, "BATCH5", test_smb2_oplock_batch5);
-	torture_suite_add_2smb2_test(suite, "BATCH6", test_smb2_oplock_batch6);
-	torture_suite_add_2smb2_test(suite, "BATCH7", test_smb2_oplock_batch7);
-	torture_suite_add_2smb2_test(suite, "BATCH8", test_smb2_oplock_batch8);
-	torture_suite_add_2smb2_test(suite, "BATCH9", test_smb2_oplock_batch9);
-	torture_suite_add_2smb2_test(suite, "BATCH10", test_smb2_oplock_batch10);
-	torture_suite_add_2smb2_test(suite, "BATCH11", test_smb2_oplock_batch11);
-	torture_suite_add_2smb2_test(suite, "BATCH12", test_smb2_oplock_batch12);
-	torture_suite_add_2smb2_test(suite, "BATCH13", test_smb2_oplock_batch13);
-	torture_suite_add_2smb2_test(suite, "BATCH14", test_smb2_oplock_batch14);
-	torture_suite_add_2smb2_test(suite, "BATCH15", test_smb2_oplock_batch15);
-	torture_suite_add_2smb2_test(suite, "BATCH16", test_smb2_oplock_batch16);
-	torture_suite_add_1smb2_test(suite, "BATCH19", test_smb2_oplock_batch19);
-	torture_suite_add_2smb2_test(suite, "BATCH20", test_smb2_oplock_batch20);
-	torture_suite_add_1smb2_test(suite, "BATCH21", test_smb2_oplock_batch21);
-	torture_suite_add_1smb2_test(suite, "BATCH22", test_smb2_oplock_batch22);
-	torture_suite_add_2smb2_test(suite, "BATCH23", test_smb2_oplock_batch23);
-	torture_suite_add_2smb2_test(suite, "BATCH24", test_smb2_oplock_batch24);
-	torture_suite_add_1smb2_test(suite, "BATCH25", test_smb2_oplock_batch25);
-	torture_suite_add_2smb2_test(suite, "STREAM1", test_raw_oplock_stream1);
-	torture_suite_add_1smb2_test(suite, "DOC", test_smb2_oplock_doc);
-	torture_suite_add_2smb2_test(suite, "BRL1", test_smb2_oplock_brl1);
-	torture_suite_add_1smb2_test(suite, "BRL2", test_smb2_oplock_brl2);
-	torture_suite_add_1smb2_test(suite, "BRL3", test_smb2_oplock_brl3);
-	torture_suite_add_1smb2_test(suite, "LEVELII500", test_smb2_oplock_levelII500);
+	    torture_suite_create(talloc_autofree_context(), "oplock");
+
+	torture_suite_add_2smb2_test(suite, "exclusive1", test_smb2_oplock_exclusive1);
+	torture_suite_add_2smb2_test(suite, "exclusive2", test_smb2_oplock_exclusive2);
+	torture_suite_add_2smb2_test(suite, "exclusive3", test_smb2_oplock_exclusive3);
+	torture_suite_add_2smb2_test(suite, "exclusive4", test_smb2_oplock_exclusive4);
+	torture_suite_add_2smb2_test(suite, "exclusive5", test_smb2_oplock_exclusive5);
+	torture_suite_add_2smb2_test(suite, "exclusive6", test_smb2_oplock_exclusive6);
+	torture_suite_add_2smb2_test(suite, "batch1", test_smb2_oplock_batch1);
+	torture_suite_add_2smb2_test(suite, "batch2", test_smb2_oplock_batch2);
+	torture_suite_add_2smb2_test(suite, "batch3", test_smb2_oplock_batch3);
+	torture_suite_add_2smb2_test(suite, "batch4", test_smb2_oplock_batch4);
+	torture_suite_add_2smb2_test(suite, "batch5", test_smb2_oplock_batch5);
+	torture_suite_add_2smb2_test(suite, "batch6", test_smb2_oplock_batch6);
+	torture_suite_add_2smb2_test(suite, "batch7", test_smb2_oplock_batch7);
+	torture_suite_add_2smb2_test(suite, "batch8", test_smb2_oplock_batch8);
+	torture_suite_add_2smb2_test(suite, "batch9", test_smb2_oplock_batch9);
+	torture_suite_add_2smb2_test(suite, "batch10", test_smb2_oplock_batch10);
+	torture_suite_add_2smb2_test(suite, "batch11", test_smb2_oplock_batch11);
+	torture_suite_add_2smb2_test(suite, "batch12", test_smb2_oplock_batch12);
+	torture_suite_add_2smb2_test(suite, "batch13", test_smb2_oplock_batch13);
+	torture_suite_add_2smb2_test(suite, "batch14", test_smb2_oplock_batch14);
+	torture_suite_add_2smb2_test(suite, "batch15", test_smb2_oplock_batch15);
+	torture_suite_add_2smb2_test(suite, "batch16", test_smb2_oplock_batch16);
+	torture_suite_add_1smb2_test(suite, "batch19", test_smb2_oplock_batch19);
+	torture_suite_add_2smb2_test(suite, "batch20", test_smb2_oplock_batch20);
+	torture_suite_add_1smb2_test(suite, "batch21", test_smb2_oplock_batch21);
+	torture_suite_add_1smb2_test(suite, "batch22", test_smb2_oplock_batch22);
+	torture_suite_add_2smb2_test(suite, "batch23", test_smb2_oplock_batch23);
+	torture_suite_add_2smb2_test(suite, "batch24", test_smb2_oplock_batch24);
+	torture_suite_add_1smb2_test(suite, "batch25", test_smb2_oplock_batch25);
+	torture_suite_add_2smb2_test(suite, "stream1", test_raw_oplock_stream1);
+	torture_suite_add_1smb2_test(suite, "doc", test_smb2_oplock_doc);
+	torture_suite_add_2smb2_test(suite, "brl1", test_smb2_oplock_brl1);
+	torture_suite_add_1smb2_test(suite, "brl2", test_smb2_oplock_brl2);
+	torture_suite_add_1smb2_test(suite, "brl3", test_smb2_oplock_brl3);
+	torture_suite_add_1smb2_test(suite, "levelii500", test_smb2_oplock_levelII500);
 
 	suite->description = talloc_strdup(suite, "SMB2-OPLOCK tests");
 
diff --git a/source4/torture/smb2/read.c b/source4/torture/smb2/read.c
index cbd59d8b66..f27ce24413 100644
--- a/source4/torture/smb2/read.c
+++ b/source4/torture/smb2/read.c
@@ -231,11 +231,11 @@ done:
 */
 struct torture_suite *torture_smb2_read_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "READ");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "read");
 
-	torture_suite_add_1smb2_test(suite, "EOF", test_read_eof);
-	torture_suite_add_1smb2_test(suite, "POSITION", test_read_position);
-	torture_suite_add_1smb2_test(suite, "DIR", test_read_dir);
+	torture_suite_add_1smb2_test(suite, "eof", test_read_eof);
+	torture_suite_add_1smb2_test(suite, "position", test_read_position);
+	torture_suite_add_1smb2_test(suite, "dir", test_read_dir);
 
 	suite->description = talloc_strdup(suite, "SMB2-READ tests");
 
diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index da5d9b3e78..0126cf169c 100644
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -125,14 +125,14 @@ struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
 
 NTSTATUS torture_smb2_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "SMB2");
-	torture_suite_add_simple_test(suite, "CONNECT", torture_smb2_connect);
-	torture_suite_add_simple_test(suite, "SCAN", torture_smb2_scan);
-	torture_suite_add_simple_test(suite, "SCANGETINFO", torture_smb2_getinfo_scan);
-	torture_suite_add_simple_test(suite, "SCANSETINFO", torture_smb2_setinfo_scan);
-	torture_suite_add_simple_test(suite, "SCANFIND", torture_smb2_find_scan);
-	torture_suite_add_simple_test(suite, "GETINFO", torture_smb2_getinfo);
-	torture_suite_add_simple_test(suite, "SETINFO", torture_smb2_setinfo);
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "smb2");
+	torture_suite_add_simple_test(suite, "connect", torture_smb2_connect);
+	torture_suite_add_simple_test(suite, "scan", torture_smb2_scan);
+	torture_suite_add_simple_test(suite, "scangetinfo", torture_smb2_getinfo_scan);
+	torture_suite_add_simple_test(suite, "scansetinfo", torture_smb2_setinfo_scan);
+	torture_suite_add_simple_test(suite, "scanfind", torture_smb2_find_scan);
+	torture_suite_add_simple_test(suite, "getinfo", torture_smb2_getinfo);
+	torture_suite_add_simple_test(suite, "setinfo", torture_smb2_setinfo);
 	torture_suite_add_suite(suite, torture_smb2_lock_init());
 	torture_suite_add_suite(suite, torture_smb2_read_init());
 	torture_suite_add_suite(suite, torture_smb2_create_init());
@@ -144,8 +144,8 @@ NTSTATUS torture_smb2_init(void)
 	torture_suite_add_suite(suite, torture_smb2_compound_init());
 	torture_suite_add_suite(suite, torture_smb2_oplocks_init());
 	torture_suite_add_suite(suite, torture_smb2_streams_init());
-	torture_suite_add_1smb2_test(suite, "BENCH-OPLOCK", test_smb2_bench_oplock);
-	torture_suite_add_1smb2_test(suite, "HOLD-OPLOCK", test_smb2_hold_oplock);
+	torture_suite_add_1smb2_test(suite, "bench-oplock", test_smb2_bench_oplock);
+	torture_suite_add_1smb2_test(suite, "hold-oplock", test_smb2_hold_oplock);
 
 	suite->description = talloc_strdup(suite, "SMB2-specific tests");
 
diff --git a/source4/torture/smb2/streams.c b/source4/torture/smb2/streams.c
index f4e83c9ad3..a679ee2e5c 100644
--- a/source4/torture/smb2/streams.c
+++ b/source4/torture/smb2/streams.c
@@ -1738,18 +1738,18 @@ done:
 struct torture_suite *torture_smb2_streams_init(void)
 {
 	struct torture_suite *suite =
-		torture_suite_create(talloc_autofree_context(), "STREAMS");
-
-	torture_suite_add_1smb2_test(suite, "DIR", test_stream_dir);
-	torture_suite_add_1smb2_test(suite, "IO", test_stream_io);
-	torture_suite_add_1smb2_test(suite, "SHAREMODES", test_stream_sharemodes);
-	torture_suite_add_1smb2_test(suite, "NAMES", test_stream_names);
-	torture_suite_add_1smb2_test(suite, "NAMES2", test_stream_names2);
-	torture_suite_add_1smb2_test(suite, "RENAME", test_stream_rename);
-	torture_suite_add_1smb2_test(suite, "RENAME2", test_stream_rename2);
-	torture_suite_add_1smb2_test(suite, "CREATE-DISPOSITION", test_stream_create_disposition);
-	torture_suite_add_1smb2_test(suite, "ATTRIBUTES", test_stream_attributes);
-	torture_suite_add_1smb2_test(suite, "DELETE", test_stream_delete);
+		torture_suite_create(talloc_autofree_context(), "streams");
+
+	torture_suite_add_1smb2_test(suite, "dir", test_stream_dir);
+	torture_suite_add_1smb2_test(suite, "io", test_stream_io);
+	torture_suite_add_1smb2_test(suite, "sharemodes", test_stream_sharemodes);
+	torture_suite_add_1smb2_test(suite, "names", test_stream_names);
+	torture_suite_add_1smb2_test(suite, "names2", test_stream_names2);
+	torture_suite_add_1smb2_test(suite, "rename", test_stream_rename);
+	torture_suite_add_1smb2_test(suite, "rename2", test_stream_rename2);
+	torture_suite_add_1smb2_test(suite, "create-disposition", test_stream_create_disposition);
+	torture_suite_add_1smb2_test(suite, "attributes", test_stream_attributes);
+	torture_suite_add_1smb2_test(suite, "delete", test_stream_delete);
 
 	suite->description = talloc_strdup(suite, "SMB2-STREAM tests");
 
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index dec97d22f6..4244bfbc90 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -54,7 +54,7 @@ static bool run_matching(struct torture_context *torture,
 		if (prefix == NULL)
 			name = talloc_strdup(torture, o->name);
 		else
-			name = talloc_asprintf(torture, "%s-%s", prefix, o->name);
+			name = talloc_asprintf(torture, "%s.%s", prefix, o->name);
 		if (gen_fnmatch(expr, name) == 0) {
 			*matched = true;
 			reload_charcnv(torture->lp_ctx);
@@ -67,14 +67,14 @@ static bool run_matching(struct torture_context *torture,
 	}
 
 	for (t = suite->testcases; t; t = t->next) {
-		char *name = talloc_asprintf(torture, "%s-%s", prefix, t->name);
+		char *name = talloc_asprintf(torture, "%s.%s", prefix, t->name);
 		if (gen_fnmatch(expr, name) == 0) {
 			*matched = true;
 			reload_charcnv(torture->lp_ctx);
 			ret &= torture_run_tcase_restricted(torture, t, restricted);
 		}
 		for (p = t->tests; p; p = p->next) {
-			name = talloc_asprintf(torture, "%s-%s-%s", prefix, t->name, p->name);
+			name = talloc_asprintf(torture, "%s.%s.%s", prefix, t->name, p->name);
 			if (gen_fnmatch(expr, name) == 0) {
 				*matched = true;
 				reload_charcnv(torture->lp_ctx);
@@ -211,7 +211,7 @@ static void print_structured_testsuite_list(void)
 				printf("\n  ");
 				i = 0;
 			}
-			i+=printf("%s-%s ", o->name, s->name);
+			i+=printf("%s.%s ", o->name, s->name);
 		}
 
 		for (t = o->testcases; t; t = t->next) {
@@ -219,7 +219,7 @@ static void print_structured_testsuite_list(void)
 				printf("\n  ");
 				i = 0;
 			}
-			i+=printf("%s-%s ", o->name, t->name);
+			i+=printf("%s.%s ", o->name, t->name);
 		}
 
 		if (i) printf("\n");
@@ -239,11 +239,11 @@ static void print_testsuite_list(void)
 
 	for (o = torture_root->children; o; o = o->next) {
 		for (s = o->children; s; s = s->next) {
-			printf("%s-%s\n", o->name, s->name);
+			printf("%s.%s\n", o->name, s->name);
 		}
 
 		for (t = o->testcases; t; t = t->next) {
-			printf("%s-%s\n", o->name, t->name);
+			printf("%s.%s\n", o->name, t->name);
 		}
 	}
 }
diff --git a/source4/torture/unix/unix.c b/source4/torture/unix/unix.c
index 661e337270..ec8afef279 100644
--- a/source4/torture/unix/unix.c
+++ b/source4/torture/unix/unix.c
@@ -24,15 +24,15 @@
 NTSTATUS torture_unix_init(void)
 {
         struct torture_suite *suite =
-                torture_suite_create(talloc_autofree_context(), "UNIX");
+                torture_suite_create(talloc_autofree_context(), "unix");
 
         suite->description =
                 talloc_strdup(suite, "CIFS UNIX extensions tests");
 
 	torture_suite_add_simple_test(suite,
-                        "WHOAMI", torture_unix_whoami);
+                        "whoami", torture_unix_whoami);
 	torture_suite_add_simple_test(suite,
-			"INFO2", unix_torture_unix_info2);
+			"info2", unix_torture_unix_info2);
 
         return (torture_register_suite(suite)) ? NT_STATUS_OK
                                         : NT_STATUS_UNSUCCESSFUL;
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
index 1603280e48..ea81871250 100644
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -1062,26 +1062,26 @@ static bool torture_winbind_struct_lookup_name_sid(struct torture_context *tortu
 
 struct torture_suite *torture_winbind_struct_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "STRUCT");
-
-	torture_suite_add_simple_test(suite, "INTERFACE_VERSION", torture_winbind_struct_interface_version);
-	torture_suite_add_simple_test(suite, "PING", torture_winbind_struct_ping);
-	torture_suite_add_simple_test(suite, "INFO", torture_winbind_struct_info);
-	torture_suite_add_simple_test(suite, "PRIV_PIPE_DIR", torture_winbind_struct_priv_pipe_dir);
-	torture_suite_add_simple_test(suite, "NETBIOS_NAME", torture_winbind_struct_netbios_name);
-	torture_suite_add_simple_test(suite, "DOMAIN_NAME", torture_winbind_struct_domain_name);
-	torture_suite_add_simple_test(suite, "CHECK_MACHACC", torture_winbind_struct_check_machacc);
-	torture_suite_add_simple_test(suite, "LIST_TRUSTDOM", torture_winbind_struct_list_trustdom);
-	torture_suite_add_simple_test(suite, "DOMAIN_INFO", torture_winbind_struct_domain_info);
-	torture_suite_add_simple_test(suite, "GETDCNAME", torture_winbind_struct_getdcname);
-	torture_suite_add_simple_test(suite, "DSGETDCNAME", torture_winbind_struct_dsgetdcname);
-	torture_suite_add_simple_test(suite, "LIST_USERS", torture_winbind_struct_list_users);
-	torture_suite_add_simple_test(suite, "LIST_GROUPS", torture_winbind_struct_list_groups);
-	torture_suite_add_simple_test(suite, "SHOW_SEQUENCE", torture_winbind_struct_show_sequence);
-	torture_suite_add_simple_test(suite, "SETPWENT", torture_winbind_struct_setpwent);
-	torture_suite_add_simple_test(suite, "GETPWENT", torture_winbind_struct_getpwent);
-	torture_suite_add_simple_test(suite, "ENDPWENT", torture_winbind_struct_endpwent);
-	torture_suite_add_simple_test(suite, "LOOKUP_NAME_SID", torture_winbind_struct_lookup_name_sid);
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "struct");
+
+	torture_suite_add_simple_test(suite, "interface_version", torture_winbind_struct_interface_version);
+	torture_suite_add_simple_test(suite, "ping", torture_winbind_struct_ping);
+	torture_suite_add_simple_test(suite, "info", torture_winbind_struct_info);
+	torture_suite_add_simple_test(suite, "priv_pipe_dir", torture_winbind_struct_priv_pipe_dir);
+	torture_suite_add_simple_test(suite, "netbios_name", torture_winbind_struct_netbios_name);
+	torture_suite_add_simple_test(suite, "domain_name", torture_winbind_struct_domain_name);
+	torture_suite_add_simple_test(suite, "check_machacc", torture_winbind_struct_check_machacc);
+	torture_suite_add_simple_test(suite, "list_trustdom", torture_winbind_struct_list_trustdom);
+	torture_suite_add_simple_test(suite, "domain_info", torture_winbind_struct_domain_info);
+	torture_suite_add_simple_test(suite, "getdcname", torture_winbind_struct_getdcname);
+	torture_suite_add_simple_test(suite, "dsgetdcname", torture_winbind_struct_dsgetdcname);
+	torture_suite_add_simple_test(suite, "list_users", torture_winbind_struct_list_users);
+	torture_suite_add_simple_test(suite, "list_groups", torture_winbind_struct_list_groups);
+	torture_suite_add_simple_test(suite, "show_sequence", torture_winbind_struct_show_sequence);
+	torture_suite_add_simple_test(suite, "setpwent", torture_winbind_struct_setpwent);
+	torture_suite_add_simple_test(suite, "getpwent", torture_winbind_struct_getpwent);
+	torture_suite_add_simple_test(suite, "endpwent", torture_winbind_struct_endpwent);
+	torture_suite_add_simple_test(suite, "lookup_name_sid", torture_winbind_struct_lookup_name_sid);
 
 	suite->description = talloc_strdup(suite, "WINBIND - struct based protocol tests");
 
diff --git a/source4/torture/winbind/winbind.c b/source4/torture/winbind/winbind.c
index 63d31a5f1e..80b914b2eb 100644
--- a/source4/torture/winbind/winbind.c
+++ b/source4/torture/winbind/winbind.c
@@ -23,7 +23,7 @@
 
 NTSTATUS torture_winbind_init(void)
 {
-	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "WINBIND");
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "winbind");
 
 	torture_suite_add_suite(suite, torture_winbind_struct_init());
 	torture_suite_add_suite(suite, torture_wbclient());