diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h
index b4f16b7ea..4853a664f 100644
--- a/Source/CTest/cmCTestBuildCommand.h
+++ b/Source/CTest/cmCTestBuildCommand.h
@@ -47,7 +47,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_BUILD";}
+  virtual const char* GetName() { return "ctest_build";}
 
   /**
    * Succinct documentation.
@@ -63,7 +63,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_BUILD([BUILD build_dir] [RETURN_VALUE res])\n"
+      "  ctest_build([BUILD build_dir] [RETURN_VALUE res])\n"
       "Builds the given build directory and stores results in Build.xml.";
     }
 
diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h
index f5282d90e..96880327a 100644
--- a/Source/CTest/cmCTestConfigureCommand.h
+++ b/Source/CTest/cmCTestConfigureCommand.h
@@ -44,7 +44,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_CONFIGURE";}
+  virtual const char* GetName() { return "ctest_configure";}
 
   /**
    * Succinct documentation.
@@ -60,7 +60,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_CONFIGURE(BUILD build_dir RETURN_VALUE res)\n"
+      "  ctest_configure(BUILD build_dir RETURN_VALUE res)\n"
       "Configures the given build directory and stores results in "
       "Configure.xml. The second argument is a variable that will hold "
       "return value.";
diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h
index 7007b1856..e9ae4265c 100644
--- a/Source/CTest/cmCTestCoverageCommand.h
+++ b/Source/CTest/cmCTestCoverageCommand.h
@@ -44,7 +44,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_COVERAGE";}
+  virtual const char* GetName() { return "ctest_coverage";}
 
   /**
    * Succinct documentation.
@@ -60,7 +60,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_COVERAGE([BUILD build_dir] [RETURN_VALUE res])\n"
+      "  ctest_coverage([BUILD build_dir] [RETURN_VALUE res])\n"
       "Perform the coverage of the given build directory and stores results "
       "in Coverage.xml. The second argument is a variable that will hold "
       "value.";
diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
index 0586bb044..2c737a7aa 100644
--- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
+++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
@@ -53,7 +53,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_EMPTY_BINARY_DIRECTORY";}
+  virtual const char* GetName() { return "ctest_empty_binary_directory";}
 
   /**
    * Succinct documentation.
@@ -69,7 +69,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_EMPTY_BINARY_DIRECTORY( directory )\n"
+      "  ctest_empty_binary_directory( directory )\n"
       "Removes a binary directory. This command will perform some checks "
       "prior to deleting the directory in an attempt to avoid malicious "
       "or accidental directory deletion.";
diff --git a/Source/CTest/cmCTestMemCheckCommand.h b/Source/CTest/cmCTestMemCheckCommand.h
index 94e6916c7..b55bbf1ed 100644
--- a/Source/CTest/cmCTestMemCheckCommand.h
+++ b/Source/CTest/cmCTestMemCheckCommand.h
@@ -46,7 +46,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_MEMCHECK";}
+  virtual const char* GetName() { return "ctest_memcheck";}
 
   /**
    * Succinct documentation.
@@ -62,7 +62,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_MEMCHECK([BUILD build_dir] [RETURN_VALUE res])\n"
+      "  ctest_memcheck([BUILD build_dir] [RETURN_VALUE res])\n"
       "Performs a memory checking of tests in the given build directory and "
       "stores results in MemCheck.xml. The second argument is a variable "
       "that will hold value.";
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h
index dd23d4101..71b5c4ef9 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.h
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.h
@@ -51,7 +51,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_READ_CUSTOM_FILES";}
+  virtual const char* GetName() { return "ctest_read_custom_files";}
 
   /**
    * Succinct documentation.
@@ -67,7 +67,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_READ_CUSTOM_FILES( directory ... )\n"
+      "  ctest_read_custom_files( directory ... )\n"
       "Read all the CTestCustom.ctest or CTestCustom.cmake files from "
       "the given directory.";
     }
diff --git a/Source/CTest/cmCTestRunScriptCommand.h b/Source/CTest/cmCTestRunScriptCommand.h
index 6a26567b5..f0bdb7bc5 100644
--- a/Source/CTest/cmCTestRunScriptCommand.h
+++ b/Source/CTest/cmCTestRunScriptCommand.h
@@ -52,7 +52,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_RUN_SCRIPT";}
+  virtual const char* GetName() { return "ctest_run_script";}
 
   /**
    * Succinct documentation.
@@ -68,7 +68,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_RUN_SCRIPT([NEW_PROCESS] script_file_name script_file_name1 \n"
+      "  ctest_run_script([NEW_PROCESS] script_file_name script_file_name1 \n"
       "              script_file_name2 ...)\n"
       "Runs a script or scripts much like if it was run from ctest -S. "
       "If no argument is provided then the current script is run using "
diff --git a/Source/CTest/cmCTestSleepCommand.h b/Source/CTest/cmCTestSleepCommand.h
index dcc102668..90b448259 100644
--- a/Source/CTest/cmCTestSleepCommand.h
+++ b/Source/CTest/cmCTestSleepCommand.h
@@ -52,7 +52,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_SLEEP";}
+  virtual const char* GetName() { return "ctest_sleep";}
 
   /**
    * Succinct documentation.
@@ -68,8 +68,8 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_SLEEP( seconds )\n"
-      "  CTEST_SLEEP( time1 duration time2 )\n"
+      "  ctest_sleep( seconds )\n"
+      "  ctest_sleep( time1 duration time2 )\n"
       "With one argument it will sleep for a given number of seconds. "
       "With three arguments it will wait for time2 - time1 - duration "
       "seconds.";
diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h
index 103a14b09..2aba47354 100644
--- a/Source/CTest/cmCTestStartCommand.h
+++ b/Source/CTest/cmCTestStartCommand.h
@@ -51,7 +51,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_START";}
+  virtual const char* GetName() { return "ctest_start";}
 
   /**
    * Succinct documentation.
@@ -67,7 +67,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_START(Model [TRACK <track>] [source [binary]])\n"
+      "  ctest_start(Model [TRACK <track>] [source [binary]])\n"
       "Starts the testing for a given model. The command should be called "
       "after the binary directory is initialized. If the 'source' and "
       "'binary' directory are not specified, it reads the "
diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h
index 819a1400b..2faebba27 100644
--- a/Source/CTest/cmCTestSubmitCommand.h
+++ b/Source/CTest/cmCTestSubmitCommand.h
@@ -45,7 +45,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_SUBMIT";}
+  virtual const char* GetName() { return "ctest_submit";}
 
   /**
    * Succinct documentation.
@@ -61,7 +61,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_SUBMIT([RETURN_VALUE res])\n"
+      "  ctest_submit([RETURN_VALUE res])\n"
       "Submits the test results for the project.";
     }
 
diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h
index a93b05acd..117013c85 100644
--- a/Source/CTest/cmCTestUpdateCommand.h
+++ b/Source/CTest/cmCTestUpdateCommand.h
@@ -44,7 +44,7 @@ public:
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual const char* GetName() { return "CTEST_UPDATE";}
+  virtual const char* GetName() { return "ctest_update";}
 
   /**
    * Succinct documentation.
@@ -60,7 +60,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  CTEST_UPDATE([SOURCE source] [RETURN_VALUE res])\n"
+      "  ctest_update([SOURCE source] [RETURN_VALUE res])\n"
       "Updates the given source directory and stores results in Update.xml. "
       "The second argument is a variable that will hold the number of files "
       "modified. If there is a problem, the variable will be -1.";