diff --git a/reg-tests/cache/h00000.vtc b/reg-tests/cache/basic.vtc
similarity index 100%
rename from reg-tests/cache/h00000.vtc
rename to reg-tests/cache/basic.vtc
diff --git a/reg-tests/checks/s00001.vtc b/reg-tests/checks/1be_40srv_odd_health_checks.vtc
similarity index 100%
rename from reg-tests/checks/s00001.vtc
rename to reg-tests/checks/1be_40srv_odd_health_checks.vtc
diff --git a/reg-tests/checks/s00002.vtc b/reg-tests/checks/40be_2srv_odd_health_checks.vtc
similarity index 100%
rename from reg-tests/checks/s00002.vtc
rename to reg-tests/checks/40be_2srv_odd_health_checks.vtc
diff --git a/reg-tests/checks/s00000.vtc b/reg-tests/checks/4be_1srv_health_checks.vtc
similarity index 100%
rename from reg-tests/checks/s00000.vtc
rename to reg-tests/checks/4be_1srv_health_checks.vtc
diff --git a/reg-tests/checks/s00003.vtc b/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
similarity index 100%
rename from reg-tests/checks/s00003.vtc
rename to reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
diff --git a/reg-tests/checks/s00004.vtc b/reg-tests/checks/tls_health_checks.vtc
similarity index 100%
rename from reg-tests/checks/s00004.vtc
rename to reg-tests/checks/tls_health_checks.vtc
diff --git a/reg-tests/compression/h00000.vtc b/reg-tests/compression/basic.vtc
similarity index 100%
rename from reg-tests/compression/h00000.vtc
rename to reg-tests/compression/basic.vtc
diff --git a/reg-tests/compression/h00001.vtc b/reg-tests/compression/etags_conversion.vtc
similarity index 100%
rename from reg-tests/compression/h00001.vtc
rename to reg-tests/compression/etags_conversion.vtc
diff --git a/reg-tests/compression/s00000.lua b/reg-tests/compression/lua_validation.lua
similarity index 100%
rename from reg-tests/compression/s00000.lua
rename to reg-tests/compression/lua_validation.lua
diff --git a/reg-tests/compression/s00000.vtc b/reg-tests/compression/lua_validation.vtc
similarity index 100%
rename from reg-tests/compression/s00000.vtc
rename to reg-tests/compression/lua_validation.vtc
diff --git a/reg-tests/connection/h00001.vtc b/reg-tests/connection/dispatch.vtc
similarity index 100%
rename from reg-tests/connection/h00001.vtc
rename to reg-tests/connection/dispatch.vtc
diff --git a/reg-tests/connection/b00000.vtc b/reg-tests/connection/proxy_protocol_random_fail.vtc
similarity index 100%
rename from reg-tests/connection/b00000.vtc
rename to reg-tests/connection/proxy_protocol_random_fail.vtc
diff --git a/reg-tests/http-capture/h00000.vtc b/reg-tests/http-capture/multiple_headers.vtc
similarity index 100%
rename from reg-tests/http-capture/h00000.vtc
rename to reg-tests/http-capture/multiple_headers.vtc
diff --git a/reg-tests/http-cookies/h00000.vtc b/reg-tests/http-cookies/cookie_insert_indirect.vtc
similarity index 100%
rename from reg-tests/http-cookies/h00000.vtc
rename to reg-tests/http-cookies/cookie_insert_indirect.vtc
diff --git a/reg-tests/http-messaging/h00000.vtc b/reg-tests/http-messaging/h1_to_h1.vtc
similarity index 100%
rename from reg-tests/http-messaging/h00000.vtc
rename to reg-tests/http-messaging/h1_to_h1.vtc
diff --git a/reg-tests/http-messaging/h00002.vtc b/reg-tests/http-messaging/h2_to_h1.vtc
similarity index 100%
rename from reg-tests/http-messaging/h00002.vtc
rename to reg-tests/http-messaging/h2_to_h1.vtc
diff --git a/reg-tests/http-messaging/h00003.vtc b/reg-tests/http-messaging/http_request_buffer.vtc
similarity index 100%
rename from reg-tests/http-messaging/h00003.vtc
rename to reg-tests/http-messaging/http_request_buffer.vtc
diff --git a/reg-tests/http-rules/h00002.map b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.map
similarity index 100%
rename from reg-tests/http-rules/h00002.map
rename to reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.map
diff --git a/reg-tests/http-rules/h00002.vtc b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
similarity index 100%
rename from reg-tests/http-rules/h00002.vtc
rename to reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
diff --git a/reg-tests/http-rules/h00000.vtc b/reg-tests/http-rules/h1_to_h1c.vtc
similarity index 100%
rename from reg-tests/http-rules/h00000.vtc
rename to reg-tests/http-rules/h1_to_h1c.vtc
diff --git a/reg-tests/http-rules/h00001.vtc b/reg-tests/http-rules/h1or2_to_h1c.vtc
similarity index 100%
rename from reg-tests/http-rules/h00001.vtc
rename to reg-tests/http-rules/h1or2_to_h1c.vtc
diff --git a/reg-tests/http-rules/h00003-be.map b/reg-tests/http-rules/map_redirect-be.map
similarity index 100%
rename from reg-tests/http-rules/h00003-be.map
rename to reg-tests/http-rules/map_redirect-be.map
diff --git a/reg-tests/http-rules/h00003.map b/reg-tests/http-rules/map_redirect.map
similarity index 100%
rename from reg-tests/http-rules/h00003.map
rename to reg-tests/http-rules/map_redirect.map
diff --git a/reg-tests/http-rules/h00003.vtc b/reg-tests/http-rules/map_redirect.vtc
similarity index 100%
rename from reg-tests/http-rules/h00003.vtc
rename to reg-tests/http-rules/map_redirect.vtc
diff --git a/reg-tests/http-rules/b00000.map b/reg-tests/http-rules/map_regm_with_backref.map
similarity index 100%
rename from reg-tests/http-rules/b00000.map
rename to reg-tests/http-rules/map_regm_with_backref.map
diff --git a/reg-tests/http-rules/b00000.vtc b/reg-tests/http-rules/map_regm_with_backref.vtc
similarity index 100%
rename from reg-tests/http-rules/b00000.vtc
rename to reg-tests/http-rules/map_regm_with_backref.vtc
diff --git a/reg-tests/log/b00000.vtc b/reg-tests/log/wrong_ip_port_logging.vt
similarity index 100%
rename from reg-tests/log/b00000.vtc
rename to reg-tests/log/wrong_ip_port_logging.vt
diff --git a/reg-tests/lua/b00001.lua b/reg-tests/lua/bad_http_clt_req_duration.lua
similarity index 100%
rename from reg-tests/lua/b00001.lua
rename to reg-tests/lua/bad_http_clt_req_duration.lua
diff --git a/reg-tests/lua/b00001.vtc b/reg-tests/lua/bad_http_clt_req_duration.vtc
similarity index 100%
rename from reg-tests/lua/b00001.vtc
rename to reg-tests/lua/bad_http_clt_req_duration.vtc
diff --git a/reg-tests/lua/b00003.lua b/reg-tests/lua/close_wait_lf.lua
similarity index 100%
rename from reg-tests/lua/b00003.lua
rename to reg-tests/lua/close_wait_lf.lua
diff --git a/reg-tests/lua/b00003.vtc b/reg-tests/lua/close_wait_lf.vtc
similarity index 100%
rename from reg-tests/lua/b00003.vtc
rename to reg-tests/lua/close_wait_lf.vtc
diff --git a/reg-tests/lua/h00001.lua b/reg-tests/lua/h_txn_get_priv.lua
similarity index 100%
rename from reg-tests/lua/h00001.lua
rename to reg-tests/lua/h_txn_get_priv.lua
diff --git a/reg-tests/lua/h00001.vtc b/reg-tests/lua/h_txn_get_priv.vtc
similarity index 100%
rename from reg-tests/lua/h00001.vtc
rename to reg-tests/lua/h_txn_get_priv.vtc
diff --git a/reg-tests/lua/h00002.lua b/reg-tests/lua/lua_socket.lua
similarity index 100%
rename from reg-tests/lua/h00002.lua
rename to reg-tests/lua/lua_socket.lua
diff --git a/reg-tests/lua/h00002.vtc b/reg-tests/lua/lua_socket.vtc
similarity index 100%
rename from reg-tests/lua/h00002.vtc
rename to reg-tests/lua/lua_socket.vtc
diff --git a/reg-tests/lua/b00002_print_r.lua b/reg-tests/lua/txn_get_priv-print_r.lua
similarity index 100%
rename from reg-tests/lua/b00002_print_r.lua
rename to reg-tests/lua/txn_get_priv-print_r.lua
diff --git a/reg-tests/lua/b00002.lua b/reg-tests/lua/txn_get_priv.lua
similarity index 100%
rename from reg-tests/lua/b00002.lua
rename to reg-tests/lua/txn_get_priv.lua
diff --git a/reg-tests/lua/b00002.vtc b/reg-tests/lua/txn_get_priv.vtc
similarity index 100%
rename from reg-tests/lua/b00002.vtc
rename to reg-tests/lua/txn_get_priv.vtc
diff --git a/reg-tests/lua/b00000.lua b/reg-tests/lua/wrong_types_usage.lua
similarity index 100%
rename from reg-tests/lua/b00000.lua
rename to reg-tests/lua/wrong_types_usage.lua
diff --git a/reg-tests/lua/b00000.vtc b/reg-tests/lua/wrong_types_usage.vtc
similarity index 100%
rename from reg-tests/lua/b00000.vtc
rename to reg-tests/lua/wrong_types_usage.vtc
diff --git a/reg-tests/mailers/k_healthcheckmail.lua b/reg-tests/mailers/healthcheckmail.lua
similarity index 100%
rename from reg-tests/mailers/k_healthcheckmail.lua
rename to reg-tests/mailers/healthcheckmail.lua
diff --git a/reg-tests/mailers/k_healthcheckmail.vtc b/reg-tests/mailers/healthcheckmail.vtc
similarity index 100%
rename from reg-tests/mailers/k_healthcheckmail.vtc
rename to reg-tests/mailers/healthcheckmail.vtc
diff --git a/reg-tests/peers/s_basic_sync.vtc b/reg-tests/peers/basic_sync.vtc
similarity index 100%
rename from reg-tests/peers/s_basic_sync.vtc
rename to reg-tests/peers/basic_sync.vtc
diff --git a/reg-tests/peers/s_tls_basic_sync.vtc b/reg-tests/peers/tls_basic_sync.vtc
similarity index 100%
rename from reg-tests/peers/s_tls_basic_sync.vtc
rename to reg-tests/peers/tls_basic_sync.vtc
diff --git a/reg-tests/seamless-reload/b00000.vtc b/reg-tests/seamless-reload/abns_socket.vtc
similarity index 100%
rename from reg-tests/seamless-reload/b00000.vtc
rename to reg-tests/seamless-reload/abns_socket.vtc
diff --git a/reg-tests/server/b00000.vtc b/reg-tests/server/cli_set_fdqn.vtc
similarity index 100%
rename from reg-tests/server/b00000.vtc
rename to reg-tests/server/cli_set_fdqn.vtc
diff --git a/reg-tests/spoe/b00000.vtc b/reg-tests/spoe/wrong_init.vtc
similarity index 100%
rename from reg-tests/spoe/b00000.vtc
rename to reg-tests/spoe/wrong_init.vtc
diff --git a/reg-tests/ssl/b00000.vtc b/reg-tests/ssl/wrong_ctx_storage.vtc
similarity index 100%
rename from reg-tests/ssl/b00000.vtc
rename to reg-tests/ssl/wrong_ctx_storage.vtc
diff --git a/reg-tests/stick-table/b00001.vtc b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
similarity index 100%
rename from reg-tests/stick-table/b00001.vtc
rename to reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
diff --git a/reg-tests/stick-table/b00000.vtc b/reg-tests/stick-table/unknown_key.vtc
similarity index 100%
rename from reg-tests/stick-table/b00000.vtc
rename to reg-tests/stick-table/unknown_key.vtc
diff --git a/reg-tests/webstats/h_webstats-scope-and-post-change.vtc b/reg-tests/webstats/webstats-scope-and-post-change.vtc
similarity index 100%
rename from reg-tests/webstats/h_webstats-scope-and-post-change.vtc
rename to reg-tests/webstats/webstats-scope-and-post-change.vtc