diff --git a/NEWS b/NEWS
index 9336176d..da0cd812 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,8 @@ STILL UNDER DEVELOPMENT; NOT RELEASED YET.
 
 * Issue #15: Fix atf_utils_{fork,wait} to support nested calls.
 
+* Issue #19: Removed stale references to atf-config and atf-run.
+
 
 Changes in version 0.20
 ***********************
diff --git a/atf-c++/detail/process.cpp b/atf-c++/detail/process.cpp
index f7ae6d49..2dc2d53f 100644
--- a/atf-c++/detail/process.cpp
+++ b/atf-c++/detail/process.cpp
@@ -341,11 +341,6 @@ impl::child::stderr_fd(void)
 void
 detail::flush_streams(void)
 {
-    // This is a weird hack to ensure that the output of the parent process
-    // is flushed before executing a child which prevents, for example, the
-    // output of the atf-run hooks to appear before the output of atf-run
-    // itself.
-    //
     // TODO: This should only be executed when inheriting the stdout or
     // stderr file descriptors.  However, the flushing is specific to the
     // iostreams, so we cannot do it from the C library where all the process
diff --git a/atf-c++/tests.cpp b/atf-c++/tests.cpp
index 6e15ef20..a1a5a53b 100644
--- a/atf-c++/tests.cpp
+++ b/atf-c++/tests.cpp
@@ -537,8 +537,8 @@ run_tc(tc_vector& tcs, const std::string& tcarg, const atf::fs::path& resfile)
     if (!atf::env::has("__RUNNING_INSIDE_ATF_RUN") || atf::env::get(
         "__RUNNING_INSIDE_ATF_RUN") != "internal-yes-value")
     {
-        std::cerr << Program_Name << ": WARNING: Running test cases without "
-            "atf-run(1) is unsupported\n";
+        std::cerr << Program_Name << ": WARNING: Running test cases outside "
+            "of kyua(1) is unsupported\n";
         std::cerr << Program_Name << ": WARNING: No isolation nor timeout "
             "control is being applied; you may get unexpected failures; see "
             "atf-test-case(4)\n";
diff --git a/atf-c/detail/tp_main.c b/atf-c/detail/tp_main.c
index a62ae0ad..ecf4d6fb 100644
--- a/atf-c/detail/tp_main.c
+++ b/atf-c/detail/tp_main.c
@@ -499,7 +499,7 @@ run_tc(const atf_tp_t *tp, struct params *p, int *exitcode)
     if (!atf_env_has("__RUNNING_INSIDE_ATF_RUN") || strcmp(atf_env_get(
         "__RUNNING_INSIDE_ATF_RUN"), "internal-yes-value") != 0)
     {
-        print_warning("Running test cases without atf-run(1) is unsupported");
+        print_warning("Running test cases outside of kyua(1) is unsupported");
         print_warning("No isolation nor timeout control is being applied; you "
                       "may get unexpected failures; see atf-test-case(4)");
     }
diff --git a/atf-sh/libatf-sh.subr b/atf-sh/libatf-sh.subr
index da95ab70..f7790f13 100644
--- a/atf-sh/libatf-sh.subr
+++ b/atf-sh/libatf-sh.subr
@@ -596,7 +596,7 @@ _atf_run_tc()
     _atf_has_tc "${_tcname}" || _atf_syntax_error "Unknown test case \`${1}'"
 
     if [ "${__RUNNING_INSIDE_ATF_RUN}" != "internal-yes-value" ]; then
-        _atf_warning "Running test cases without atf-run(1) is unsupported"
+        _atf_warning "Running test cases outside of kyua(1) is unsupported"
         _atf_warning "No isolation nor timeout control is being applied;" \
             "you may get unexpected failures; see atf-test-case(4)"
     fi
@@ -742,10 +742,6 @@ main()
     done
     shift `expr ${OPTIND} - 1`
 
-    # First of all, make sure that the source directory is correct.  It
-    # doesn't matter if the user did not change it, because the default
-    # value may not work.  (TODO: It possibly should, even though it is
-    # not a big deal because atf-run deals with this.)
     case ${Source_Dir} in
         /*)
             ;;
diff --git a/m4/runtime-tool.m4 b/m4/runtime-tool.m4
index 85e2008f..0200083a 100644
--- a/m4/runtime-tool.m4
+++ b/m4/runtime-tool.m4
@@ -34,8 +34,8 @@ dnl -----------------------------------------------------------------------
 dnl
 dnl ATF_RUNTIME_TOOL(varname, description, default)
 dnl
-dnl Provides a configuration-time environment variable to select a tool
-dnl that will be later available through atf-config(1).
+dnl Provides a configure-time configuration variable.  The value provided
+dnl here can later be overriden at run-time via the environment.
 dnl
 AC_DEFUN([ATF_RUNTIME_TOOL],[
     AC_ARG_VAR([$1], [$2])
diff --git a/test-programs/result_test.sh b/test-programs/result_test.sh
index 2264e7bd..a5fb32c8 100644
--- a/test-programs/result_test.sh
+++ b/test-programs/result_test.sh
@@ -27,19 +27,19 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-atf_test_case atf_run_warnings
-atf_run_warnings_head()
+atf_test_case runtime_warnings
+runtime_warnings_head()
 {
     # The fact that this test case is in this test program is an abuse.
     atf_set "descr" "Tests that the test case prints a warning because" \
-                    "it is not being run by atf-run"
+                    "it is being run outside of a runtime engine"
 }
-atf_run_warnings_body()
+runtime_warnings_body()
 {
     unset __RUNNING_INSIDE_ATF_RUN
     srcdir="$(atf_get_srcdir)"
     for h in $(get_helpers); do
-        atf_check -s eq:0 -o match:"passed" -e match:"WARNING.*atf-run" \
+        atf_check -s eq:0 -o match:"passed" -e match:"WARNING.*kyua" \
             "${h}" -s "${srcdir}" result_pass
     done
 }
@@ -129,7 +129,7 @@ result_exception_body()
 
 atf_init_test_cases()
 {
-    atf_add_test_case atf_run_warnings
+    atf_add_test_case runtime_warnings
     atf_add_test_case result_on_stdout
     atf_add_test_case result_to_file
     atf_add_test_case result_to_file_fail