diff --git a/scripts/daemon/launch_daemon.php b/scripts/daemon/launch_daemon.php
index 44e70f710d..5243243426 100755
--- a/scripts/daemon/launch_daemon.php
+++ b/scripts/daemon/launch_daemon.php
@@ -1,10 +1,6 @@
 #!/usr/bin/env php
 <?php
 
-// NOTE: This is substantially the same as the libphutil/ "launch_daemon.php"
-// script, except it loads the Phabricator environment and adds some Phabricator
-// specific flags.
-
 if (function_exists('pcntl_async_signals')) {
   pcntl_async_signals(true);
 } else {
diff --git a/src/docs/contributor/adding_new_classes.diviner b/src/docs/contributor/adding_new_classes.diviner
index 83a19c10fb..c62f9a41b4 100644
--- a/src/docs/contributor/adding_new_classes.diviner
+++ b/src/docs/contributor/adding_new_classes.diviner
@@ -112,7 +112,7 @@ No library currently exists at that path...
 The directory '/some/path/libcustom/src' does not exist.
 
   Do you want to create it? [y/N] y
-Creating new libphutil library in '/some/path/libcustom/src'.
+Creating new library in '/some/path/libcustom/src'.
 Choose a name for the new library.
 
   What do you want to name this library?
@@ -138,7 +138,7 @@ This will write three files:
     any time. If you check your library into version control, you can add this
     file to ignore rules (like `.gitignore`).
   - `src/__phutil_library_init__.php` This records the name of the library and
-    tells libphutil that a library exists here.
+    tells Arcanist that a library exists here.
   - `src/__phutil_library_map__.php` This is a map of all the symbols
     (functions and classes) in the library, which allows them to be autoloaded
     at runtime and dependencies to be statically managed by `arc liberate`.
diff --git a/src/docs/contributor/unit_tests.diviner b/src/docs/contributor/unit_tests.diviner
index 35cee09566..2ebecf96ae 100644
--- a/src/docs/contributor/unit_tests.diviner
+++ b/src/docs/contributor/unit_tests.diviner
@@ -7,7 +7,7 @@ Simple guide to Arcanist and Phorge unit tests.
 
 Arcanist and Phorge provide and use a simple unit test framework. This
 document is aimed at project contributors and describes how to use it to add
-and run tests in these projects or other libphutil libraries.
+and run tests in these projects or other custom libraries.
 
 In the general case, you can integrate `arc` with a custom unit test engine
 (like PHPUnit or any other unit testing library) to run tests in other projects.
diff --git a/src/docs/flavor/php_pitfalls.diviner b/src/docs/flavor/php_pitfalls.diviner
index 422ad02413..85f96d64a7 100644
--- a/src/docs/flavor/php_pitfalls.diviner
+++ b/src/docs/flavor/php_pitfalls.diviner
@@ -18,7 +18,7 @@ If you merge a list of arrays like this:
 intermediate arrays and copies every element it has previously seen each time
 you iterate.
 
-In a libphutil environment, you can use @{function@arcanist:array_mergev}
+In an Arcanist environment, you can use @{function@arcanist:array_mergev}
 instead.
 
 = `var_export()` Hates Baby Animals =
@@ -193,7 +193,7 @@ keys that are naturally sortable with a function that uses native comparison
 (e.g., `sort()`, `asort()`, `ksort()`, or `natcasesort()`). Sort this array
 instead, and use it to reorder the original array.
 
-In a libphutil environment, you can often do this easily with
+In an Arcanist environment, you can often do this easily with
 @{function@arcanist:isort} or @{function@arcanist:msort}.
 
 = `array_intersect()` and `array_diff()` are Also Slow =
@@ -316,7 +316,7 @@ new $class_name($argv[0], $argv[1], ...);
 ```
 
 ...you'll probably invent a very interesting, very novel solution that is very
-wrong. In a libphutil environment, solve this problem with
+wrong. In an Arcanist environment, solve this problem with
 @{function@arcanist:newv}. Elsewhere, copy `newv()`'s implementation.
 
 = Equality is not Transitive =
diff --git a/src/docs/user/userguide/arcanist.diviner b/src/docs/user/userguide/arcanist.diviner
index fab1de5e37..46f8242e4b 100644
--- a/src/docs/user/userguide/arcanist.diviner
+++ b/src/docs/user/userguide/arcanist.diviner
@@ -64,7 +64,7 @@ Arcanist integrates with other tools:
 Arcanist has some advanced features as well, you can:
 
   - execute Conduit method calls with `arc call-conduit`
-  - create or update libphutil libraries with `arc liberate`
+  - create or update libraries with `arc liberate`
   - activate tab completion with `arc shell-complete`
   - ...or extend Arcanist and add new commands.
 
diff --git a/src/docs/user/userguide/arcanist_lint_unit.diviner b/src/docs/user/userguide/arcanist_lint_unit.diviner
index dc7f336fef..a4198c2976 100644
--- a/src/docs/user/userguide/arcanist_lint_unit.diviner
+++ b/src/docs/user/userguide/arcanist_lint_unit.diviner
@@ -34,7 +34,7 @@ make this work, you need to do three things:
   - add the class name to your `.arcconfig` as the **lint.engine**,
     **unit.engine**, or **arcanist_configuration**.
 
-= Create a libphutil Library =
+= Create a Library =
 
 If you haven't created a library for the class to live in yet, you need to do
 that first. Follow the instructions in
diff --git a/src/docs/user/userguide/arcanist_new_project.diviner b/src/docs/user/userguide/arcanist_new_project.diviner
index 86e57c0c86..5ad3047381 100644
--- a/src/docs/user/userguide/arcanist_new_project.diviner
+++ b/src/docs/user/userguide/arcanist_new_project.diviner
@@ -48,7 +48,7 @@ Other options include:
   - **load**: list of additional Phutil libraries to load at startup.
     See below for details about path resolution, or see
     @{article@contrib:Adding New Classes} for a general introduction to
-    libphutil libraries.
+    libraries.
   - **https.cabundle**: specifies the path to an alternate certificate bundle
     for use when making HTTPS connections.
   - **lint.engine**: the name of a subclass of
diff --git a/src/docs/user/userguide/events.diviner b/src/docs/user/userguide/events.diviner
index fcdc6d3a23..b2bb5c7eeb 100644
--- a/src/docs/user/userguide/events.diviner
+++ b/src/docs/user/userguide/events.diviner
@@ -24,7 +24,7 @@ the most direct and powerful way to respond to events.
 To install event listeners in Phorge, follow these steps:
 
   - Write a listener class which extends @{class@arcanist:PhutilEventListener}.
-  - Add it to a libphutil library, or create a new library (for instructions,
+  - Add it to a library, or create a new library (for instructions,
     see @{article@contrib:Adding New Classes}.
   - Configure Phorge to load the library by adding it to `load-libraries`
     in the Phorge config.
@@ -41,7 +41,7 @@ see any events the page emitted there. For details on DarkConsole, see
 To install event listeners in Arcanist, follow these steps:
 
   - Write a listener class which extends @{class@arcanist:PhutilEventListener}.
-  - Add it to a libphutil library, or create a new library (for instructions,
+  - Add it to a library, or create a new library (for instructions,
     see @{article@contrib:Adding New Classes}.
   - Configure Phorge to load the library by adding it to `load`
     in the Arcanist config (e.g., `.arcconfig`, or user/global config).
@@ -185,8 +185,8 @@ NOTE: This event is unstable and subject to change.
 If you're having problems with your listener, try these steps:
 
   - If you're getting an error about Phorge being unable to find the
-    listener class, make sure you've added it to a libphutil library and
-    configured Phorge to load the library with `load-libraries`.
+    listener class, make sure you've added it to a library and configured
+    Phorge to load the library with `load-libraries`.
   - Make sure the listener is registered. It should appear in the "Events" tab
     of DarkConsole. If it's not there, you may have forgotten to add it to
     `events.listeners`.
diff --git a/src/infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php b/src/infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php
index d44d9be008..72129dd685 100644
--- a/src/infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php
+++ b/src/infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php
@@ -49,7 +49,7 @@ final class PhabricatorInternationalizationManagementExtractWorkflow
       if (!$libraries) {
         throw new PhutilArgumentUsageException(
           pht(
-            'Path "%s" contains no libphutil libraries.',
+            'Path "%s" contains no libraries.',
             $path));
       }