Index: src/add.c
==================================================================
--- src/add.c
+++ src/add.c
@@ -150,11 +150,11 @@
 **
 ** Usage: %fossil test-reserved-names [-omitrepo]
 **
 ** Show all reserved filenames for the current check-out.
 */
-void test_reserved_names(void){
+void test_reserved_names_cmd(void){
   int i;
   const char *z;
   int omitRepo = find_option("omitrepo",0,0)!=0;
 
   /* We should be done with options.. */

Index: src/alerts.c
==================================================================
--- src/alerts.c
+++ src/alerts.c
@@ -19,11 +19,11 @@
 **
 ** Are you looking for the code that reads and writes the internet
 ** email protocol?  That is not here.  See the "smtp.c" file instead.
 ** Yes, the choice of source code filenames is not the greatest, but
 ** it is not so bad that changing them seems justified.
-*/ 
+*/
 #include "config.h"
 #include "alerts.h"
 #include <assert.h>
 #include <time.h>
 
@@ -199,11 +199,11 @@
 ** WEBPAGE: setup_notification
 **
 ** Administrative page for configuring and controlling email notification.
 ** Normally accessible via the /Admin/Notification menu.
 */
-void setup_notification(void){
+void setup_notification_page(void){
   static const char *const azSendMethods[] = {
     "off",   "Disabled",
     "pipe",  "Pipe to a command",
     "db",    "Store in a database",
     "dir",   "Store in a directory",
@@ -746,11 +746,11 @@
 **
 ** Return the mailbox hash name corresponding to each human-readable
 ** name on the command line.  This is a test interface for the
 ** alert_mailbox_name() function.
 */
-void alert_test_mailbox_hashname(void){
+void test_mailbox_hashname_cmd(void){
   int i;
   for(i=2; i<g.argc; i++){
     fossil_print("%30s: %s\n", g.argv[i], alert_mailbox_name(g.argv[i]));
   }
 }
@@ -1021,11 +1021,11 @@
 **                              --stdout
 **                              --subject|-S SUBJECT
 **
 **    unsubscribe EMAIL       Remove a single subscriber with the given EMAIL.
 */
-void alert_cmd(void){
+void alerts_cmd(void){
   const char *zCmd;
   int nCmd;
   db_find_and_open_repository(0, 0);
   alert_schema(0);
   zCmd = g.argc>=3 ? g.argv[2] : "x";
@@ -1559,17 +1559,17 @@
 ** Edit email alert and notification settings.
 **
 ** The subscriber is identified in either of two ways:
 **
 **    (1)  The name= query parameter contains the subscriberCode.
-**         
+**
 **    (2)  The user is logged into an account other than "nobody" or
 **         "anonymous".  In that case the notification settings
 **         associated with that account can be edited without needing
 **         to know the subscriber code.
 */
-void alert_page(void){
+void alerts_page(void){
   const char *zName = P("name");
   Stmt q;
   int sa, sc, sf, st, sw, sx;
   int sdigest = 0, sdonotcall = 0, sverified = 0;
   int isLogin;         /* Logged in as an individual */
@@ -1976,11 +1976,11 @@
 ** shows a list of subscriber email addresses.
 ** Clicking on an email takes one to the /alerts page
 ** for that email where the delivery settings can be
 ** modified.
 */
-void subscriber_list_page(void){
+void subscribers_page(void){
   Blob sql;
   Stmt q;
   sqlite3_int64 iNow;
   int nTotal;
   int nPending;
@@ -2301,11 +2301,11 @@
   blob_appendf(pOut, "\n-- \nTo unsubscribe: %s/unsubscribe\n",
      db_get("email-url","http://localhost:8080"));
 }
 
 /*
-** COMMAND:  test-alert
+** COMMAND: test-alert
 **
 ** Usage: %fossil test-alert EVENTID ...
 **
 ** Generate the text of an email alert for all of the EVENTIDs
 ** listed on the command-line.  Or if no events are listed on the
@@ -2362,11 +2362,11 @@
   blob_reset(&out);
   db_end_transaction(0);
 }
 
 /*
-** COMMAND:  test-add-alerts
+** COMMAND: test-add-alerts
 **
 ** Usage: %fossil test-add-alerts [OPTIONS] EVENTID ...
 **
 ** Add one or more events to the pending_alert queue.  Use this
 ** command during testing to force email notifications for specific
@@ -2387,11 +2387,11 @@
 **                        so that emails are printed to standard output
 **                        rather than being sent.
 **
 **    --digest            Process emails using SENDALERT_DIGEST
 */
-void test_add_alert_cmd(void){
+void test_add_alerts_cmd(void){
   int i;
   int doAuto = find_option("backoffice",0,0)!=0;
   unsigned mFlags = 0;
   if( find_option("debug",0,0)!=0 ){
     doAuto = 1;

Index: src/allrepo.c
==================================================================
--- src/allrepo.c
+++ src/allrepo.c
@@ -196,11 +196,11 @@
   zCmd = g.argv[2];
   if( !login_is_nobody() ) blob_appendf(&extra, " -U %s", g.zLogin);
   if( strncmp(zCmd, "ui", n)==0 || strncmp(zCmd, "server", n)==0 ){
     g.argv[1] = g.argv[2];
     g.argv[2] = "/";
-    cmd_webserver();
+    webserver_cmd();
     return;
   }
   if( strncmp(zCmd, "list", n)==0 || strncmp(zCmd,"ls",n)==0 ){
     zCmd = "list";
     useCheckouts = find_option("ckout","c",0)!=0;

Index: src/attach.c
==================================================================
--- src/attach.c
+++ src/attach.c
@@ -147,13 +147,13 @@
   style_footer();
   return;
 }
 
 /*
+** WEBPAGE: attachview
 ** WEBPAGE: attachdownload
 ** WEBPAGE: attachimage
-** WEBPAGE: attachview
 **
 ** Download or display an attachment.
 ** Query parameters:
 **
 **    tkt=TICKETUUID

Index: src/backoffice.c
==================================================================
--- src/backoffice.c
+++ src/backoffice.c
@@ -316,11 +316,11 @@
 **
 ** Show the current process id, and also tell whether or not all other
 ** processes IDs on the command line are running or not.  If the --sleep N
 ** option is provide, then sleep for N seconds before exiting.
 */
-void test_process_id_command(void){
+void test_process_id_cmd(void){
   const char *zSleep = find_option("sleep",0,1);
   int i;
   verify_all_options();
   fossil_print("ProcessID for this process: %lld\n", backofficeProcessId());
   if( zSleep ) sqlite3_sleep(1000*atoi(zSleep));
@@ -338,11 +338,11 @@
 ** Usage: %fossil test-backoffice-lease
 **
 ** Print out information about the backoffice "lease" entry in the
 ** config table that controls whether or not backoffice should run.
 */
-void test_backoffice_lease(void){
+void test_backoffice_lease_cmd(void){
   sqlite3_int64 tmNow = time(0);
   Lease x;
   const char *zLease;
   db_find_and_open_repository(0,0);
   verify_all_options();
@@ -567,11 +567,11 @@
 **                            change in appoximately N-second intervals.
 **                            N less than 1 turns polling off (the default).
 **
 **    --trace                 Enable debugging output on stderr
 */
-void backoffice_command(void){
+void backoffice_cmd(void){
   int nPoll;
   const char *zPoll;
   int bDebug = 0;
   unsigned int nCmd = 0;
   if( find_option("trace",0,0)!=0 ) g.fAnyTrace = 1;

Index: src/bisect.c
==================================================================
--- src/bisect.c
+++ src/bisect.c
@@ -510,11 +510,11 @@
     newArgv[2] = "--page";
     newArgv[3] = "timeline?bisect";
     newArgv[4] = 0;
     g.argv = newArgv;
     g.argc = 4;
-    cmd_webserver();
+    webserver_cmd();
   }else if( strncmp(zCmd, "vlist", n)==0
          || strncmp(zCmd, "ls", n)==0
          || strncmp(zCmd, "status", n)==0
   ){
     int fAll = find_option("all", "a", 0)!=0;

Index: src/blob.c
==================================================================
--- src/blob.c
+++ src/blob.c
@@ -130,11 +130,11 @@
 ** COMMAND: test-isspace
 **
 ** Verify that the fossil_isspace() routine is working correctly by
 ** testing it on all possible inputs.
 */
-void isspace_cmd(void){
+void test_isspace_cmd(void){
   int i;
   for(i=0; i<=255; i++){
     if( i==' ' || i=='\n' || i=='\t' || i=='\v'
         || i=='\f' || i=='\r' ){
       assert( fossil_isspace((char)i) );
@@ -1025,11 +1025,11 @@
 **
 ** Run compression on INPUTFILE and write the result into OUTPUTFILE.
 **
 ** This is used to test and debug the blob_compress() routine.
 */
-void compress_cmd(void){
+void test_compress_cmd(void){
   Blob f;
   if( g.argc!=4 ) usage("INPUTFILE OUTPUTFILE");
   blob_read_from_file(&f, g.argv[2], ExtFILE);
   blob_compress(&f, &f);
   blob_write_to_file(&f, g.argv[3]);
@@ -1084,11 +1084,11 @@
 ** Read files IN1 and IN2, concatenate the content, compress the
 ** content, then write results into OUT.
 **
 ** This is used to test and debug the blob_compress2() routine.
 */
-void compress2_cmd(void){
+void test_compress2_cmd(void){
   Blob f1, f2;
   if( g.argc!=5 ) usage("INPUTFILE1 INPUTFILE2 OUTPUTFILE");
   blob_read_from_file(&f1, g.argv[2], ExtFILE);
   blob_read_from_file(&f2, g.argv[3], ExtFILE);
   blob_compress2(&f1, &f2, &f1);
@@ -1136,11 +1136,11 @@
 **
 ** Read the content of file IN, uncompress that content, and write the
 ** result into OUT.  This command is intended for testing of the
 ** blob_compress() function.
 */
-void uncompress_cmd(void){
+void test_uncompress_cmd(void){
   Blob f;
   if( g.argc!=4 ) usage("INPUTFILE OUTPUTFILE");
   blob_read_from_file(&f, g.argv[2], ExtFILE);
   blob_uncompress(&f, &f);
   blob_write_to_file(&f, g.argv[3]);
@@ -1150,11 +1150,11 @@
 ** COMMAND: test-cycle-compress
 **
 ** Compress and uncompress each file named on the command line.
 ** Verify that the original content is recovered.
 */
-void test_cycle_compress(void){
+void test_cycle_compress_cmd(void){
   int i;
   Blob b1, b2, b3;
   for(i=2; i<g.argc; i++){
     blob_read_from_file(&b1, g.argv[i], ExtFILE);
     blob_compress(&b1, &b2);

Index: src/browse.c
==================================================================
--- src/browse.c
+++ src/browse.c
@@ -118,11 +118,11 @@
 **    ci=LABEL         Show only files in this check-in.  Optional.
 **    type=TYPE        TYPE=flat: use this display
 **                     TYPE=tree: use the /tree display instead
 **    noreadme         Do not attempt to display the README file.
 */
-void page_dir(void){
+void dir_page(void){
   char *zD = fossil_strdup(P("name"));
   int nD = zD ? strlen(zD)+1 : 0;
   int mxLen;
   char *zPrefix;
   Stmt q;
@@ -134,11 +134,11 @@
   const char *zSubdirLink;
   int linkTrunk = 1;
   int linkTip = 1;
   HQuery sURI;
 
-  if( strcmp(PD("type","flat"),"tree")==0 ){ page_tree(); return; }
+  if( strcmp(PD("type","flat"),"tree")==0 ){ tree_page(); return; }
   login_check_credentials();
   if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
   while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }
   style_header("File List");
   style_adunit_config(ADUNIT_RIGHT_OK);
@@ -587,11 +587,11 @@
 **    re=REGEXP        Show only files matching REGEXP.  Optional.
 **    expand           Begin with the tree fully expanded.
 **    nofiles          Show directories (folders) only.  Omit files.
 **    mtime            Order directory elements by decreasing mtime
 */
-void page_tree(void){
+void tree_page(void){
   char *zD = fossil_strdup(P("name"));
   int nD = zD ? strlen(zD)+1 : 0;
   const char *zCI = P("ci");
   int rid = 0;
   char *zUuid = 0;
@@ -613,11 +613,11 @@
   int startExpanded;       /* True to start out with the tree expanded */
   int showDirOnly;         /* Show directories only.  Omit files */
   int nDir = 0;            /* Number of directories. Used for ID attributes */
   char *zProjectName = db_get("project-name", 0);
 
-  if( strcmp(PD("type","flat"),"flat")==0 ){ page_dir(); return; }
+  if( strcmp(PD("type","flat"),"flat")==0 ){ dir_page(); return; }
   memset(&sTree, 0, sizeof(sTree));
   login_check_credentials();
   if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
   while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }
   sqlite3_create_function(g.db, "pathelement", 2, SQLITE_UTF8, 0,

Index: src/builtin.c
==================================================================
--- src/builtin.c
+++ src/builtin.c
@@ -58,11 +58,11 @@
 /*
 ** COMMAND: test-builtin-list
 **
 ** List the names and sizes of all built-in resources.
 */
-void test_builtin_list(void){
+void test_builtin_list_cmd(void){
   int i;
   for(i=0; i<count(aBuiltinFiles); i++){
     fossil_print("%-30s %6d\n", aBuiltinFiles[i].zName,aBuiltinFiles[i].nByte);
   }
 }
@@ -70,11 +70,11 @@
 /*
 ** WEBPAGE: test-builtin-files
 **
 ** Show all built-in text files.
 */
-void test_builtin_list_page(void){
+void test_builtin_files_page(void){
   int i;
   style_header("Built-in Text Files");
   @ <ul>
   for(i=0; i<count(aBuiltinFiles); i++){
     const char *z = aBuiltinFiles[i].zName;
@@ -87,11 +87,11 @@
 /*
 ** COMMAND: test-builtin-get
 **
 ** Usage: %fossil test-builtin-get NAME ?OUTPUT-FILE?
 */
-void test_builtin_get(void){
+void test_builtin_get_cmd(void){
   const unsigned char *pData;
   int nByte;
   Blob x;
   if( g.argc!=3 && g.argc!=4 ){
     usage("NAME ?OUTPUT-FILE?");

Index: src/cache.c
==================================================================
--- src/cache.c
+++ src/cache.c
@@ -346,11 +346,11 @@
 /*
 ** WEBPAGE: cachestat
 **
 ** Show information about the webpage cache.  Requires Setup privilege.
 */
-void cache_page(void){
+void cachestat_page(void){
   sqlite3 *db;
   sqlite3_stmt *pStmt;
   char zBuf[100];
 
   login_check_credentials();
@@ -396,11 +396,11 @@
 **
 ** Download a single entry for the cache, identified by KEY.
 ** This page is normally a hyperlink from the /cachestat page.
 ** Requires Admin privilege.
 */
-void cache_getpage(void){
+void cacheget_page(void){
   const char *zKey;
   Blob content;
 
   login_check_credentials();
   if( !g.perm.Setup ){ login_needed(0); return; }

Index: src/captcha.c
==================================================================
--- src/captcha.c
+++ src/captcha.c
@@ -417,11 +417,11 @@
 /*
 ** COMMAND: test-captcha
 **
 ** Render an ASCII-art captcha for numbers given on the command line.
 */
-void test_captcha(void){
+void test_captcha_cmd(void){
   int i;
   unsigned int v;
   char *z;
 
   for(i=2; i<g.argc; i++){
@@ -576,11 +576,11 @@
 ** WEBPAGE: test-captcha
 ** Test the captcha-generator by rendering the value of the name= query
 ** parameter using ascii-art.  If name= is omitted, show a random 16-digit
 ** hexadecimal number.
 */
-void captcha_test(void){
+void test_captcha_page(void){
   const char *zPw = P("name");
   if( zPw==0 || zPw[0]==0 ){
     u64 x;
     sqlite3_randomness(sizeof(x), &x);
     zPw = mprintf("%016llx", x);
@@ -675,32 +675,32 @@
     }
   }
 }
 
 /*
-** WEBPAGE: /captcha-audio
+** WEBPAGE: captcha-audio
 **
 ** Return a WAV file that pronounces the digits of the captcha that
 ** is determined by the seed given in the name= query parameter.
 */
-void captcha_wav_page(void){
+void captcha_audio_page(void){
   const char *zSeed = P("name");
   const char *zDecode = captcha_decode((unsigned int)atoi(zSeed));
   Blob audio;
   captcha_wav(zDecode, &audio);
   cgi_set_content_type("audio/wav");
   cgi_set_content(&audio);
 }
 
 /*
-** WEBPAGE: /test-captcha-audio
+** WEBPAGE: test-captcha-audio
 **
 ** Return a WAV file that pronounces the hex digits of the name=
 ** query parameter.
 */
-void captcha_test_wav_page(void){
+void test_captcha_audio_page(void){
   const char *zSeed = P("name");
   Blob audio;
   captcha_wav(zSeed, &audio);
   cgi_set_content_type("audio/wav");
   cgi_set_content(&audio);
 }

Index: src/checkin.c
==================================================================
--- src/checkin.c
+++ src/checkin.c
@@ -349,12 +349,12 @@
   if( relPathOption ){ relativePaths = 1; }
   return relativePaths;
 }
 
 /*
-** COMMAND: changes
 ** COMMAND: status
+** COMMAND: changes
 **
 ** Usage: %fossil changes|status ?OPTIONS? ?PATHS ...?
 **
 ** Report the change status of files in the current checkout.  If one or
 ** more PATHS are specified, only changes among the named files and
@@ -1453,11 +1453,11 @@
 ** Usage: %fossil test-date-format DATE-STRING...
 **
 ** Convert the DATE-STRING into the standard format used in artifacts
 ** and display the result.
 */
-void test_date_format(void){
+void test_date_format_cmd(void){
   int i;
   db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
   for(i=2; i<g.argc; i++){
     fossil_print("%s -> %s\n", g.argv[i], date_in_standard_format(g.argv[i]));
   }
@@ -1879,11 +1879,11 @@
 **    --no-settings     Do not consider any glob settings.
 **    -v|--verbose      Show per-file results for all pre-commit checks.
 **
 ** See also: commit, extras
 */
-void test_commit_warning(void){
+void test_commit_warning_cmd(void){
   int rc = 0;
   int noSettings;
   int verboseFlag;
   Stmt q;
   noSettings = find_option("no-settings",0,0)!=0;

Index: src/comformat.c
==================================================================
--- src/comformat.c
+++ src/comformat.c
@@ -568,11 +568,11 @@
 **   --indent         Number of spaces to indent (default (-1) is to
 **                    auto-detect).  Zero means no indent.
 **   -W|--width <num> Width of lines (default (-1) is to auto-detect).
 **                    Zero means no limit.
 */
-void test_comment_format(void){
+void test_comment_format_cmd(void){
   const char *zWidth;
   const char *zIndent;
   const char *zPrefix;
   char *zText;
   char *zOrigText;

Index: src/content.c
==================================================================
--- src/content.c
+++ src/content.c
@@ -936,11 +936,11 @@
 ** Options:
 **
 **    --parse            Parse all manifests, wikis, tickets, events, and
 **                       so forth, reporting any errors found.
 */
-void test_integrity(void){
+void test_integrity_cmd(void){
   Stmt q;
   Blob content;
   int n1 = 0;
   int n2 = 0;
   int nErr = 0;
@@ -1046,11 +1046,11 @@
 /*
 ** COMMAND: test-orphans
 **
 ** Search the repository for orphaned artifacts.
 */
-void test_orphans(void){
+void test_orphans_cmd(void){
   Stmt q;
   int cnt = 0;
 
   db_find_and_open_repository(0, 0);
   db_multi_exec(
@@ -1155,11 +1155,11 @@
 ** Options:
 **
 **    --notshunned          Do not report shunned artifacts
 **    --quiet               Only show output if there are errors
 */
-void test_missing(void){
+void test_missing_cmd(void){
   Stmt q;
   Blob content;
   int nErr = 0;
   int nArtifact = 0;
   int i;
@@ -1227,11 +1227,11 @@
 ** the metadata.
 **
 ** Note that the arguments are the integer raw RID values from the BLOB table,
 ** not artifact hashes or labels.
 */
-void test_content_erase(void){
+void test_content_erase_cmd(void){
   int i;
   Blob x;
   char c;
   Stmt q;
   prompt_user("This command erases information from the repository and\n"

Index: src/cookies.c
==================================================================
--- src/cookies.c
+++ src/cookies.c
@@ -201,16 +201,16 @@
   for(i=0; i<cookies.nParam && strcmp(zPName,cookies.aParam[i].zPName); i++){}
   return i<cookies.nParam ? cookies.aParam[i].zPValue : zDefault;
 }
 
 /*
-** WEBPAGE:  cookies
+** WEBPAGE: cookies
 **
 ** Show the current display settings contained in the
 ** "fossil_display_settings" cookie.
 */
-void cookie_page(void){
+void cookies_page(void){
   int i;
   if( PB("clear") ){
     cgi_set_cookie(DISPLAY_SETTINGS_COOKIE, "", 0, 1);
     cgi_replace_parameter(DISPLAY_SETTINGS_COOKIE, "");
   }

Index: src/db.c
==================================================================
--- src/db.c
+++ src/db.c
@@ -605,11 +605,11 @@
 ** COMMAND: test-db-exec-error
 **
 ** Invoke the db_exec() interface with an erroneous SQL statement
 ** in order to verify the error handling logic.
 */
-void db_test_db_exec_cmd(void){
+void test_db_exec_error_cmd(void){
   Stmt err;
   db_find_and_open_repository(0,0);
   db_prepare(&err, "INSERT INTO repository.config(name) VALUES(NULL);");
   db_exec(&err);
 }
@@ -1900,11 +1900,11 @@
 **
 ** Change the location of the repository database on a local check-out.
 ** Use this command to avoid having to close and reopen a checkout
 ** when relocating the repository database.
 */
-void move_repo_cmd(void){
+void test_move_repo_cmd(void){
   Blob repo;
   char *zRepo;
   if( g.argc!=3 ){
     usage("PATHNAME");
   }
@@ -2950,11 +2950,11 @@
 **                     times (the timestamp of the last checkin which modified
 **                     them).
 **
 ** See also: close
 */
-void cmd_open(void){
+void open_cmd(void){
   int emptyFlag;
   int keepFlag;
   int forceMissingFlag;
   int allowNested;
   int allowSymlinks;
@@ -3733,11 +3733,11 @@
 **
 **   --exact    only consider exact name matches.
 **
 ** See also: configuration
 */
-void setting_cmd(void){
+void settings_cmd(void){
   int i;
   int globalFlag = find_option("global","g",0)!=0;
   int exactFlag = find_option("exact",0,0)!=0;
   int unsetFlag = g.argv[1][0]=='u';
   int nSetting;
@@ -3867,11 +3867,11 @@
 ** of SQLite.  There is no big advantage to using WITHOUT ROWID in Fossil.
 **
 ** Options:
 **    --dryrun | -n         No changes.  Just print what would happen.
 */
-void test_without_rowid(void){
+void test_without_rowid_cmd(void){
   int i, j;
   Stmt q;
   Blob allSql;
   int dryRun = find_option("dry-run", "n", 0)!=0;
   for(i=2; i<g.argc; i++){
@@ -3969,11 +3969,11 @@
 ** Print the names of the various database files:
 ** (1) The main repository database
 ** (2) The local checkout database
 ** (3) The global configuration database
 */
-void test_database_name_cmd(void){
+void test_database_names_cmd(void){
   db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
   fossil_print("Repository database: %s\n", g.zRepositoryName);
   fossil_print("Local database:      %s\n", g.zLocalDbName);
   fossil_print("Config database:     %s\n", g.zConfigDbName);
 }
@@ -4048,11 +4048,11 @@
 ** Display the repository fingerprint using the supplied RCVID or
 ** using the latest RCVID if not is given on the command line.
 ** Show both the legacy and the newer version of the fingerprint,
 ** and the currently stored fingerprint if there is one.
 */
-void test_fingerprint(void){
+void test_fingerprint_cmd(void){
   int rcvid = 0;
   db_find_and_open_repository(OPEN_ANY_SCHEMA,0);
   if( g.argc==3 ){
     rcvid = atoi(g.argv[2]);
   }else if( g.argc!=2 ){

Index: src/deltacmd.c
==================================================================
--- src/deltacmd.c
+++ src/deltacmd.c
@@ -48,11 +48,11 @@
 ** Usage: %fossil test-delta-create FILE1 FILE2 DELTA
 **
 ** Create and output a delta that carries FILE1 into FILE2.
 ** Store the result in DELTA.
 */
-void delta_create_cmd(void){
+void test_delta_create_cmd(void){
   Blob orig, target, delta;
   if( g.argc!=5 ){
     usage("ORIGIN TARGET DELTA");
   }
   if( blob_read_from_file(&orig, g.argv[2], ExtFILE)<0 ){
@@ -76,11 +76,11 @@
 ** Usage: %fossil test-delta-analyze FILE1 FILE2
 **
 ** Create and a delta that carries FILE1 into FILE2.  Print the
 ** number bytes copied and the number of bytes inserted.
 */
-void delta_analyze_cmd(void){
+void test_delta_analyze_cmd(void){
   Blob orig, target, delta;
   int nCopy = 0;
   int nInsert = 0;
   int sz1, sz2, sz3;
   if( g.argc!=4 ){
@@ -147,11 +147,11 @@
 **
 ** Usage: %fossil test-delta-apply FILE1 DELTA
 **
 ** Apply DELTA to FILE1 and output the result.
 */
-void delta_apply_cmd(void){
+void test_delta_apply_cmd(void){
   Blob orig, target, delta;
   if( g.argc!=5 ){
     usage("ORIGIN DELTA TARGET");
   }
   if( blob_read_from_file(&orig, g.argv[2], ExtFILE)<0 ){
@@ -177,11 +177,11 @@
 **
 ** Read two files named on the command-line.  Create and apply deltas
 ** going in both directions.  Verify that the original files are
 ** correctly recovered.
 */
-void cmd_test_delta(void){
+void test_delta_cmd(void){
   Blob f1, f2;     /* Original file content */
   Blob d12, d21;   /* Deltas from f1->f2 and f2->f1 */
   Blob a1, a2;     /* Recovered file content */
   if( g.argc!=4 ) usage("FILE1 FILE2");
   blob_read_from_file(&f1, g.argv[2], ExtFILE);

Index: src/diff.c
==================================================================
--- src/diff.c
+++ src/diff.c
@@ -2385,11 +2385,11 @@
 **                           check-in over the entire repository is used.
 **                           Specify "origin=trunk" or similar for a reverse
 **                           annotation
 **    w=BOOLEAN           Ignore whitespace
 */
-void annotation_page(void){
+void annotate_page(void){
   int i;
   const char *zLimit;    /* Depth limit */
   u64 annFlags = DIFF_STRIP_EOLCR;
   int showLog;           /* True to display the log */
   int fileVers;          /* Show file version instead of check-in versions */

Index: src/dispatch.c
==================================================================
--- src/dispatch.c
+++ src/dispatch.c
@@ -498,11 +498,11 @@
 /*
 ** COMMAND: test-list-webpage
 **
 ** List all web pages.
 */
-void cmd_test_webpage_list(void){
+void test_list_webpage_cmd(void){
   int i, nCmd;
   const char *aCmd[MX_COMMAND];
   for(i=nCmd=0; i<MX_COMMAND; i++){
     if(CMDFLAG_WEBPAGE & aCommand[i].eCmdFlags){
       aCmd[nCmd++] = aCommand[i].zName;

Index: src/doc.c
==================================================================
--- src/doc.c
+++ src/doc.c
@@ -459,11 +459,11 @@
 **
 ** If Fossil is compiled with -DFOSSIL_DEBUG then the "mimetype-test"
 ** filename is special and verifies the integrity of the mimetype table.
 ** It should return "ok".
 */
-void mimetype_test_cmd(void){
+void test_mimetype_cmd(void){
   int i;
   mimetype_verify();
   db_find_and_open_repository(0, 0);
   for(i=2; i<g.argc; i++){
     fossil_print("%-20s -> %s\n", g.argv[i], mimetype_from_name(g.argv[i]));
@@ -804,12 +804,12 @@
   }
 }
 
 
 /*
-** WEBPAGE: uv
 ** WEBPAGE: doc
+** WEBPAGE: uv
 ** URL: /uv/FILE
 ** URL: /doc/CHECKIN/FILE
 **
 ** CHECKIN can be either tag or hash prefix or timestamp identifying a
 ** particular check, or the name of a branch (meaning the most recent
@@ -1159,11 +1159,11 @@
 **
 ** Query parameters:
 **
 **     s=PATTERN             Search for PATTERN
 */
-void doc_search_page(void){
+void docsrch_page(void){
   login_check_credentials();
   style_header("Document Search");
   search_screen(SRCH_DOC, 0);
   style_footer();
 }

Index: src/export.c
==================================================================
--- src/export.c
+++ src/export.c
@@ -837,11 +837,11 @@
 ** COMMAND: test-topological-sort
 **
 ** Invoke the topological_sort_checkins() interface for testing
 ** purposes.
 */
-void test_topological_sort(void){
+void test_topological_sort_cmd(void){
   int n;
   db_find_and_open_repository(0, 0);
   n = topological_sort_checkins(1);
   fossil_print("%d reorderings required\n", n);
 }
@@ -1662,11 +1662,11 @@
 **
 **   fossil git status
 **
 **       Show the status of the current Git mirror, if there is one.
 */
-void gitmirror_command(void){
+void gitmirror_cmd(void){
   char *zCmd;
   int nCmd;
   if( g.argc<3 ){
     usage("export ARGS...");
   }

Index: src/extcgi.c
==================================================================
--- src/extcgi.c
+++ src/extcgi.c
@@ -383,11 +383,11 @@
 /*
 ** WEBPAGE: extfilelist
 **
 ** List all files in the extension CGI document root and its subfolders.
 */
-void ext_filelist_page(void){
+void extfilelist_page(void){
   Stmt q;
   login_check_credentials();
   if( !g.perm.Admin ){
     login_needed(0);
     return;

Index: src/file.c
==================================================================
--- src/file.c
+++ src/file.c
@@ -551,11 +551,11 @@
 **
 ** Make a copy of the file at SOURCE into a new name DESTINATION.  Any
 ** directories in the path leading up to DESTINATION that do not already
 ** exist are created automatically.
 */
-void test_file_copy(void){
+void test_file_copy_cmd(void){
   if( g.argc!=4 ){
     fossil_fatal("Usage: %s test-file-copy SOURCE DESTINATION", g.argv[0]);
   }
   file_copy(g.argv[2], g.argv[3]);
 }
@@ -618,11 +618,11 @@
 **
 ** Usage: %fossil test-set-mtime FILENAME DATE/TIME
 **
 ** Sets the mtime of the named file to the date/time shown.
 */
-void test_set_mtime(void){
+void test_set_mtime_cmd(void){
   const char *zFile;
   char *zDate;
   i64 iMTime;
   if( g.argc!=4 ){
     usage("FILENAME DATE/TIME");
@@ -774,11 +774,11 @@
 ** Usage: %fossil test-is-normal-dir NAME...
 **
 ** Returns non-zero if the specified names represent real directories, i.e.
 ** not junctions, symbolic links, etc.
 */
-void test_is_normal_dir(void){
+void test_is_normal_dir_cmd(void){
   int i;
   for(i=2; i<g.argc; i++){
     wchar_t *zMbcs = fossil_utf8_to_path(g.argv[i], 1);
     fossil_print("ATTRS \"%s\" -> %lx\n", g.argv[i], GetFileAttributesW(zMbcs));
     fossil_print("ISDIR \"%s\" -> %d\n", g.argv[i], file_is_normal_dir(zMbcs));
@@ -1036,11 +1036,11 @@
 **
 ** Usage: %fossil test-simplify-name FILENAME...
 **
 ** Print the simplified versions of each FILENAME.
 */
-void cmd_test_simplify_name(void){
+void test_simplify_name_cmd(void){
   int i;
   char *z;
   for(i=2; i<g.argc; i++){
     z = mprintf("%s", g.argv[i]);
     fossil_print("[%s] -> ", z);
@@ -1226,11 +1226,11 @@
 **     --allow-symlinks BOOLEAN     Temporarily turn allow-symlinks on/off
 **     --open-config                Open the configuration database first.
 **     --slash                      Trailing slashes, if any, are retained.
 **     --reset                      Reset cached stat() info for each file.
 */
-void cmd_test_file_environment(void){
+void test_file_environment_cmd(void){
   int i;
   int slashFlag = find_option("slash",0,0)!=0;
   int resetFlag = find_option("reset",0,0)!=0;
   const char *zAllow = find_option("allow-symlinks",0,1);
   if( find_option("open-config", 0, 0)!=0 ){
@@ -1256,11 +1256,11 @@
 ** Usage: %fossil test-canonical-name FILENAME...
 **
 ** Test the operation of the canonical name generator.
 ** Also test Fossil's ability to measure attributes of a file.
 */
-void cmd_test_canonical_name(void){
+void test_canonical_name_cmd(void){
   int i;
   Blob x;
   int slashFlag = find_option("slash",0,0)!=0;
   blob_zero(&x);
   for(i=2; i<g.argc; i++){
@@ -1391,11 +1391,11 @@
 /*
 ** COMMAND: test-relative-name
 **
 ** Test the operation of the relative name generator.
 */
-void cmd_test_relative_name(void){
+void test_relative_name_cmd(void){
   int i;
   Blob x;
   int slashFlag = find_option("slash",0,0)!=0;
   blob_zero(&x);
   for(i=2; i<g.argc; i++){
@@ -1510,11 +1510,11 @@
 ** Options:
 **   --absolute           Return an absolute path instead of a relative one.
 **   --case-sensitive B   Enable or disable case-sensitive filenames.  B is
 **                        a boolean: "yes", "no", "true", "false", etc.
 */
-void cmd_test_tree_name(void){
+void test_tree_name_cmd(void){
   int i;
   Blob x;
   int absoluteFlag = find_option("absolute",0,0)!=0;
   db_find_and_open_repository(0,0);
   blob_zero(&x);
@@ -1703,11 +1703,11 @@
 **
 ** Generate temporary filenames derived from BASENAME.  Use the --time
 ** option to generate temp names based on the time of day.  If --tag NAME
 ** is specified, try to use NAME as the differentiator in the temp file.
 */
-void file_test_tempname(void){
+void test_tempname_cmd(void){
   int i;
   const char *zSuffix = find_option("time",0,1);
   Blob x = BLOB_INITIALIZER;
   char *z;
   const char *zTag = find_option("tag",0,1);
@@ -1935,11 +1935,11 @@
 ** COMMAND: test-valid-for-windows
 ** Usage:  fossil test-valid-for-windows FILENAME ....
 **
 ** Show which filenames are not valid for Windows
 */
-void file_test_valid_for_windows(void){
+void test_valid_for_windows_cmd(void){
   int i;
   for(i=2; i<g.argc; i++){
     fossil_print("%s %s\n", file_is_win_reserved(g.argv[i]), g.argv[i]);
   }
 }

Index: src/forum.c
==================================================================
--- src/forum.c
+++ src/forum.c
@@ -253,11 +253,11 @@
 ** Display a summary of all messages on a thread THREADID.  If the
 ** THREADID argument is omitted, then show a list of all threads.
 **
 ** This command is intended for testing an analysis only.
 */
-void forumthread_cmd(void){
+void test_forumthread_cmd(void){
   int fpid;
   int froot;
   const char *zName;
   ForumThread *pThread;
   ForumEntry *p;

Index: src/fuzz.c
==================================================================
--- src/fuzz.c
+++ src/fuzz.c
@@ -125,11 +125,11 @@
 **
 **     wiki                  Fuzz the Fossil-wiki translator
 **     markdown              Fuzz the markdown translator
 **     artifact              Fuzz the artifact parser
 */
-void fuzz_command(void){
+void test_fuzz_cmd(void){
   Blob in;
   int i;
   fuzzer_options();
   verify_all_options();
   for(i=2; i<g.argc; i++){

Index: src/glob.c
==================================================================
--- src/glob.c
+++ src/glob.c
@@ -177,11 +177,11 @@
 **
 ** If PATTERN begins with "@" the rest of the pattern is understood
 ** to be a setting name (such as binary-glob, crln-glob, or encoding-glob)
 ** and the value of that setting is used as the actually glob pattern.
 */
-void glob_test_cmd(void){
+void test_glob_cmd(void){
   Glob *pGlob;
   int i;
   char *zPattern;
   if( g.argc<4 ) usage("PATTERN STRING ...");
   zPattern = g.argv[2];

Index: src/hname.c
==================================================================
--- src/hname.c
+++ src/hname.c
@@ -256,11 +256,11 @@
 ** The default hash policy for existing repositories is "auto", which will
 ** immediately promote to "sha3" if the repository contains one or more
 ** artifacts with SHA3 names.  The default hash policy for new repositories
 ** is "shun-sha1".
 */
-void hash_policy_command(void){
+void hash_policy_cmd(void){
   int i;
   db_find_and_open_repository(0, 0);
   if( g.argc!=2 && g.argc!=3 ) usage("?NEW-POLICY?");
   if( g.argc==2 ){
     fossil_print("%s\n", azPolicy[g.eHashPolicy]);

Index: src/http.c
==================================================================
--- src/http.c
+++ src/http.c
@@ -484,11 +484,11 @@
 **     --compress                 Use ZLIB compression on the payload
 **     --mimetype TYPE            Mimetype of the payload
 **     --out FILE                 Store the reply in FILE
 **     -v                         Verbose output
 */
-void test_httpmsg_command(void){
+void test_httpmsg_cmd(void){
   const char *zMimetype;
   const char *zInFile;
   const char *zOutFile;
   Blob in, out;
   unsigned int mHttpFlags = HTTP_GENERIC|HTTP_NOCOMPRESS;

Index: src/info.c
==================================================================
--- src/info.c
+++ src/info.c
@@ -340,11 +340,11 @@
 **
 ** Show a timeline of all check-ins and other events that have entries
 ** in the backlink table.  This is used for testing the rendering
 ** of the "References" section of the /info page.
 */
-void backlink_timeline_page(void){
+void test_backlinks_page(void){
   Blob sql;
   Stmt q;
 
   login_check_credentials();
   if( !g.perm.Read || !g.perm.RdTkt || !g.perm.RdWiki ){
@@ -639,12 +639,12 @@
   db_finalize(&q);
   style_footer();
 }
 
 /*
-** WEBPAGE: vinfo
 ** WEBPAGE: ci
+** WEBPAGE: vinfo
 ** URL:  /ci/ARTIFACTID
 **  OR:  /ci?name=ARTIFACTID
 **
 ** Display information about a particular check-in.  The exact
 ** same information is shown on the /info page if the name query
@@ -1696,11 +1696,11 @@
 **      regex=REGEX      Only show differences that match REGEX
 **      sbs=BOOLEAN      Turn side-by-side diffs on and off (default: on)
 **      verbose=BOOLEAN  Show more detail when describing artifacts
 **      w=BOOLEAN        Ignore whitespace
 */
-void diff_page(void){
+void fdiff_page(void){
   int v1, v2;
   int isPatch = P("patch")!=0;
   int diffType;          /* 0: none, 1: unified,  2: side-by-side */
   char *zV1;
   char *zV2;
@@ -2187,11 +2187,11 @@
     if( isFile ){
       /* Do a top-level directory listing in /file mode if no argument
       ** specified */
       if( zName==0 || zName[0]==0 ){
         if( P("ci")==0 ) cgi_set_query_parameter("ci","tip");
-        page_tree();
+        tree_page();
         return;
       }
       /* Look for a single file with the given name */
       rid = db_int(0,
          "SELECT fid FROM filename, mlink, event"
@@ -2210,11 +2210,11 @@
            "SELECT 1 FROM filename"
            " WHERE name GLOB '%.*q/*' AND substr(name,1,%d)=='%.*q/';",
            nName, zName, nName+1, nName, zName
         ) ){
           if( P("ci")==0 ) cgi_set_query_parameter("ci","tip");
-          page_tree();
+          tree_page();
           return;
         }
       }
       /* If no file or directory called NAME: issue an error */
       if( rid==0 ){
@@ -3136,11 +3136,11 @@
 ** year-month-day form, it may be truncated, the "T" may be replaced by
 ** a space, and it may also name a timezone offset from UTC as "-HH:MM"
 ** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
 ** means UTC.
 */
-void ci_amend_cmd(void){
+void amend_cmd(void){
   int rid;
   const char *zComment;         /* Current comment on the check-in */
   const char *zNewComment;      /* Revised check-in comment */
   const char *zComFile;         /* Filename from which to read comment */
   const char *zUser;            /* Current user for the check-in */

Index: src/json.c
==================================================================
--- src/json.c
+++ src/json.c
@@ -23,12 +23,12 @@
 ** https://docs.google.com/document/d/1fXViveNhDbiXgCuE7QDXQOKeFzf2qNUkBEgiUvoqFN4/view
 **
 **
 ** Notes for hackers...
 **
-** Here's how command/page dispatching works: json_page_top() (in HTTP mode) or
-** json_cmd_top() (in CLI mode) catch the "json" path/command. Those functions then
+** Here's how command/page dispatching works: json_page() (in HTTP mode) or
+** json_cmd() (in CLI mode) catch the "json" path/command. Those functions then
 ** dispatch to a JSON-mode-specific command/page handler with the type fossil_json_f().
 ** See the API docs for that typedef (below) for the semantics of the callbacks.
 **
 **
 */
@@ -711,11 +711,11 @@
 }
 
 /*
 ** Initializes some JSON bits which need to be initialized relatively
 ** early on. It should only be called from cgi_init() or
-** json_cmd_top() (early on in those functions).
+** json_cmd() (early on in those functions).
 **
 ** Initializes g.json.gc and g.json.param. This code does not (and
 ** must not) rely on any of the fossil environment having been set
 ** up. e.g. it must not use cgi_parameter() and friends because this
 ** must be called before those data are initialized.
@@ -919,11 +919,11 @@
 }
 
 
 /*
 ** Performs some common initialization of JSON-related state.  Must be
-** called by the json_page_top() and json_cmd_top() dispatching
+** called by the json_page() and json_cmd() dispatching
 ** functions to set up the JSON stat used by the dispatched functions.
 **
 ** Implicitly sets up the login information state in CGI mode, but
 ** does not perform any permissions checking. It _might_ (haven't
 ** tested this) die with an error if an auth cookie is malformed.
@@ -2216,11 +2216,11 @@
 /* Last entry MUST have a NULL name. */
 {NULL,NULL,0}
 };
 
 /*
-** Internal helper for json_cmd_top() and json_page_top().
+** Internal helper for json_cmd() and json_page().
 **
 ** Searches JsonPageDefs for a command with the given name. If found,
 ** it is used to generate and output a JSON response. If not found, it
 ** generates a JSON-style error response. Returns 0 on success, non-0
 ** on error. On error it will set g.json's error state.
@@ -2257,13 +2257,13 @@
 /*
 ** WEBPAGE: json
 **
 ** Pages under /json/... must be entered into JsonPageDefs.
 ** This function dispatches them, and is the HTTP equivalent of
-** json_cmd_top().
+** json_cmd().
 */
-void json_page_top(void){
+void json_page(void){
   char const * zCommand;
   assert(g.json.gc.a && "json_main_bootstrap() was not called!");
   json_mode_bootstrap();
   zCommand = json_command_arg(1);
   if(!zCommand || !*zCommand){
@@ -2278,11 +2278,11 @@
 
 #ifdef FOSSIL_ENABLE_JSON
 /* dupe ifdef needed for mkindex */
 /*
 ** This function dispatches json commands and is the CLI equivalent of
-** json_page_top().
+** json_page().
 **
 ** COMMAND: json
 **
 ** Usage: %fossil json SUBCOMMAND ?OPTIONS?
 **
@@ -2321,11 +2321,11 @@
 **
 ** Run '%fossil json' without any subcommand to see the full list (but be
 ** aware that some listed might not yet be fully implemented).
 **
 */
-void json_cmd_top(void){
+void json_cmd(void){
   char const * cmd = NULL;
   int rc = 0;
   memset( &g.perm, 0xff, sizeof(g.perm) )
     /* In CLI mode fossil does not use permissions
        and they all default to false. We enable them

Index: src/leaf.c
==================================================================
--- src/leaf.c
+++ src/leaf.c
@@ -251,11 +251,11 @@
 ** Usage: %fossil NAME ...
 **
 ** Resolve each name on the command line and call leaf_ambiguity_warning()
 ** for each resulting RID.
 */
-void leaf_ambiguity_warning_test(void){
+void test_leaf_ambiguity_cmd(void){
   int i;
   int rid;
   int rc;
   db_find_and_open_repository(0,0);
   verify_all_options();

Index: src/loadctrl.c
==================================================================
--- src/loadctrl.c
+++ src/loadctrl.c
@@ -40,11 +40,11 @@
 **
 ** %fossil test-loadavg
 **
 ** Print the load average on the host machine.
 */
-void loadavg_test_cmd(void){
+void test_loadavg_cmd(void){
   fossil_print("load-average: %f\n", load_average());
 }
 
 /*
 ** Abort the current operation of the load average of the host computer

Index: src/login.c
==================================================================
--- src/login.c
+++ src/login.c
@@ -421,11 +421,11 @@
 **
 ** Read lines of text from standard input.  Interpret each line of text
 ** as a User-Agent string from an HTTP header.  Label each line as HUMAN
 ** or ROBOT.
 */
-void test_ishuman(void){
+void test_ishuman_cmd(void){
   char zLine[3000];
   while( fgets(zLine, sizeof(zLine), stdin) ){
     fossil_print("%s %s", isHuman(zLine) ? "HUMAN" : "ROBOT", zLine);
   }
 }
@@ -1984,11 +1984,11 @@
 ** access any other group member as long as they have an entry in the
 ** USER table of that member.  If a user changes their password using
 ** web interface, their password is also automatically changed in every
 ** other member of the login group.
 */
-void login_group_command(void){
+void login_group_cmd(void){
   const char *zLGName;
   const char *zCmd;
   int nCmd;
   Stmt q;
   db_find_and_open_repository(0,0);

Index: src/lookslike.c
==================================================================
--- src/lookslike.c
+++ src/lookslike.c
@@ -408,11 +408,11 @@
 **    --utf16          Ignoring BOM and file size, force UTF-16 checking
 **
 ** FILENAME is the name of a file to check for textual content in the UTF-8
 ** and/or UTF-16 encodings.
 */
-void looks_like_utf_test_cmd(void){
+void test_looks_like_utf_cmd(void){
   Blob blob;         /* the contents of the specified file */
   int fUtf8 = 0;     /* return value of starts_with_utf8_bom() */
   int fUtf16 = 0;    /* return value of starts_with_utf16_bom() */
   int fUnicode = 0;  /* return value of could_be_utf16() */
   int lookFlags = 0; /* output flags from looks_like_utf8/utf16() */

Index: src/main.c
==================================================================
--- src/main.c
+++ src/main.c
@@ -1265,11 +1265,11 @@
 **
 ** Query parameters:
 **
 **    verbose       Show details
 */
-void test_version_page(void){
+void version_page(void){
   Blob versionInfo;
   int verboseFlag;
 
   login_check_credentials();
   if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
@@ -1873,11 +1873,11 @@
           Th_WebpageNotify(g.zPath, 0);
         }
       }
 #endif
     }
-  }else if( pCmd->xFunc!=page_xfer && db_schema_is_outofdate() ){
+  }else if( pCmd->xFunc!=xfer_page && db_schema_is_outofdate() ){
 #ifdef FOSSIL_ENABLE_JSON
     if(g.json.isJsonMode){
       json_err(FSL_JSON_E_DB_NEEDS_REBUILD,NULL,0);
     }else
 #endif
@@ -2065,11 +2065,11 @@
 ** Most CGI files contain only a "repository:" line.  It is uncommon to
 ** use any other option.
 **
 ** See also: http, server, winsrv
 */
-void cmd_cgi(void){
+void cgi_cmd(void){
   const char *zFile;
   const char *zNotFound = 0;
   char **azRedirect = 0;             /* List of repositories to redirect to */
   int nRedirect = 0;                 /* Number of entries in azRedirect */
   Glob *pFileGlob = 0;               /* Pattern for files */
@@ -2402,11 +2402,11 @@
 **   --usepidkey      Use saved encryption key from parent process.  This is
 **                    only necessary when using SEE on Windows.
 **
 ** See also: cgi, server, winsrv
 */
-void cmd_http(void){
+void http_cmd(void){
   const char *zIpAddr = 0;
   const char *zNotFound;
   const char *zHost;
   const char *zAltBase;
   const char *zFileGlob;
@@ -2525,11 +2525,11 @@
 **
 ** Options:
 **   --th-trace          trace TH1 execution (for debugging purposes)
 **
 */
-void cmd_test_http(void){
+void test_http_cmd(void){
   const char *zIpAddr;    /* IP address of remote client */
 
   Th_InitTraceLog();
   login_set_capabilities("sx", 0);
   g.useLocalauth = 1;
@@ -2671,11 +2671,11 @@
 **   --usepidkey         Use saved encryption key from parent process.  This is
 **                       only necessary when using SEE on Windows.
 **
 ** See also: cgi, http, winsrv
 */
-void cmd_webserver(void){
+void webserver_cmd(void){
   int iPort, mxPort;        /* Range of TCP ports allowed */
   const char *zPort;        /* Value of the --port option */
   const char *zBrowser;     /* Name of web browser program */
   char *zBrowserCmd = 0;    /* Command to launch the web browser */
   int isUiCmd;              /* True if command is "ui", not "server' */

Index: src/manifest.c
==================================================================
--- src/manifest.c
+++ src/manifest.c
@@ -1133,11 +1133,11 @@
 ** Usage: %fossil test-parse-manifest FILENAME ?N?
 **
 ** Parse the manifest(s) given on the command-line and report any
 ** errors.  If the N argument is given, run the parsing N times.
 */
-void manifest_test_parse_cmd(void){
+void test_parse_manifest_cmd(void){
   Manifest *p;
   Blob b;
   int i;
   int n = 1;
   db_find_and_open_repository(0,0);
@@ -1170,11 +1170,11 @@
 ** repositories after making any changes to the manifest_parse()
 ** implementation to confirm that the changes did not break anything.
 **
 ** If the --limit N argument is given, parse no more than N blobs
 */
-void manifest_test_parse_all_blobs_cmd(void){
+void test_parse_all_blobs_cmd(void){
   Manifest *p;
   Blob err;
   Stmt q;
   int nTest = 0;
   int nErr = 0;

Index: src/md5.c
==================================================================
--- src/md5.c
+++ src/md5.c
@@ -442,11 +442,11 @@
 ** Usage: %fossil md5sum FILES....
 **
 ** Compute an MD5 checksum of all files named on the command-line.
 ** If a file is named "-" then content is read from standard input.
 */
-void md5sum_test(void){
+void md5sum_cmd(void){
   int i;
   Blob in;
   Blob cksum;
 
   for(i=2; i<g.argc; i++){

Index: src/name.c
==================================================================
--- src/name.c
+++ src/name.c
@@ -530,11 +530,11 @@
 ** Usage:  %fossil test-name-to-id [--count N] NAME
 **
 ** Convert a NAME to a full artifact ID.  Repeat the conversion N
 ** times (for timing purposes) if the --count option is given.
 */
-void test_name_to_id(void){
+void test_name_to_id_cmd(void){
   int i;
   int n = 0;
   Blob name;
   db_must_be_within_tree();
   for(i=2; i<g.argc; i++){
@@ -1335,11 +1335,11 @@
 **
 ** Usage: %fossil test-unclustered
 **
 ** Show all artifacts in the unclustered table
 */
-void test_unclusterd_cmd(void){
+void test_unclustered_cmd(void){
   db_find_and_open_repository(0,0);
   describe_artifacts_to_stdout("IN unclustered", 0);
 }
 
 /*
@@ -1347,11 +1347,11 @@
 **
 ** Usage: %fossil test-phantoms
 **
 ** Show all phantom artifacts
 */
-void test_phatoms_cmd(void){
+void test_phantoms_cmd(void){
   db_find_and_open_repository(0,0);
   describe_artifacts_to_stdout("IN (SELECT rid FROM blob WHERE size<0)", 0);
 }
 
 /* Maximum number of collision examples to remember */
@@ -1425,11 +1425,11 @@
 /*
 ** WEBPAGE: hash-collisions
 **
 ** Show the number of hash collisions for hash prefixes of various lengths.
 */
-void hash_collisions_webpage(void){
+void hash_collisions_page(void){
   login_check_credentials();
   if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
   style_header("Hash Prefix Collisions");
   style_submenu_element("Activity Reports", "reports");
   style_submenu_element("Stats", "stat");

Index: src/path.c
==================================================================
--- src/path.c
+++ src/path.c
@@ -243,11 +243,11 @@
 ** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
 **
 ** Report the shortest path between two check-ins.  If the --no-merge flag
 ** is used, follow only direct parent-child paths and omit merge links.
 */
-void shortest_path_test_cmd(void){
+void test_shortest_path_cmd(void){
   int iFrom;
   int iTo;
   PathNode *p;
   int n;
   int directOnly;
@@ -349,11 +349,11 @@
 ** Usage: %fossil test-ancestor-path VERSION1 VERSION2
 **
 ** Report the path from VERSION1 to VERSION2 through their most recent
 ** common ancestor.
 */
-void ancestor_path_test_cmd(void){
+void test_ancestor_path_cmd(void){
   int iFrom;
   int iTo;
   int iPivot;
   PathNode *p;
   int n;
@@ -521,11 +521,11 @@
 **
 ** Usage: %fossil test-name-changes [--debug] VERSION1 VERSION2
 **
 ** Show all filename changes that occur going from VERSION1 to VERSION2
 */
-void test_name_change(void){
+void test_name_changes_cmd(void){
   int iFrom;
   int iTo;
   int *aChng;
   int nChng;
   int i;

Index: src/piechart.c
==================================================================
--- src/piechart.c
+++ src/piechart.c
@@ -265,11 +265,11 @@
 /*
 ** WEBPAGE: test-piechart
 **
 ** Generate a pie-chart based on data input from a form.
 */
-void piechart_test_page(void){
+void test_piechart_page(void){
   const char *zData;
   Stmt ins;
   int n = 0;
   int width;
   int height;

Index: src/pivot.c
==================================================================
--- src/pivot.c
+++ src/pivot.c
@@ -161,11 +161,11 @@
 ** Test the pivot_find() procedure.
 **
 ** Options:
 **    --ignore-merges       Ignore merges for discovering name pivots
 */
-void test_find_pivot(void){
+void test_find_pivot_cmd(void){
   int i, rid;
   int ignoreMerges = find_option("ignore-merges",0,0)!=0;
   int showDetails = find_option("details",0,0)!=0;
   if( g.argc<4 ){
     usage("?options? PRIMARY SECONDARY ...");

Index: src/rebuild.c
==================================================================
--- src/rebuild.c
+++ src/rebuild.c
@@ -358,11 +358,11 @@
 }
 
 /*
 ** Core function to rebuild the information in the derived tables of a
 ** fossil repository from the blobs. This function is shared between
-** 'rebuild_database' ('rebuild') and 'reconstruct_cmd'
+** 'rebuild_database_cmd' ('rebuild') and 'reconstruct_cmd'
 ** ('reconstruct'), both of which have to regenerate this information
 ** from scratch.
 **
 ** If the randomize parameter is true, then the BLOBs are deliberately
 ** extracted in a random order.  This feature is used to test the
@@ -604,11 +604,11 @@
 **   --vacuum          Run VACUUM on the database after rebuilding
 **   --wal             Set Write-Ahead-Log journalling mode on the database
 **
 ** See also: deconstruct, reconstruct
 */
-void rebuild_database(void){
+void rebuild_database_cmd(void){
   int forceFlag;
   int randomizeFlag;
   int errCnt = 0;
   int omitVerify;
   int doClustering;
@@ -773,11 +773,11 @@
 ** COMMAND: test-create-clusters
 **
 ** Create clusters for all unclustered artifacts if the number of unclustered
 ** artifacts exceeds the current clustering threshold.
 */
-void test_createcluster_cmd(void){
+void test_create_clusters_cmd(void){
   if( g.argc==3 ){
     db_open_repository(g.argv[2]);
   }else{
     db_find_and_open_repository(0, 0);
     if( g.argc!=2 ){

Index: src/regexp.c
==================================================================
--- src/regexp.c
+++ src/regexp.c
@@ -764,11 +764,11 @@
 **
 ** Options:
 **
 **   -i|--ignore-case    Ignore case
 */
-void re_test_grep(void){
+void test_grep_cmd(void){
   ReCompiled *pRe;
   const char *zErr;
   int ignoreCase = find_option("ignore-case","i",0)!=0;
   if( g.argc<3 ){
     usage("REGEXP [FILE...]");
@@ -817,11 +817,11 @@
 **                                or unreadable files
 **     -v|--invert-match          Invert the sense of matching.  Show only
 **                                files that have no matches. Implies -l
 **     --verbose                  Show each file as it is analyzed
 */
-void re_grep_cmd(void){
+void grep_cmd(void){
   u32 flags = 0;
   int bVerbose = 0;
   ReCompiled *pRe;
   const char *zErr;
   int ignoreCase = 0;

Index: src/repolist.c
==================================================================
--- src/repolist.c
+++ src/repolist.c
@@ -276,11 +276,11 @@
 ** Usage: %fossil test-list-page DIRECTORY
 **
 ** Show all repositories underneath DIRECTORY.  Or if DIRECTORY is "/"
 ** show all repositories in the ~/.fossil file.
 */
-void test_list_page(void){
+void test_list_page_cmd(void){
   if( g.argc<3 ){
     g.zRepositoryName = "/";
   }else{
     g.zRepositoryName = g.argv[2];
   }

Index: src/report.c
==================================================================
--- src/report.c
+++ src/report.c
@@ -32,11 +32,11 @@
 /*
 ** WEBPAGE: reportlist
 **
 ** Main menu for Tickets.
 */
-void view_list(void){
+void reportlist_page(void){
   const char *zScript;
   Blob ril;   /* Report Item List */
   Stmt q;
   int rn = 0;
   int cnt = 0;
@@ -299,11 +299,11 @@
 ** URL: /rptsql?rn=N
 **
 ** Display the SQL query used to generate a ticket report.  The rn=N
 ** query parameter identifies the specific report number to be displayed.
 */
-void view_see_sql(void){
+void rptsql_page(void){
   int rn;
   const char *zTitle;
   const char *zSQL;
   const char *zOwner;
   const char *zClrKey;
@@ -357,11 +357,11 @@
 **     t=TITLE        Title of the report format
 **     w=USER         Owner of the report format
 **     s=SQL          SQL text used to implement the report
 **     k=KEY          Color key
 */
-void view_edit(void){
+void rptedit_page(void){
   int rn;
   const char *zTitle;
   const char *z;
   const char *zOwner;
   const char *zClrKey;

Index: src/rss.c
==================================================================
--- src/rss.c
+++ src/rss.c
@@ -40,11 +40,11 @@
 ** In addition, name=FILENAME filters for a specific file. This may be
 ** combined with one of the other filters (useful for looking at a specific
 ** branch).
 */
 
-void page_timeline_rss(void){
+void timeline_rss_page(void){
   Stmt q;
   int nLine=0;
   char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0;
   Blob bSQL;
   const char *zType = PD("y","all"); /* Type of events.  All if NULL */
@@ -250,11 +250,11 @@
 **
 ** -url STRING
 **   Sets the RSS feed's root URL to the given string. The default is
 ** "URL-PLACEHOLDER" (without quotes).
 */
-void cmd_timeline_rss(void){
+void timeline_rss_cmd(void){
   Stmt q;
   int nLine=0;
   char *zPubDate, *zProjectName, *zProjectDescr, *zFreeProjectName=0;
   Blob bSQL;
   const char *zType = find_option("type","y",1); /* Type of events.  All if NULL */

Index: src/search.c
==================================================================
--- src/search.c
+++ src/search.c
@@ -1459,11 +1459,11 @@
 ** Compute the search text for document TYPE-RID whose name is NAME.
 ** The TYPE is one of "c", "d", "t", "w", or "e".  The RID is the document
 ** ID.  The NAME is used to figure out a mimetype to use for formatting
 ** the raw document text.
 */
-void test_search_stext(void){
+void test_search_stext_cmd(void){
   Blob out;
   db_find_and_open_repository(0,0);
   if( g.argc!=5 ) usage("TYPE RID NAME");
   search_stext(g.argv[2][0], atoi(g.argv[3]), g.argv[4], &out);
   fossil_print("%s\n",blob_str(&out));
@@ -1476,11 +1476,11 @@
 ** Usage: fossil test-convert-stext FILE MIMETYPE
 **
 ** Read the content of FILE and convert it to stext according to MIMETYPE.
 ** Send the result to standard output.
 */
-void test_convert_stext(void){
+void test_convert_stext_cmd(void){
   Blob in, out;
   db_find_and_open_repository(0,0);
   if( g.argc!=4 ) usage("FILENAME MIMETYPE");
   blob_read_from_file(&in, g.argv[2], ExtFILE);
   blob_init(&out, 0, 0);
@@ -1954,11 +1954,11 @@
 /*
 ** WEBPAGE: test-ftsdocs
 **
 ** Show a table of all documents currently in the search index.
 */
-void search_data_page(void){
+void test_ftsdocs_page(void){
   Stmt q;
   const char *zId = P("id");
   const char *zType = P("y");
   const char *zIdxed = P("ixed");
   int id;

Index: src/setup.c
==================================================================
--- src/setup.c
+++ src/setup.c
@@ -311,11 +311,11 @@
 /*
 ** WEBPAGE: setup_access
 **
 ** The access-control settings page.  Requires Setup privileges.
 */
-void setup_access(void){
+void setup_access_page(void){
   static const char *const azRedirectOpts[] = {
     "0", "Off",
     "1", "Login Page Only",
     "2", "All Pages"
   };
@@ -542,11 +542,11 @@
 ** WEBPAGE: setup_login_group
 **
 ** Change how the current repository participates in a login
 ** group.
 */
-void setup_login_group(void){
+void setup_login_group_page(void){
   const char *zGroup;
   char *zErrMsg = 0;
   Blob fullName;
   char *zSelfRepo;
   const char *zRepo = PD("repo", "");
@@ -665,11 +665,11 @@
 ** WEBPAGE: setup_timeline
 **
 ** Edit administrative settings controlling the display of
 ** timelines.
 */
-void setup_timeline(void){
+void setup_timeline_page(void){
   double tmDiff;
   char zTmDiff[20];
   static const char *const azTimeFormats[] = {
       "0", "HH:MM",
       "1", "HH:MM:SS",
@@ -804,11 +804,11 @@
 ** WEBPAGE: setup_settings
 **
 ** Change or view miscellaneous settings.  Part of the
 ** /setup pages requiring Setup privileges.
 */
-void setup_settings(void){
+void setup_settings_page(void){
   int nSetting;
   int i;
   Setting const *pSet;
   const Setting *aSetting = setting_info(&nSetting);
 
@@ -891,11 +891,11 @@
 /*
 ** WEBPAGE: setup_config
 **
 ** The "Admin/Configuration" page.  Requires Setup privilege.
 */
-void setup_config(void){
+void setup_config_page(void){
   login_check_credentials();
   if( !g.perm.Setup ){
     login_needed(0);
     return;
   }
@@ -987,11 +987,11 @@
 /*
 ** WEBPAGE: setup_wiki
 **
 ** The "Admin/Wiki" page.  Requires Setup privilege.
 */
-void setup_wiki(void){
+void setup_wiki_page(void){
   login_check_credentials();
   if( !g.perm.Setup ){
     login_needed(0);
     return;
   }
@@ -1047,11 +1047,11 @@
 /*
 ** WEBPAGE: setup_modreq
 **
 ** Admin page for setting up moderation of tickets and wiki.
 */
-void setup_modreq(void){
+void setup_modreq_page(void){
   login_check_credentials();
   if( !g.perm.Admin ){
     login_needed(0);
     return;
   }
@@ -1095,11 +1095,11 @@
 ** WEBPAGE: setup_adunit
 **
 ** Administrative page for configuring and controlling ad units
 ** and how they are displayed.
 */
-void setup_adunit(void){
+void setup_adunit_page(void){
   login_check_credentials();
   if( !g.perm.Admin ){
     login_needed(0);
     return;
   }
@@ -1171,11 +1171,11 @@
 /*
 ** WEBPAGE: setup_logo
 **
 ** Administrative page for changing the logo image.
 */
-void setup_logo(void){
+void setup_logo_page(void){
   const char *zLogoMtime = db_get_mtime("logo-image", 0, 0);
   const char *zLogoMime = db_get("logo-mimetype","image/gif");
   const char *aLogoImg = P("logoim");
   int szLogoImg = atoi(PD("logoim:bytes","0"));
   const char *zBgMtime = db_get_mtime("background-image", 0, 0);
@@ -1330,11 +1330,11 @@
 ** WEBPAGE: admin_sql
 **
 ** Run raw SQL commands against the database file using the web interface.
 ** Requires Setup privileges.
 */
-void sql_page(void){
+void admin_sql_page(void){
   const char *zQ;
   int go = P("go")!=0;
   login_check_credentials();
   if( !g.perm.Setup ){
     login_needed(0);
@@ -1469,11 +1469,11 @@
 **
 ** Run raw TH1 commands using the web interface.  If Tcl integration was
 ** enabled at compile-time and the "tcl" setting is enabled, Tcl commands
 ** may be run as well.  Requires Admin privilege.
 */
-void th1_page(void){
+void admin_th1_page(void){
   const char *zQ = P("q");
   int go = P("go")!=0;
   login_check_credentials();
   if( !g.perm.Setup ){
     login_needed(0);
@@ -1512,11 +1512,11 @@
 **
 ** Shows the contents of the admin_log table, which is only created if
 ** the admin-log setting is enabled. Requires Admin or Setup ('a' or
 ** 's') permissions.
 */
-void page_admin_log(){
+void admin_log_page(){
   Stmt stLog;
   int limit;                 /* How many entries to show */
   int ofst;                  /* Offset to the first entry */
   int fLogEnabled;
   int counter = 0;
@@ -1577,11 +1577,11 @@
 /*
 ** WEBPAGE: srchsetup
 **
 ** Configure the search engine.  Requires Admin privilege.
 */
-void page_srchsetup(){
+void srchsetup_page(){
   login_check_credentials();
   if( !g.perm.Admin ){
     login_needed(0);
     return;
   }
@@ -1699,11 +1699,11 @@
 /*
 ** WEBPAGE: waliassetup
 **
 ** Configure the URL aliases
 */
-void page_waliassetup(){
+void waliassetup_page(){
   Stmt q;
   int cnt = 0;
   Blob namelist;
   login_check_credentials();
   if( !g.perm.Admin ){

Index: src/setupuser.c
==================================================================
--- src/setupuser.c
+++ src/setupuser.c
@@ -31,11 +31,11 @@
 **
 ** Query parameters:
 **
 **   with=CAP         Only show users that have one or more capabilities in CAP.
 */
-void setup_ulist(void){
+void setup_ulist_page(void){
   Stmt s;
   double rNow;
   const char *zWith = P("with");
   int bUnusedOnly = P("unused")!=0;
 
@@ -190,11 +190,11 @@
 **
 ** A documentation page showing notes about user configuration.  This
 ** information used to be a side-bar on the user list page, but has been
 ** factored out for improved presentation.
 */
-void setup_ulist_notes(void){
+void setup_ulist_notes_page(void){
   style_header("User Configuration Notes");
   @ <h1>User Configuration Notes:</h1>
   @ <ol>
   @ <li><p>
   @ Every user, logged in or not, inherits the privileges of
@@ -235,11 +235,11 @@
 ** WEBPAGE: setup_ucap_list
 **
 ** A documentation page showing the meaning of the various user capabilities
 ** code letters.
 */
-void setup_ucap_list(void){
+void setup_ucap_list_page(void){
   style_header("User Capability Codes");
   @ <h1>All capabilities</h1>
   capabilities_table(CAPCLASS_ALL);
   @ <h1>Capabilities associated with checked-in content</h1>
   capabilities_table(CAPCLASS_CODE);
@@ -276,11 +276,11 @@
 ** WEBPAGE: setup_uedit
 **
 ** Edit information about a user or create a new user.
 ** Requires Admin privileges.
 */
-void user_edit(void){
+void setup_uedit_page(void){
   const char *zId, *zLogin, *zInfo, *zCap, *zPw;
   const char *zGroup;
   const char *zOldLogin;
   int uid, i;
   char *zDeleteVerify = 0;   /* Delete user verification text */

Index: src/sha1.c
==================================================================
--- src/sha1.c
+++ src/sha1.c
@@ -508,11 +508,11 @@
 **    -h, --dereference     If FILE is a symbolic link, compute the hash
 **                          on the object that the link points to.  Normally,
 **                          the hash is over the name of the object that
 **                          the link points to.
 */
-void sha1sum_test(void){
+void sha1sum_cmd(void){
   int i;
   Blob in;
   Blob cksum;
   int eFType = SymFILE;
   if( find_option("dereference","h",0)!=0 ){

Index: src/sha3.c
==================================================================
--- src/sha3.c
+++ src/sha3.c
@@ -638,11 +638,11 @@
 **    --size N            An N-bit hash.  N must be a multiple of 32 between
 **                        128 and 512.
 **    -h, --dereference   If FILE is a symbolic link, compute the hash on
 **                        the object pointed to, not on the link itself.
 */
-void sha3sum_test(void){
+void sha3sum_cmd(void){
   int i;
   Blob in;
   Blob cksum;
   int iSize = 256;
   int eFType = SymFILE;

Index: src/skins.c
==================================================================
--- src/skins.c
+++ src/skins.c
@@ -448,11 +448,11 @@
 /*
 ** WEBPAGE: setup_skin_admin
 **
 ** Administrative actions on skins.  For administrators only.
 */
-void setup_skin_admin(void){
+void setup_skin_admin_page(void){
   const char *z;
   char *zName;
   char *zErr = 0;
   const char *zCurrent = 0;  /* Current skin */
   int i;                     /* Loop counter */
@@ -698,11 +698,11 @@
 ** Requires Admin or Setup privileges.
 **
 **    w=NUM     -- 0=CSS, 1=footer, 2=header, 3=details, 4=js
 **    sk=NUM    -- the draft skin number
 */
-void setup_skinedit(void){
+void setup_skinedit_page(void){
   static const struct sSkinAddr {
     const char *zFile;
     const char *zTitle;
     const char *zSubmenu;
   } aSkinAttr[] = {
@@ -874,11 +874,11 @@
 /*
 ** WEBPAGE: setup_skin
 **
 ** Generate a page showing the steps needed to customize a skin.
 */
-void setup_skin(void){
+void setup_skin_page(void){
   int i;          /* Loop counter */
   int iSkin;      /* Which draft skin is being edited */
   int isSetup;    /* True for an administrator */
   int isEditor;   /* Others authorized to make edits */
   char *zAllowedEditors;   /* Who may edit the draft skin */

Index: src/smtp.c
==================================================================
--- src/smtp.c
+++ src/smtp.c
@@ -133,11 +133,11 @@
 ** Usage: %fossil test-find-mx DOMAIN ...
 **
 ** Do a DNS MX lookup to find the hostname for sending email for
 ** DOMAIN.
 */
-void test_find_mx(void){
+void test_find_mx_cmd(void){
   int i;
   if( g.argc<=2 ){
     usage("DOMAIN ...");
   }
   for(i=2; i<g.argc; i++){
@@ -427,11 +427,11 @@
 ** Options:
 **
 **    --direct              Use DOMAIN directly without going through MX
 **    --port N              Talk on TCP port N
 */
-void test_smtp_probe(void){
+void test_smtp_probe_cmd(void){
   SmtpSession *p;
   const char *zDomain;
   const char *zSelf;
   const char *zPort;
   int iPort = 25;
@@ -507,11 +507,11 @@
 **
 ** Read content from FILE, then send it to stdout encoded as if sent
 ** to the DATA portion of an SMTP session.  This command is used to
 ** test the encoding logic.
 */
-void test_smtp_senddata(void){
+void test_smtp_senddata_cmd(void){
   Blob f;
   if( g.argc!=3 ) usage("FILE");
   blob_read_from_file(&f, g.argv[2], ExtFILE);
   smtp_send_email_body(blob_str(&f), smtp_test_sender, 0);
   blob_reset(&f);
@@ -602,11 +602,11 @@
 **      --direct              Go directly to the TO domain.  Bypass MX lookup
 **      --relayhost R         Use R as relay host directly for delivery.
 **      --port N              Use TCP port N instead of 25
 **      --trace               Show the SMTP conversation on the console
 */
-void test_smtp_send(void){
+void test_smtp_send_cmd(void){
   SmtpSession *p;
   const char *zFrom;
   int nTo;
   const char *zToDomain;
   const char *zFromDomain;
@@ -761,11 +761,11 @@
 **
 ** Administrative page for configuring and controlling inbound email and
 ** output email queuing.  This page is available to administrators
 ** only via the /Admin/EmailServer menu.
 */
-void setup_smtp(void){
+void setup_smtp_page(void){
   Stmt q;
   login_check_credentials();
   if( !g.perm.Setup ){
     login_needed(0);
     return;
@@ -822,11 +822,11 @@
 **    oaddr=ADDR          The original email address prior to editing.
 **                        Omit to add a new address.
 **
 **    epolicy=TXT         The routing policy.
 */
-void setup_smtp_route(void){
+void setup_smtp_route_page(void){
   char *zEAddr = PT("eaddr");         /* new email address */
   char *zEPolicy = PT("epolicy");     /* new routing policy */
   char *zOAddr = PT("oaddr");         /* original email address */
   char *zErr = 0;
   int iErr = 0;
@@ -1258,11 +1258,11 @@
 ** Use the --repair command to fix up the enref field.  The --full option
 ** gives a full report showing the enref value on all entries in the
 ** emailblob table.  If the --clean flags is used together with --repair,
 ** then emailblob table entires with enref==0 are removed.
 */
-void test_refcheck_emailblob(void){
+void test_emailblob_refcheck_cmd(void){
   int doRepair;
   int fullReport;
   int doClean;
   Blob sql;
   Stmt q;
@@ -1336,11 +1336,11 @@
 **
 **      --ipaddr ADDR     The SMTP connection originates at ADDR.  Or if ADDR
 **                        is the name of an environment variable, the address
 **                        is taken from that environment variable.
 */
-void smtp_server(void){
+void smtp_server_cmd(void){
   char *zDbName;
   const char *zDomain;
   SmtpServer x;
   char z[5000];
 
@@ -1482,11 +1482,11 @@
 **   --logdir  DIR        Each pop3d session creates a new logfile
 **                        in the directory DIR and records a transcript
 **                        of the session there.  The logfile is opened
 **                        before entering the chroot jail.
 */
-void pop3d_command(void){
+void pop3d_cmd(void){
   char *zDbName;
   char *zA1, *zA2, *zCmd, *z;
   int inAuth = 1;
   int i;
   FILE *pLog = 0;

Index: src/sqlcmd.c
==================================================================
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -315,11 +315,11 @@
 **                              standard SQLite.
 **
 **    symbolic_name_to_rid(X)   Return the BLOB.RID corresponding to symbolic
 **                              name X.
 */
-void cmd_sqlite3(void){
+void sqlite3_cmd(void){
   int noRepository;
   char *zConfigDb;
   extern int sqlite3_shell(int, char**);
 #ifdef FOSSIL_ENABLE_TH1_HOOKS
   g.fNoThHook = 1;

Index: src/statrep.c
==================================================================
--- src/statrep.c
+++ src/statrep.c
@@ -735,11 +735,11 @@
 ** view=byweek:
 **
 **   y=YYYY            The year to report (default is the server's
 **                     current year).
 */
-void stats_report_page(){
+void reports_page(){
   const char *zView = P("view");     /* Which view/report to show. */
   int eType = RPT_NONE;              /* Numeric code for view/report to show */
   int i;                             /* Loop counter */
   const char *zUserName;             /* Name of user */
   const char *azView[16];            /* Drop-down menu of view types */

Index: src/style.c
==================================================================
--- src/style.c
+++ src/style.c
@@ -1025,11 +1025,11 @@
 **
 ** Usage: %fossil test-contains-selector FILENAME SELECTOR
 **
 ** Determine if the CSS stylesheet FILENAME contains SELECTOR.
 */
-void contains_selector_cmd(void){
+void test_contains_selector_cmd(void){
   int found;
   char *zSelector;
   Blob css;
   if( g.argc!=4 ) usage("FILENAME SELECTOR");
   blob_read_from_file(&css, g.argv[2], ExtFILE);
@@ -1042,11 +1042,11 @@
 /*
 ** WEBPAGE: script.js
 **
 ** Return the "Javascript" content for the current skin (if there is any)
 */
-void page_script_js(void){
+void script_js_page(void){
   const char *zScript = skin_get("js");
   if( P("test") ){
     /* Render the script as plain-text for testing purposes, if the "test"
     ** query parameter is present */
     cgi_set_content_type("text/plain");
@@ -1062,11 +1062,11 @@
 /*
 ** WEBPAGE: style.css
 **
 ** Return the style sheet.
 */
-void page_style_css(void){
+void style_css_page(void){
   Blob css;
   int i;
   int isInit = 0;
 
   cgi_set_content_type("text/css");
@@ -1115,11 +1115,11 @@
 ** by many Fossil web pages to load built-in javascript files.
 **
 ** If the id= query parameter is present, then Fossil assumes that the
 ** result is immutable and sets a very large cache retention time (1 year).
 */
-void page_builtin_text(void){
+void builtin_page(void){
   Blob out;
   const char *zName = P("name");
   const char *zTxt = 0;
   const char *zId = P("id");
   int nId;
@@ -1181,11 +1181,11 @@
 ** WEBPAGE: test_env
 **
 ** Display CGI-variables and other aspects of the run-time
 ** environment, for debugging and trouble-shooting purposes.
 */
-void page_test_env(void){
+void test_env_page(void){
   webpage_error("");
 }
 
 /*
 ** WEBPAGE: honeypot

Index: src/tag.c
==================================================================
--- src/tag.c
+++ src/tag.c
@@ -250,11 +250,11 @@
 ** Add a tag or anti-tag to the rebuildable tables of the local repository.
 ** No tag artifact is created so the new tag is erased the next
 ** time the repository is rebuilt.  This routine is for testing
 ** use only.
 */
-void testtag_cmd(void){
+void test_tag_cmd(void){
   const char *zTag;
   const char *zValue;
   int rid;
   int tagtype;
   db_must_be_within_tree();
@@ -728,11 +728,11 @@
   db_finalize(&q);
   style_footer();
 }
 
 /*
-** WEBPAGE: /tagtimeline
+** WEBPAGE: tagtimeline
 **
 ** Render a timeline with all check-ins that contain non-propagating
 ** symbolic tags.
 **
 ** Query parameters:

Index: src/th_main.c
==================================================================
--- src/th_main.c
+++ src/th_main.c
@@ -2660,11 +2660,11 @@
 **     --open-config        Open the configuration database
 **     --set-anon-caps      Set anonymous login capabilities
 **     --set-user-caps      Set user login capabilities
 **     --th-trace           Trace TH1 execution (for debugging purposes)
 */
-void test_th_render(void){
+void test_th_render_cmd(void){
   int forceCgi, fullHttpReply;
   Blob in;
   Th_InitTraceLog();
   forceCgi = find_option("cgi", 0, 0)!=0;
   fullHttpReply = find_option("http", 0, 0)!=0;
@@ -2709,11 +2709,11 @@
 **     --open-config        Open the configuration database
 **     --set-anon-caps      Set anonymous login capabilities
 **     --set-user-caps      Set user login capabilities
 **     --th-trace           Trace TH1 execution (for debugging purposes)
 */
-void test_th_eval(void){
+void test_th_eval_cmd(void){
   int rc;
   const char *zRc;
   int forceCgi, fullHttpReply;
   Th_InitTraceLog();
   forceCgi = find_option("cgi", 0, 0)!=0;
@@ -2761,11 +2761,11 @@
 **     --open-config        Open the configuration database
 **     --set-anon-caps      Set anonymous login capabilities
 **     --set-user-caps      Set user login capabilities
 **     --th-trace           Trace TH1 execution (for debugging purposes)
 */
-void test_th_source(void){
+void test_th_source_cmd(void){
   int rc;
   const char *zRc;
   int forceCgi, fullHttpReply;
   Blob in;
   Th_InitTraceLog();
@@ -2835,11 +2835,11 @@
 **
 **     --cgi                Include a CGI response header in the output
 **     --http               Include an HTTP response header in the output
 **     --th-trace           Trace TH1 execution (for debugging purposes)
 */
-void test_th_hook(void){
+void test_th_hook_cmd(void){
   int rc = TH_OK;
   int nResult = 0;
   char *zResult = 0;
   int forceCgi, fullHttpReply;
   Th_InitTraceLog();

Index: src/timeline.c
==================================================================
--- src/timeline.c
+++ src/timeline.c
@@ -168,11 +168,11 @@
 ** Usage: %fossil test-hash-color TAG ...
 **
 ** Print out the color names associated with each tag.  Used for
 ** testing the hash_color() function.
 */
-void test_hash_color(void){
+void test_hash_color_cmd(void){
   int i;
   for(i=2; i<g.argc; i++){
     fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i]));
   }
 }
@@ -181,11 +181,11 @@
 ** WEBPAGE: hash-color-test
 **
 ** Print out the color names associated with each tag.  Used for
 ** testing the hash_color() function.
 */
-void test_hash_color_page(void){
+void hash_color_test_page(void){
   const char *zBr;
   char zNm[10];
   int i, cnt;
   login_check_credentials();
 
@@ -1618,11 +1618,11 @@
 ** If both a= and b= appear then both upper and lower bounds are honored.
 **
 ** CHECKIN or TIMEORTAG can be a check-in hash prefix, or a tag, or the
 ** name of a branch.
 */
-void page_timeline(void){
+void timeline_page(void){
   Stmt q;                            /* Query used to generate the timeline */
   Blob sql;                          /* text of SQL used to generate timeline */
   Blob desc;                         /* Description of the timeline */
   int nEntry;                        /* Max number of entries on timeline */
   int p_rid = name_to_typed_rid(P("p"),"ci");  /* artifact p and its parents */
@@ -3022,11 +3022,11 @@
 **
 ** Display all instances of child check-ins that appear earlier in time
 ** than their parent.  If the -v|--verbose option is provided, both the
 ** parent and child check-ins and their times are shown.
 */
-void test_timewarp_cmd(void){
+void test_timewarp_list_cmd(void){
   Stmt q;
   int verboseFlag;
 
   db_find_and_open_repository(0, 0);
   verboseFlag = find_option("verbose", "v", 0)!=0;
@@ -3060,11 +3060,11 @@
 ** Show all check-ins that are "timewarps".  A timewarp is a
 ** check-in that occurs before its parent, according to the
 ** timestamp information on the check-in.  This can only actually
 ** happen, of course, if a users system clock is set incorrectly.
 */
-void test_timewarp_page(void){
+void timewarps_page(void){
   Stmt q;
   int cnt = 0;
 
   login_check_credentials();
   if( !g.perm.Read || !g.perm.Hyperlink ){

Index: src/tkt.c
==================================================================
--- src/tkt.c
+++ src/tkt.c
@@ -409,11 +409,11 @@
 ** Usage: %fossil test-ticket-rebuild TICKETID|all
 **
 ** Rebuild the TICKET and TICKETCHNG tables for the given ticket ID
 ** or for ALL.
 */
-void test_ticket_rebuild(void){
+void test_ticket_rebuild_cmd(void){
   db_find_and_open_repository(0, 0);
   if( g.argc!=3 ) usage("TICKETID|all");
   if( fossil_strcmp(g.argv[2], "all")==0 ){
     ticket_rebuild();
   }else{
@@ -1474,27 +1474,27 @@
 **
 ** This is intended to be the primary "Ticket" page.  Render as
 ** either ticket-search (if search is enabled) or as the
 ** /reportlist page (if ticket search is disabled).
 */
-void tkt_home_page(void){
+void ticket_page(void){
   login_check_credentials();
   if( search_restrict(SRCH_TKT)!=0 ){
-    tkt_srchpage();
+    tktsrch_page();
   }else{
-    view_list();
+    reportlist_page();
   }
 }
 
 /*
 ** WEBPAGE: tktsrch
 ** Usage:  /tktsrch?s=PATTERN
 **
 ** Full-text search of all current tickets
 */
-void tkt_srchpage(void){
+void tktsrch_page(void){
   login_check_credentials();
   style_header("Ticket Search");
   ticket_standard_submenu(T_ALL_BUT(T_SRCH));
   search_screen(SRCH_TKT, 0);
   style_footer();
 }

Index: src/tktsetup.c
==================================================================
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -774,11 +774,11 @@
 /*
 ** WEBPAGE: tktsetup_reportlist
 ** Administrative page used to view or edit the TH1 script that
 ** defines the "report list" page.
 */
-void tktsetup_reportlist(void){
+void tktsetup_reportlist_page(void){
   static const char zDesc[] =
   @ Enter HTML with embedded TH1 script that will render the "report list" page
   ;
   tktsetup_generic(
     "HTML For Report List",

Index: src/url.c
==================================================================
--- src/url.c
+++ src/url.c
@@ -322,11 +322,11 @@
 ** Usage: %fossil test-urlparser URL ?options?
 **
 **    --remember      Store results in last-sync-url
 **    --prompt-pw     Prompt for password if missing
 */
-void cmd_test_urlparser(void){
+void test_urlparser_cmd(void){
   int i;
   unsigned fg = 0;
   url_proxy_options();
   if( find_option("remember",0,0) ){
     db_must_be_within_tree();

Index: src/user.c
==================================================================
--- src/user.c
+++ src/user.c
@@ -568,11 +568,11 @@
 **
 ** Convert all local password storage to use a SHA1 hash of the password
 ** rather than cleartext.  Passwords that are already stored as the SHA1
 ** has are unchanged.
 */
-void user_hash_passwords_cmd(void){
+void test_hash_passwords_cmd(void){
   if( g.argc!=3 ) usage("REPOSITORY");
   db_open_repository(g.argv[2]);
   sqlite3_create_function(g.db, "shared_secret", 2, SQLITE_UTF8, 0,
                           sha1_shared_secret_sql_function, 0, 0);
   db_multi_exec(

Index: src/util.c
==================================================================
--- src/util.c
+++ src/util.c
@@ -566,11 +566,11 @@
 **
 ** Generate a random password string of approximately N characters in length.
 ** If N is omitted, use 10.  Values of N less than 8 are changed to 8
 ** and greater than 55 and changed to 55.
 */
-void test_random_password(void){
+void test_random_password_cmd(void){
   int N = 10;
   if( g.argc>=3 ){
     N = atoi(g.argv[2]);
   }
   fossil_print("%s\n", fossil_random_password(N));

Index: src/verify.c
==================================================================
--- src/verify.c
+++ src/verify.c
@@ -111,11 +111,11 @@
 /*
 ** COMMAND: test-verify-all
 **
 ** Verify all records in the repository.
 */
-void verify_all_cmd(void){
+void test_verify_all_cmd(void){
   Stmt q;
   int cnt = 0;
   db_must_be_within_tree();
   db_prepare(&q, "SELECT rid FROM blob");
   while( db_step(&q)==SQLITE_ROW ){

Index: src/webmail.c
==================================================================
--- src/webmail.c
+++ src/webmail.c
@@ -306,11 +306,11 @@
 ** Usage: %fossil test-decode-email FILE
 **
 ** Read an rfc-2822 formatted email out of FILE, then write a decoding
 ** to stdout.  Use for testing and validating the email decoder.
 */
-void test_email_decode_cmd(void){
+void test_decode_email_cmd(void){
   Blob email;
   EmailToc *p;
   int i;
   verify_all_options();
   if( g.argc!=3 ) usage("FILE");
@@ -574,11 +574,11 @@
   };
   style_submenu_multichoice("d", sizeof(az)/(2*sizeof(az[0])), az, 0);
 }
 
 /*
-** WEBPAGE:  webmail
+** WEBPAGE: webmail
 **
 ** This page can be used to read content from the EMAILBOX table
 ** that contains email received by the "fossil smtpd" command.
 **
 ** Query parameters:
@@ -762,20 +762,20 @@
   style_footer();
   db_end_transaction(0);
 }
 
 /*
-** WEBPAGE:  emailblob
+** WEBPAGE: emailblob
 **
 ** This page, accessible only to administrators, allows easy viewing of
 ** the emailblob table - the table that contains the text of email messages
 ** both inbound and outbound, and transcripts of SMTP sessions.
 **
 **    id=N          Show the text of emailblob with emailid==N
 **
 */
-void webmail_emailblob_page(void){
+void emailblob_page(void){
   int id = atoi(PD("id","0"));
   Stmt q;
   login_check_credentials();
   if( !g.perm.Setup ){
     login_needed(0);
@@ -858,17 +858,17 @@
   }
   style_footer();
 }
 
 /*
-** WEBPAGE:  emailoutq
+** WEBPAGE: emailoutq
 **
 ** This page, accessible only to administrators, allows easy viewing of
 ** the emailoutq table - the table that contains the email messages
 ** that are queued for transmission via SMTP.
 */
-void webmail_emailoutq_page(void){
+void emailoutq_page(void){
   Stmt q;
   login_check_credentials();
   if( !g.perm.Setup ){
     login_needed(0);
     return;

Index: src/wiki.c
==================================================================
--- src/wiki.c
+++ src/wiki.c
@@ -209,11 +209,11 @@
 /*
 ** WEBPAGE: md_rules
 **
 ** Show a summary of the Markdown wiki formatting rules.
 */
-void markdown_rules_page(void){
+void md_rules_page(void){
   Blob x;
   int fTxt = P("txt")!=0;
   style_header("Markdown Formatting Rules");
   if( fTxt ){
     style_submenu_element("Formatted", "%R/md_rules");
@@ -318,11 +318,11 @@
 
 /*
 ** WEBPAGE: wikihelp
 ** A generic landing page for wiki.
 */
-void wiki_helppage(void){
+void wikihelp_page(void){
   login_check_credentials();
   if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
   style_header("Wiki Help");
   wiki_standard_submenu(W_ALL_BUT(W_HELP));
   @ <h2>Wiki Links</h2>
@@ -356,11 +356,11 @@
 ** WEBPAGE: wikisrch
 ** Usage:  /wikisrch?s=PATTERN
 **
 ** Full-text search of all current wiki text
 */
-void wiki_srchpage(void){
+void wikisrch_page(void){
   login_check_credentials();
   style_header("Wiki Search");
   wiki_standard_submenu(W_HELP|W_LIST|W_SANDBOX);
   search_screen(SRCH_WIKI, 0);
   style_footer();
@@ -499,13 +499,13 @@
   login_check_credentials();
   if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
   zPageName = P("name");
   if( zPageName==0 ){
     if( search_restrict(SRCH_WIKI)!=0 ){
-      wiki_srchpage();
+      wikisrch_page();
     }else{
-      wiki_helppage();
+      wikihelp_page();
     }
     return;
   }
   if( check_name(zPageName) ) return;
   isSandbox = is_sandbox(zPageName);

Index: src/wikiformat.c
==================================================================
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1784,11 +1784,11 @@
 **    --linksonly      Set the WIKI_LINKSONLY flag
 **    --nobadlinks     Set the WIKI_NOBADLINKS flag
 **    --inline         Set the WIKI_INLINE flag
 **    --noblock        Set the WIKI_NOBLOCK flag
 */
-void test_wiki_render(void){
+void test_wiki_render_cmd(void){
   Blob in, out;
   int flags = 0;
   if( find_option("buttons",0,0)!=0 ) flags |= WIKI_BUTTONS;
   if( find_option("htmlonly",0,0)!=0 ) flags |= WIKI_HTMLONLY;
   if( find_option("linksonly",0,0)!=0 ) flags |= WIKI_LINKSONLY;
@@ -1809,11 +1809,11 @@
 **
 ** Usage: %fossil test-markdown-render FILE
 **
 ** Render markdown in FILE as HTML on stdout.
 */
-void test_markdown_render(void){
+void test_markdown_render_cmd(void){
   Blob in, out;
   db_find_and_open_repository(OPEN_OK_NOT_FOUND|OPEN_SUBSTITUTE,0);
   verify_all_options();
   if( g.argc!=3 ) usage("FILE");
   blob_zero(&out);
@@ -2139,11 +2139,11 @@
 ** COMMAND: test-html-tokenize
 **
 ** Tokenize an HTML file.  Return the offset and length and text of
 ** each token - one token per line.  Omit white-space tokens.
 */
-void test_html_tokenize(void){
+void test_html_tokenize_cmd(void){
   Blob in;
   char *z;
   int i;
   int iOfst, n;
 
@@ -2274,11 +2274,11 @@
 ** COMMAND: test-html-tidy
 **
 ** Run the htmlTidy() routine on the content of all files named on
 ** the command-line and write the results to standard output.
 */
-void test_html_tidy(void){
+void test_html_tidy_cmd(void){
   Blob in, out;
   int i;
 
   for(i=2; i<g.argc; i++){
     blob_read_from_file(&in, g.argv[i], ExtFILE);
@@ -2401,11 +2401,11 @@
 ** output.
 **
 ** This command is intended as a test and debug interface for
 ** the html_to_plaintext() routine.
 */
-void test_html_to_text(void){
+void test_html_to_text_cmd(void){
   Blob in, out;
   int i;
 
   for(i=2; i<g.argc; i++){
     blob_read_from_file(&in, g.argv[i], ExtFILE);

Index: src/winhttp.c
==================================================================
--- src/winhttp.c
+++ src/winhttp.c
@@ -1018,11 +1018,11 @@
 **
 ** NOTE: This command is available on Windows operating systems only and
 **       requires administrative rights on the machine executed.
 **
 */
-void cmd_win32_service(void){
+void win32_service_cmd(void){
   int n;
   const char *zMethod;
   const char *zSvcName = "Fossil-DSCM";    /* Default service name */
 
   if( g.argc<3 ){

Index: src/xfer.c
==================================================================
--- src/xfer.c
+++ src/xfer.c
@@ -1126,11 +1126,11 @@
 **
 ** This is the transfer handler on the server side.  The transfer
 ** message has been uncompressed and placed in the g.cgiIn blob.
 ** Process this message and form an appropriate reply.
 */
-void page_xfer(void){
+void xfer_page(void){
   int isPull = 0;
   int isPush = 0;
   int nErr = 0;
   Xfer xfer;
   int deltaFlag = 0;
@@ -1691,19 +1691,19 @@
 ** server in gdb:
 **
 **     gdb fossil
 **     r test-xfer out.txt
 */
-void cmd_test_xfer(void){
+void test_xfer_cmd(void){
   db_find_and_open_repository(0,0);
   if( g.argc!=2 && g.argc!=3 ){
     usage("?MESSAGEFILE?");
   }
   blob_zero(&g.cgiIn);
   blob_read_from_file(&g.cgiIn, g.argc==2 ? "-" : g.argv[2], ExtFILE);
   disableLogin = 1;
-  page_xfer();
+  xfer_page();
   fossil_print("%s\n", cgi_extract_content());
 }
 
 /*
 ** Format strings for progress reporting.

Index: src/zip.c
==================================================================
--- src/zip.c
+++ src/zip.c
@@ -573,11 +573,11 @@
 ** COMMAND: test-filezip
 **
 ** Generate a ZIP archive specified by the first argument that
 ** contains files given in the second and subsequent arguments.
 */
-void filezip_cmd(void){
+void test_filezip_cmd(void){
   int i;
   Blob zip;
   Blob file;
   int eFType = SymFILE;
   Archive sArchive;
@@ -867,11 +867,11 @@
 **   ex=PATTERN          Omit any file that match PATTERN.  PATTERN is a
 **                       comma-separated list of GLOB patterns, where each
 **                       pattern can optionally be quoted using ".." or '..'.
 **                       Any file matching both ex= and in= is excluded.
 */
-void baseline_zip_page(void){
+void zip_page(void){
   int rid;
   const char *z;
   char *zName, *zRid, *zKey;
   int nName, nRid;
   const char *zInclude;         /* The in= query parameter */