Merge branch 'wt/rename' into api-hardening

# Conflicts:
#	README.md

1 files changed, 13 insertions, 13 deletions

diff --git a/tests/header_test.sh b/tests/header_test.sh
index 9fd1041..299a950 100644
--- a/tests/header_test.sh
+++ b/tests/header_test.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# A host includes <term/term.h> and nothing else. The package puts only the
-# parent of term/ on the include path. The headers compile alone as strict
+# A host includes <wsap_vtcore/wsap_vtcore.h> and nothing else. The package puts only the
+# parent of wsap_vtcore/ on the include path. The headers compile alone as strict
 # C11 and as C++.
 set -euo pipefail
 cd "${1:-$(dirname "$0")/..}"
@@ -22,18 +22,18 @@ check() {
     fi
 }
 
-check term.h <<'EOF'
-#include <term/term.h>
+check wsap_vtcore.h <<'EOF'
+#include <wsap_vtcore/wsap_vtcore.h>
 EOF
 
 # Apple headers define wide before a host includes the Unicode API.
 check "unicode/width.h: conflicts with host types" <<'EOF'
 typedef struct wide { int value; } wide;
-#include <term/unicode/width.h>
+#include <wsap_vtcore/unicode/width.h>
 EOF
 
-# A host that uses the names the Unicode API had before the term_ and
-# TERM_ prefixes. The API must not clash with them in either order.
+# A host that uses the names the Unicode API had before the wsap_vtcore_ and
+# WSAP_VTCORE_ prefixes. The API must not clash with them in either order.
 check "unicode API: host names declared first" <<'EOF'
 int unicode_width(int);
 static int in_ranges;
@@ -45,9 +45,9 @@ struct unicode_range { int lo; };
 #define IN_TABLE 1
 #define UNICODE_DATA_VERSION "host"
 #define UTF_8_H
-#include <term/unicode/utf8.h>
-#include <term/unicode/width.h>
-#include <term/unicode/grapheme.h>
+#include <wsap_vtcore/unicode/utf8.h>
+#include <wsap_vtcore/unicode/width.h>
+#include <wsap_vtcore/unicode/grapheme.h>
 int host_use(void)
 {
     return in_ranges + zero_width + utf8d + unicode_width(1) + UTF8_ACCEPT + GRAPHEME_MAX_LEN;
@@ -55,9 +55,9 @@ int host_use(void)
 EOF
 
 check "unicode API: host names declared after" <<'EOF'
-#include <term/unicode/utf8.h>
-#include <term/unicode/width.h>
-#include <term/unicode/grapheme.h>
+#include <wsap_vtcore/unicode/utf8.h>
+#include <wsap_vtcore/unicode/width.h>
+#include <wsap_vtcore/unicode/grapheme.h>
 int unicode_width(int);
 static int in_ranges;
 #define UTF8_ACCEPT 7