From be884f2c9785c0294dcd31d5da31cd6f62a12b9c Mon Sep 17 00:00:00 2001
From: Soham Banerjee <soham@renderbit.com>
Date: Fri, 23 Oct 2026 15:23:31 +0530
Subject: [PATCH 1/6] Address WordPress.org review: prefixed post type, scoped
 notice, Select2 4.1.0

- Register FAQs as `fqj_faq` (FQJ_POST_TYPE) instead of the generic
  `faq_item`. fqj_migrate_legacy_post_types() renames rows stored under a
  type in FQJ_LEGACY_POST_TYPES once per site, on plugins_loaded priority 5
  and on activation, so the schema upgrade, data migration 3 and the
  activation FAQ check all see the new type. Uninstall deletes both types.
- Show the queue notice only on the plugin's own screens (Guideline 11),
  and make its text translatable.
- Update the bundled Select2 from 4.0.13 to 4.1.0.
- Bump to 3.1.1.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .github/copilot-instructions.md        |   2 +-
 AGENTS.md                              |   2 +-
 CLAUDE.md                              |   6 +-
 README.md                              |   4 +-
 assets/vendor/select2/select2.css      | 771 ++++++++++++--------
 assets/vendor/select2/select2.js       | 926 +++++++++++++++----------
 assets/vendor/select2/select2.min.css  |   2 +-
 assets/vendor/select2/select2.min.js   |   4 +-
 composer.json                          |   2 +-
 composer.lock                          |   4 +-
 faq-jsonld.php                         |  41 +-
 includes/admin.php                     |  20 +-
 includes/coverage.php                  |   4 +-
 includes/frontend.php                  |   2 +-
 includes/health.php                    |   4 +-
 includes/indexer.php                   |   8 +-
 includes/queue.php                     |  16 +-
 includes/settings.php                  |   2 +-
 readme.txt                             |  12 +-
 tests/php/class-fqj-testcase.php       |   2 +-
 tests/php/test-admin.php               |   4 +-
 tests/php/test-ajax.php                |   4 +-
 tests/php/test-frontend.php            |   2 +-
 tests/php/test-health.php              |   4 +-
 tests/php/test-indexer.php             |  10 +-
 tests/php/test-multisite.php           |  20 +
 tests/php/test-plugin.php              |  10 +-
 tests/php/test-post-type-migration.php | 104 +++
 tests/php/test-queue.php               |  38 +
 tests/php/test-settings.php            |   2 +-
 tests/php/test-uninstall.php           |  12 +-
 tests/php/test-url-migration.php       |   2 +-
 uninstall.php                          |   6 +-
 33 files changed, 1313 insertions(+), 739 deletions(-)
 create mode 100644 tests/php/test-post-type-migration.php

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 37c71da..bbe5c74 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -6,7 +6,7 @@ This plugin manages FAQ items as a custom post type (CPT) and injects FAQ JSON-L
 
 ## Architecture & Key Components
 
-- **Custom Post Type:** `faq_item` is registered for FAQ entries.
+- **Custom Post Type:** `fqj_faq` (formerly `faq_item`) is registered for FAQ entries.
 - **Mapping Table:** MySQL table (`fqj_mappings`) links FAQ items to posts, post types, terms, URLs, or global context. See `includes/indexer.php`.
 - **JSON-LD Output:** Injected on the frontend using `includes/frontend.php`, with per-post transient caching for performance.
 - **Cache Invalidation:** Uses a background queue (`includes/queue.php`) processed by WP-Cron or WP-CLI. Queue state and logs are visible in the Health admin page.
diff --git a/AGENTS.md b/AGENTS.md
index 2f922f6..1fcf18e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,6 +1,6 @@
 # AGENTS.md
 
-WordPress plugin `faq-jsonld`: FAQs as a `faq_item` CPT, schema.org `FAQPage` JSON-LD printed on singular posts/pages. Procedural PHP, every function prefixed `fqj_`, no build step, no runtime Composer deps.
+WordPress plugin `faq-jsonld`: FAQs as a `fqj_faq` CPT (`FQJ_POST_TYPE`; renamed from `faq_item` on upgrade), schema.org `FAQPage` JSON-LD printed on singular posts/pages. Procedural PHP, every function prefixed `fqj_`, no build step, no runtime Composer deps.
 
 **PHP ceiling is 7.2 for shipped code** — `composer.json` pins platform 7.4, so syntax up to 7.4 passes locally while CI's `php -l` matrix (7.2–8.4) fails. Write 7.2-compatible syntax in `faq-jsonld.php`, `uninstall.php`, `includes/`.
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 054ea11..59623b6 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -2,7 +2,7 @@
 
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
-WordPress plugin (slug `faq-jsonld`, published on WordPress.org) that manages FAQs as a `faq_item` custom post type and prints schema.org `FAQPage` JSON-LD in `wp_head` on the singular posts/pages each FAQ is mapped to. Procedural PHP, every function prefixed `fqj_`; no build step and no runtime Composer dependencies. Supports WordPress 6.5+ and PHP 7.2+, so don't use syntax newer than PHP 7.2 in shipped code.
+WordPress plugin (slug `faq-jsonld`, published on WordPress.org) that manages FAQs as a `fqj_faq` custom post type (`FQJ_POST_TYPE`) and prints schema.org `FAQPage` JSON-LD in `wp_head` on the singular posts/pages each FAQ is mapped to. Procedural PHP, every function prefixed `fqj_`; no build step and no runtime Composer dependencies. Supports WordPress 6.5+ and PHP 7.2+, so don't use syntax newer than PHP 7.2 in shipped code.
 
 ## Commands
 
@@ -25,7 +25,7 @@ PHPUnit runs against a real MySQL/MariaDB database that the suite **wipes on eve
 
 ## Architecture
 
-`faq-jsonld.php` defines constants, requires every file in `includes/`, registers the CPT, and handles activation/deactivation (looping over all sites via `fqj_for_each_site()` on network activation and setting up new sites on `wp_initialize_site`).
+`faq-jsonld.php` defines constants, requires every file in `includes/`, registers the CPT (renaming FAQs stored under a post type in `FQJ_LEGACY_POST_TYPES` once per site, on `plugins_loaded` priority 5 and on activation, before the schema upgrade and data migration), and handles activation/deactivation (looping over all sites via `fqj_for_each_site()` on network activation and setting up new sites on `wp_initialize_site`).
 
 Data flow:
 
@@ -42,7 +42,7 @@ Schema and data versioning (constants in `faq-jsonld.php`):
 - `FQJ_DB_VERSION`: bump whenever the `CREATE TABLE` SQL in `fqj_create_table()` changes. `fqj_maybe_upgrade_db()` reruns `dbDelta` on `plugins_loaded`. dbDelta needs a strict format (no `IF NOT EXISTS`, two spaces after `PRIMARY KEY`, `KEY` not `INDEX`, no inline comments).
 - `FQJ_DATA_VERSION`: bump to force a one-time reindex of every FAQ plus a cache purge on existing sites. `fqj_run_data_migration()` processes FAQs in batches through a cron event, keeping its place in a cursor option. Version 3 (`fqj_migrate_url_associations()`) reads each FAQ's old `post` rows before reindexing and rewrites URL associations that only matched through them, recording each change in the non-autoloaded `fqj_url_migration_report` option shown on the FAQ list screen until dismissed.
 
-`uninstall.php` removes options, transients, cron events, post meta and both tables on every site. `faq_item` posts are kept unless the `fqj_uninstall_delete_faqs` filter returns true.
+`uninstall.php` removes options, transients, cron events, post meta and both tables on every site. FAQ posts (`fqj_faq`, plus any left under the legacy `faq_item`) are kept unless the `fqj_uninstall_delete_faqs` filter returns true.
 
 Admin JS (`assets/js/fqj-admin.js`, `fqj-health.js`) uses jQuery and a bundled Select2 (`assets/vendor/select2`, not a CDN). It talks to `wp_ajax_fqj_*` handlers protected by the `fqj_admin_nonce` nonce, and gets its strings through `wp_localize_script`.
 
diff --git a/README.md b/README.md
index 660abb9..720cc0d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ A WordPress plugin to manage FAQ items as a custom post type (CPT) and inject FA
 
 ## Features
 
-- **Custom Post Type:** Manage FAQ items via the `faq_item` CPT.
+- **Custom Post Type:** Manage FAQ items via the `fqj_faq` CPT (named `faq_item` before 3.1.1; existing FAQs are renamed on upgrade).
 - **Mapping Table:** Fast MySQL table (`fqj_mappings`) links FAQ items to posts, post types, terms, URLs, or global context.
 - **JSON-LD Output:** Injects FAQ schema on the frontend, with per-post transient caching.
 - **Cache Invalidation:** Background queue (WP-Cron or WP-CLI) for efficient cache purging.
@@ -61,7 +61,7 @@ A WordPress plugin to manage FAQ items as a custom post type (CPT) and inject FA
   - `assets/js/fqj-admin.js`, `assets/js/fqj-health.js`: Admin JS (Select2 is bundled in `assets/vendor/select2`)
 - **Mapping Types:** All associations are stored in a single table for fast lookups.
 - **Transient Keys:** `fqj_faq_json_{generation}_{post_id}` (build with `fqj_cache_key( $post_id )`). "Purge all" bumps the `fqj_cache_gen` option, which works with persistent object caches too.
-- **Uninstall:** Deleting the plugin removes its options, transients, cron events, post meta and mapping table (on every site of a multisite network). `faq_item` posts are kept by default; to delete them as well, add `add_filter( 'fqj_uninstall_delete_faqs', '__return_true' );` (e.g. in a mu-plugin) before deleting the plugin.
+- **Uninstall:** Deleting the plugin removes its options, transients, cron events, post meta and mapping table (on every site of a multisite network). FAQ posts are kept by default; to delete them as well, add `add_filter( 'fqj_uninstall_delete_faqs', '__return_true' );` (e.g. in a mu-plugin) before deleting the plugin.
 - **Admin JS:** Uses Select2 for post selectors, AJAX for search (`fqj_search_posts` action; all public post types except attachments and FAQs). Switching the association type keeps each type's in-progress selection until you save; only the selected type is stored.
 - **Background Processing:** The invalidation queue lives in a database table and is processed every 5 minutes by WP-Cron (up to the batch size per run), or on demand from the Health page or WP-CLI.
 - **Asset versions:** The plugin's own JS is versioned with `FQJ_VERSION`; keep it in sync with the `Version` header when releasing.
diff --git a/assets/vendor/select2/select2.css b/assets/vendor/select2/select2.css
index 750b320..65dbba6 100644
--- a/assets/vendor/select2/select2.css
+++ b/assets/vendor/select2/select2.css
@@ -3,49 +3,72 @@
   display: inline-block;
   margin: 0;
   position: relative;
-  vertical-align: middle; }
-  .select2-container .select2-selection--single {
-    box-sizing: border-box;
-    cursor: pointer;
-    display: block;
-    height: 28px;
-    user-select: none;
-    -webkit-user-select: none; }
-    .select2-container .select2-selection--single .select2-selection__rendered {
-      display: block;
-      padding-left: 8px;
-      padding-right: 20px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap; }
-    .select2-container .select2-selection--single .select2-selection__clear {
-      position: relative; }
-  .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
-    padding-right: 8px;
-    padding-left: 20px; }
-  .select2-container .select2-selection--multiple {
-    box-sizing: border-box;
-    cursor: pointer;
-    display: block;
-    min-height: 32px;
-    user-select: none;
-    -webkit-user-select: none; }
-    .select2-container .select2-selection--multiple .select2-selection__rendered {
-      display: inline-block;
-      overflow: hidden;
-      padding-left: 8px;
-      text-overflow: ellipsis;
-      white-space: nowrap; }
-  .select2-container .select2-search--inline {
-    float: left; }
-    .select2-container .select2-search--inline .select2-search__field {
-      box-sizing: border-box;
-      border: none;
-      font-size: 100%;
-      margin-top: 5px;
-      padding: 0; }
-      .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
-        -webkit-appearance: none; }
+  vertical-align: middle;
+}
+.select2-container .select2-selection--single {
+  box-sizing: border-box;
+  cursor: pointer;
+  display: block;
+  height: 28px;
+  user-select: none;
+  -webkit-user-select: none;
+}
+.select2-container .select2-selection--single .select2-selection__rendered {
+  display: block;
+  padding-left: 8px;
+  padding-right: 20px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.select2-container .select2-selection--single .select2-selection__clear {
+  background-color: transparent;
+  border: none;
+  font-size: 1em;
+}
+.select2-container[dir=rtl] .select2-selection--single .select2-selection__rendered {
+  padding-right: 8px;
+  padding-left: 20px;
+}
+.select2-container .select2-selection--multiple {
+  box-sizing: border-box;
+  cursor: pointer;
+  display: block;
+  min-height: 32px;
+  user-select: none;
+  -webkit-user-select: none;
+}
+.select2-container .select2-selection--multiple .select2-selection__rendered {
+  display: inline;
+  list-style: none;
+  padding: 0;
+}
+.select2-container .select2-selection--multiple .select2-selection__clear {
+  background-color: transparent;
+  border: none;
+  font-size: 1em;
+}
+.select2-container .select2-search--inline .select2-search__field {
+  box-sizing: border-box;
+  border: none;
+  font-size: 100%;
+  margin-top: 5px;
+  margin-left: 5px;
+  padding: 0;
+  max-width: 100%;
+  resize: none;
+  height: 20px;
+  vertical-align: bottom;
+  font-family: sans-serif;
+  overflow: hidden;
+  word-break: keep-all;
+}
+.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+.select2-container .select2-search--inline .select2-search__field::placeholder {
+  line-height: normal;
+}
 
 .select2-dropdown {
   background-color: white;
@@ -56,47 +79,63 @@
   position: absolute;
   left: -100000px;
   width: 100%;
-  z-index: 1051; }
+  z-index: 1051;
+}
 
 .select2-results {
-  display: block; }
+  display: block;
+}
 
 .select2-results__options {
   list-style: none;
   margin: 0;
-  padding: 0; }
+  padding: 0;
+}
 
 .select2-results__option {
   padding: 6px;
   user-select: none;
-  -webkit-user-select: none; }
-  .select2-results__option[aria-selected] {
-    cursor: pointer; }
+  -webkit-user-select: none;
+}
+
+.select2-results__option--selectable {
+  cursor: pointer;
+}
 
 .select2-container--open .select2-dropdown {
-  left: 0; }
+  left: 0;
+}
 
 .select2-container--open .select2-dropdown--above {
   border-bottom: none;
   border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+  border-bottom-right-radius: 0;
+}
 
 .select2-container--open .select2-dropdown--below {
   border-top: none;
   border-top-left-radius: 0;
-  border-top-right-radius: 0; }
+  border-top-right-radius: 0;
+}
 
 .select2-search--dropdown {
   display: block;
-  padding: 4px; }
-  .select2-search--dropdown .select2-search__field {
-    padding: 4px;
-    width: 100%;
-    box-sizing: border-box; }
-    .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
-      -webkit-appearance: none; }
-  .select2-search--dropdown.select2-search--hide {
-    display: none; }
+  padding: 4px;
+}
+
+.select2-search--dropdown .select2-search__field {
+  padding: 4px;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+.select2-search--dropdown.select2-search--hide {
+  display: none;
+}
 
 .select2-close-mask {
   border: 0;
@@ -113,7 +152,8 @@
   opacity: 0;
   z-index: 99;
   background-color: #fff;
-  filter: alpha(opacity=0); }
+  filter: alpha(opacity=0);
+}
 
 .select2-hidden-accessible {
   border: 0 !important;
@@ -125,178 +165,275 @@
   padding: 0 !important;
   position: absolute !important;
   width: 1px !important;
-  white-space: nowrap !important; }
+  white-space: nowrap !important;
+}
 
 .select2-container--default .select2-selection--single {
   background-color: #fff;
   border: 1px solid #aaa;
-  border-radius: 4px; }
-  .select2-container--default .select2-selection--single .select2-selection__rendered {
-    color: #444;
-    line-height: 28px; }
-  .select2-container--default .select2-selection--single .select2-selection__clear {
-    cursor: pointer;
-    float: right;
-    font-weight: bold; }
-  .select2-container--default .select2-selection--single .select2-selection__placeholder {
-    color: #999; }
-  .select2-container--default .select2-selection--single .select2-selection__arrow {
-    height: 26px;
-    position: absolute;
-    top: 1px;
-    right: 1px;
-    width: 20px; }
-    .select2-container--default .select2-selection--single .select2-selection__arrow b {
-      border-color: #888 transparent transparent transparent;
-      border-style: solid;
-      border-width: 5px 4px 0 4px;
-      height: 0;
-      left: 50%;
-      margin-left: -4px;
-      margin-top: -2px;
-      position: absolute;
-      top: 50%;
-      width: 0; }
-
-.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear {
-  float: left; }
-
-.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  border-radius: 4px;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: #444;
+  line-height: 28px;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__clear {
+  cursor: pointer;
+  float: right;
+  font-weight: bold;
+  height: 26px;
+  margin-right: 20px;
+  padding-right: 0px;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__placeholder {
+  color: #999;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__arrow {
+  height: 26px;
+  position: absolute;
+  top: 1px;
+  right: 1px;
+  width: 20px;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__arrow b {
+  border-color: #888 transparent transparent transparent;
+  border-style: solid;
+  border-width: 5px 4px 0 4px;
+  height: 0;
+  left: 50%;
+  margin-left: -4px;
+  margin-top: -2px;
+  position: absolute;
+  top: 50%;
+  width: 0;
+}
+
+.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__clear {
+  float: left;
+}
+
+.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__arrow {
   left: 1px;
-  right: auto; }
+  right: auto;
+}
 
 .select2-container--default.select2-container--disabled .select2-selection--single {
   background-color: #eee;
-  cursor: default; }
-  .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear {
-    display: none; }
+  cursor: default;
+}
+
+.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear {
+  display: none;
+}
 
 .select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
   border-color: transparent transparent #888 transparent;
-  border-width: 0 4px 5px 4px; }
+  border-width: 0 4px 5px 4px;
+}
 
 .select2-container--default .select2-selection--multiple {
   background-color: white;
   border: 1px solid #aaa;
   border-radius: 4px;
-  cursor: text; }
-  .select2-container--default .select2-selection--multiple .select2-selection__rendered {
-    box-sizing: border-box;
-    list-style: none;
-    margin: 0;
-    padding: 0 5px;
-    width: 100%; }
-    .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
-      list-style: none; }
-  .select2-container--default .select2-selection--multiple .select2-selection__clear {
-    cursor: pointer;
-    float: right;
-    font-weight: bold;
-    margin-top: 5px;
-    margin-right: 10px;
-    padding: 1px; }
-  .select2-container--default .select2-selection--multiple .select2-selection__choice {
-    background-color: #e4e4e4;
-    border: 1px solid #aaa;
-    border-radius: 4px;
-    cursor: default;
-    float: left;
-    margin-right: 5px;
-    margin-top: 5px;
-    padding: 0 5px; }
-  .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
-    color: #999;
-    cursor: pointer;
-    display: inline-block;
-    font-weight: bold;
-    margin-right: 2px; }
-    .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
-      color: #333; }
-
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
-  float: right; }
-
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  cursor: text;
+  padding-bottom: 5px;
+  padding-right: 5px;
+  position: relative;
+}
+
+.select2-container--default .select2-selection--multiple.select2-selection--clearable {
+  padding-right: 25px;
+}
+
+.select2-container--default .select2-selection--multiple .select2-selection__clear {
+  cursor: pointer;
+  font-weight: bold;
+  height: 20px;
+  margin-right: 10px;
+  margin-top: 5px;
+  position: absolute;
+  right: 0;
+  padding: 1px;
+}
+
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #e4e4e4;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  box-sizing: border-box;
+  display: inline-block;
   margin-left: 5px;
-  margin-right: auto; }
+  margin-top: 5px;
+  padding: 0;
+  padding-left: 20px;
+  position: relative;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: bottom;
+  white-space: nowrap;
+}
+
+.select2-container--default .select2-selection--multiple .select2-selection__choice__display {
+  cursor: default;
+  padding-left: 2px;
+  padding-right: 5px;
+}
+
+.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+  background-color: transparent;
+  border: none;
+  border-right: 1px solid #aaa;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  color: #999;
+  cursor: pointer;
+  font-size: 1em;
+  font-weight: bold;
+  padding: 0 4px;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
 
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
-  margin-left: 2px;
-  margin-right: auto; }
+.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover, .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:focus {
+  background-color: #f1f1f1;
+  color: #333;
+  outline: none;
+}
+
+.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice {
+  padding: 0 20px 0 0;
+  margin-left: 5px;
+  margin-right: auto;
+}
+
+.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice__display {
+  padding-left: 5px;
+  padding-right: 2px;
+}
+
+.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove {
+  left: auto;
+  right: 0;
+  border-left: 1px solid #aaa;
+  border-right: none;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__clear {
+  float: left;
+  margin-left: 10px;
+  margin-right: auto;
+}
 
 .select2-container--default.select2-container--focus .select2-selection--multiple {
   border: solid black 1px;
-  outline: 0; }
+  outline: 0;
+}
 
 .select2-container--default.select2-container--disabled .select2-selection--multiple {
   background-color: #eee;
-  cursor: default; }
+  cursor: default;
+}
 
 .select2-container--default.select2-container--disabled .select2-selection__choice__remove {
-  display: none; }
+  display: none;
+}
 
 .select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple {
   border-top-left-radius: 0;
-  border-top-right-radius: 0; }
+  border-top-right-radius: 0;
+}
 
 .select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple {
   border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+  border-bottom-right-radius: 0;
+}
 
 .select2-container--default .select2-search--dropdown .select2-search__field {
-  border: 1px solid #aaa; }
+  border: 1px solid #aaa;
+}
 
 .select2-container--default .select2-search--inline .select2-search__field {
   background: transparent;
   border: none;
   outline: 0;
   box-shadow: none;
-  -webkit-appearance: textfield; }
+  -webkit-appearance: textfield;
+}
 
 .select2-container--default .select2-results > .select2-results__options {
   max-height: 200px;
-  overflow-y: auto; }
+  overflow-y: auto;
+}
 
-.select2-container--default .select2-results__option[role=group] {
-  padding: 0; }
+.select2-container--default .select2-results__option .select2-results__option {
+  padding-left: 1em;
+}
+
+.select2-container--default .select2-results__option .select2-results__option .select2-results__group {
+  padding-left: 0;
+}
+
+.select2-container--default .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -1em;
+  padding-left: 2em;
+}
+
+.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -2em;
+  padding-left: 3em;
+}
+
+.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -3em;
+  padding-left: 4em;
+}
+
+.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -4em;
+  padding-left: 5em;
+}
+
+.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -5em;
+  padding-left: 6em;
+}
+
+.select2-container--default .select2-results__option--group {
+  padding: 0;
+}
 
-.select2-container--default .select2-results__option[aria-disabled=true] {
-  color: #999; }
+.select2-container--default .select2-results__option--disabled {
+  color: #999;
+}
 
-.select2-container--default .select2-results__option[aria-selected=true] {
-  background-color: #ddd; }
+.select2-container--default .select2-results__option--selected {
+  background-color: #ddd;
+}
 
-.select2-container--default .select2-results__option .select2-results__option {
-  padding-left: 1em; }
-  .select2-container--default .select2-results__option .select2-results__option .select2-results__group {
-    padding-left: 0; }
-  .select2-container--default .select2-results__option .select2-results__option .select2-results__option {
-    margin-left: -1em;
-    padding-left: 2em; }
-    .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
-      margin-left: -2em;
-      padding-left: 3em; }
-      .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
-        margin-left: -3em;
-        padding-left: 4em; }
-        .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
-          margin-left: -4em;
-          padding-left: 5em; }
-          .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
-            margin-left: -5em;
-            padding-left: 6em; }
-
-.select2-container--default .select2-results__option--highlighted[aria-selected] {
+.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
   background-color: #5897fb;
-  color: white; }
+  color: white;
+}
 
 .select2-container--default .select2-results__group {
   cursor: default;
   display: block;
-  padding: 6px; }
+  padding: 6px;
+}
 
 .select2-container--classic .select2-selection--single {
-  background-color: #f7f7f7;
+  background-color: rgb(246.5, 246.5, 246.5);
   border: 1px solid #aaa;
   border-radius: 4px;
   outline: 0;
@@ -304,67 +441,88 @@
   background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%);
   background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
-  .select2-container--classic .select2-selection--single:focus {
-    border: 1px solid #5897fb; }
-  .select2-container--classic .select2-selection--single .select2-selection__rendered {
-    color: #444;
-    line-height: 28px; }
-  .select2-container--classic .select2-selection--single .select2-selection__clear {
-    cursor: pointer;
-    float: right;
-    font-weight: bold;
-    margin-right: 10px; }
-  .select2-container--classic .select2-selection--single .select2-selection__placeholder {
-    color: #999; }
-  .select2-container--classic .select2-selection--single .select2-selection__arrow {
-    background-color: #ddd;
-    border: none;
-    border-left: 1px solid #aaa;
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-    height: 26px;
-    position: absolute;
-    top: 1px;
-    right: 1px;
-    width: 20px;
-    background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
-    background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
-    background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);
-    background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); }
-    .select2-container--classic .select2-selection--single .select2-selection__arrow b {
-      border-color: #888 transparent transparent transparent;
-      border-style: solid;
-      border-width: 5px 4px 0 4px;
-      height: 0;
-      left: 50%;
-      margin-left: -4px;
-      margin-top: -2px;
-      position: absolute;
-      top: 50%;
-      width: 0; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear {
-  float: left; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0);
+}
+
+.select2-container--classic .select2-selection--single:focus {
+  border: 1px solid #5897fb;
+}
+
+.select2-container--classic .select2-selection--single .select2-selection__rendered {
+  color: #444;
+  line-height: 28px;
+}
+
+.select2-container--classic .select2-selection--single .select2-selection__clear {
+  cursor: pointer;
+  float: right;
+  font-weight: bold;
+  height: 26px;
+  margin-right: 20px;
+}
+
+.select2-container--classic .select2-selection--single .select2-selection__placeholder {
+  color: #999;
+}
+
+.select2-container--classic .select2-selection--single .select2-selection__arrow {
+  background-color: #ddd;
+  border: none;
+  border-left: 1px solid #aaa;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  height: 26px;
+  position: absolute;
+  top: 1px;
+  right: 1px;
+  width: 20px;
+  background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+  background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+  background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0);
+}
+
+.select2-container--classic .select2-selection--single .select2-selection__arrow b {
+  border-color: #888 transparent transparent transparent;
+  border-style: solid;
+  border-width: 5px 4px 0 4px;
+  height: 0;
+  left: 50%;
+  margin-left: -4px;
+  margin-top: -2px;
+  position: absolute;
+  top: 50%;
+  width: 0;
+}
+
+.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__clear {
+  float: left;
+}
+
+.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__arrow {
   border: none;
   border-right: 1px solid #aaa;
   border-radius: 0;
   border-top-left-radius: 4px;
   border-bottom-left-radius: 4px;
   left: 1px;
-  right: auto; }
+  right: auto;
+}
 
 .select2-container--classic.select2-container--open .select2-selection--single {
-  border: 1px solid #5897fb; }
-  .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow {
-    background: transparent;
-    border: none; }
-    .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b {
-      border-color: transparent transparent #888 transparent;
-      border-width: 0 4px 5px 4px; }
+  border: 1px solid #5897fb;
+}
+
+.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow {
+  background: transparent;
+  border: none;
+}
+
+.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-color: transparent transparent #888 transparent;
+  border-width: 0 4px 5px 4px;
+}
 
 .select2-container--classic.select2-container--open.select2-container--above .select2-selection--single {
   border-top: none;
@@ -374,7 +532,8 @@
   background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%);
   background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0);
+}
 
 .select2-container--classic.select2-container--open.select2-container--below .select2-selection--single {
   border-bottom: none;
@@ -384,98 +543,140 @@
   background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%);
   background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); }
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0);
+}
 
 .select2-container--classic .select2-selection--multiple {
   background-color: white;
   border: 1px solid #aaa;
   border-radius: 4px;
   cursor: text;
-  outline: 0; }
-  .select2-container--classic .select2-selection--multiple:focus {
-    border: 1px solid #5897fb; }
-  .select2-container--classic .select2-selection--multiple .select2-selection__rendered {
-    list-style: none;
-    margin: 0;
-    padding: 0 5px; }
-  .select2-container--classic .select2-selection--multiple .select2-selection__clear {
-    display: none; }
-  .select2-container--classic .select2-selection--multiple .select2-selection__choice {
-    background-color: #e4e4e4;
-    border: 1px solid #aaa;
-    border-radius: 4px;
-    cursor: default;
-    float: left;
-    margin-right: 5px;
-    margin-top: 5px;
-    padding: 0 5px; }
-  .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove {
-    color: #888;
-    cursor: pointer;
-    display: inline-block;
-    font-weight: bold;
-    margin-right: 2px; }
-    .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover {
-      color: #555; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
-  float: right;
+  outline: 0;
+  padding-bottom: 5px;
+  padding-right: 5px;
+}
+
+.select2-container--classic .select2-selection--multiple:focus {
+  border: 1px solid #5897fb;
+}
+
+.select2-container--classic .select2-selection--multiple .select2-selection__clear {
+  display: none;
+}
+
+.select2-container--classic .select2-selection--multiple .select2-selection__choice {
+  background-color: #e4e4e4;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  display: inline-block;
+  margin-left: 5px;
+  margin-top: 5px;
+  padding: 0;
+}
+
+.select2-container--classic .select2-selection--multiple .select2-selection__choice__display {
+  cursor: default;
+  padding-left: 2px;
+  padding-right: 5px;
+}
+
+.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove {
+  background-color: transparent;
+  border: none;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  color: #888;
+  cursor: pointer;
+  font-size: 1em;
+  font-weight: bold;
+  padding: 0 4px;
+}
+
+.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover {
+  color: #555;
+  outline: none;
+}
+
+.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice {
   margin-left: 5px;
-  margin-right: auto; }
+  margin-right: auto;
+}
 
-.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
-  margin-left: 2px;
-  margin-right: auto; }
+.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice__display {
+  padding-left: 5px;
+  padding-right: 2px;
+}
+
+.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
 
 .select2-container--classic.select2-container--open .select2-selection--multiple {
-  border: 1px solid #5897fb; }
+  border: 1px solid #5897fb;
+}
 
 .select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple {
   border-top: none;
   border-top-left-radius: 0;
-  border-top-right-radius: 0; }
+  border-top-right-radius: 0;
+}
 
 .select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple {
   border-bottom: none;
   border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+  border-bottom-right-radius: 0;
+}
 
 .select2-container--classic .select2-search--dropdown .select2-search__field {
   border: 1px solid #aaa;
-  outline: 0; }
+  outline: 0;
+}
 
 .select2-container--classic .select2-search--inline .select2-search__field {
   outline: 0;
-  box-shadow: none; }
+  box-shadow: none;
+}
 
 .select2-container--classic .select2-dropdown {
   background-color: white;
-  border: 1px solid transparent; }
+  border: 1px solid transparent;
+}
 
 .select2-container--classic .select2-dropdown--above {
-  border-bottom: none; }
+  border-bottom: none;
+}
 
 .select2-container--classic .select2-dropdown--below {
-  border-top: none; }
+  border-top: none;
+}
 
 .select2-container--classic .select2-results > .select2-results__options {
   max-height: 200px;
-  overflow-y: auto; }
+  overflow-y: auto;
+}
 
-.select2-container--classic .select2-results__option[role=group] {
-  padding: 0; }
+.select2-container--classic .select2-results__option--group {
+  padding: 0;
+}
 
-.select2-container--classic .select2-results__option[aria-disabled=true] {
-  color: grey; }
+.select2-container--classic .select2-results__option--disabled {
+  color: grey;
+}
 
-.select2-container--classic .select2-results__option--highlighted[aria-selected] {
+.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable {
   background-color: #3875d7;
-  color: white; }
+  color: white;
+}
 
 .select2-container--classic .select2-results__group {
   cursor: default;
   display: block;
-  padding: 6px; }
+  padding: 6px;
+}
 
 .select2-container--classic.select2-container--open .select2-dropdown {
-  border-color: #5897fb; }
+  border-color: #5897fb;
+}
\ No newline at end of file
diff --git a/assets/vendor/select2/select2.js b/assets/vendor/select2/select2.js
index fcfb5ab..d331cf6 100644
--- a/assets/vendor/select2/select2.js
+++ b/assets/vendor/select2/select2.js
@@ -1,5 +1,5 @@
 /*!
- * Select2 4.0.13
+ * Select2 4.1.0
  * https://select2.github.io
  *
  * Released under the MIT license
@@ -499,8 +499,7 @@ S2.define('jquery',[],function () {
 });
 
 S2.define('select2/utils',[
-  'jquery'
-], function ($) {
+], function () {
   var Utils = {};
 
   Utils.Extend = function (ChildClass, SuperClass) {
@@ -716,7 +715,6 @@ S2.define('select2/utils',[
     // http://codereview.stackexchange.com/q/13338
     // and was designed to be used with the Sizzle selector engine.
 
-    var $el = $(el);
     var overflowX = el.style.overflowX;
     var overflowY = el.style.overflowY;
 
@@ -730,8 +728,10 @@ S2.define('select2/utils',[
       return true;
     }
 
-    return ($el.innerHeight() < el.scrollHeight ||
-      $el.innerWidth() < el.scrollWidth);
+    var computedEl = window.getComputedStyle(el);
+
+    return (parseFloat(computedEl.height) < el.scrollHeight ||
+      parseFloat(computedEl.width) < el.scrollWidth);
   };
 
   Utils.escapeMarkup = function (markup) {
@@ -755,23 +755,6 @@ S2.define('select2/utils',[
     });
   };
 
-  // Append an array of jQuery nodes to a given element.
-  Utils.appendMany = function ($element, $nodes) {
-    // jQuery 1.7.x does not support $.fn.append() with an array
-    // Fall back to a jQuery object collection using $.fn.add()
-    if ($.fn.jquery.substr(0, 3) === '1.7') {
-      var $jqNodes = $();
-
-      $.map($nodes, function (node) {
-        $jqNodes = $jqNodes.add(node);
-      });
-
-      $nodes = $jqNodes;
-    }
-
-    $element.append($nodes);
-  };
-
   // Cache objects in Utils.__cache instead of $.data (see #4346)
   Utils.__cache = {};
 
@@ -779,20 +762,25 @@ S2.define('select2/utils',[
   Utils.GetUniqueElementId = function (element) {
     // Get a unique element Id. If element has no id,
     // creates a new unique number, stores it in the id
-    // attribute and returns the new id.
-    // If an id already exists, it simply returns it.
+    // attribute and returns the new id with a prefix.
+    // If an id already exists, it simply returns it with a prefix.
 
     var select2Id = element.getAttribute('data-select2-id');
-    if (select2Id == null) {
-      // If element has id, use it.
-      if (element.id) {
-        select2Id = element.id;
-        element.setAttribute('data-select2-id', select2Id);
-      } else {
-        element.setAttribute('data-select2-id', ++id);
-        select2Id = id.toString();
-      }
+
+    if (select2Id != null) {
+      return select2Id;
+    }
+
+    // If element has id, use it.
+    if (element.id) {
+      select2Id = 'select2-data-' + element.id;
+    } else {
+      select2Id = 'select2-data-' + (++id).toString() +
+        '-' + Utils.generateChars(4);
     }
+
+    element.setAttribute('data-select2-id', select2Id);
+
     return select2Id;
   };
 
@@ -814,13 +802,18 @@ S2.define('select2/utils',[
     // and for a specified element.
     var id = Utils.GetUniqueElementId(element);
     if (name) {
+      // Convert the attribute name format (e.g. 'foo-bar') to the dataset
+      // property key format (e.g. 'fooBar') as required by the HTML spec.
+      var datasetKey = name.replace(/-([a-z])/g, function (_, letter) {
+        return letter.toUpperCase();
+      });
       if (Utils.__cache[id]) {
         if (Utils.__cache[id][name] != null) {
           return Utils.__cache[id][name];
         }
-        return $(element).data(name); // Fallback to HTML5 data attribs.
+        return element.dataset[datasetKey]; // Fallback to HTML5 data attribs.
       }
-      return $(element).data(name); // Fallback to HTML5 data attribs.
+      return element.dataset[datasetKey]; // Fallback to HTML5 data attribs.
     } else {
       return Utils.__cache[id];
     }
@@ -836,6 +829,28 @@ S2.define('select2/utils',[
     element.removeAttribute('data-select2-id');
   };
 
+  Utils.copyNonInternalCssClasses = function (dest, src) {
+    var classes;
+
+    var destinationClasses = dest.getAttribute('class').trim().split(/\s+/);
+
+    destinationClasses = destinationClasses.filter(function (clazz) {
+      // Save all Select2 classes
+      return clazz.indexOf('select2-') === 0;
+    });
+
+    var sourceClasses = src.getAttribute('class').trim().split(/\s+/);
+
+    sourceClasses = sourceClasses.filter(function (clazz) {
+      // Only copy non-Select2 classes
+      return clazz.indexOf('select2-') !== 0;
+    });
+
+    var replacements = destinationClasses.concat(sourceClasses);
+
+    dest.setAttribute('class', replacements.join(' '));
+  };
+
   return Utils;
 });
 
@@ -859,7 +874,7 @@ S2.define('select2/results',[
     );
 
     if (this.options.get('multiple')) {
-      $results.attr('aria-multiselectable', 'true');
+      $results[0].setAttribute('aria-multiselectable', 'true');
     }
 
     this.$results = $results;
@@ -940,9 +955,9 @@ S2.define('select2/results',[
 
   Results.prototype.highlightFirstItem = function () {
     var $options = this.$results
-      .find('.select2-results__option[aria-selected]');
+      .find('.select2-results__option--selectable');
 
-    var $selected = $options.filter('[aria-selected=true]');
+    var $selected = $options.filter('.select2-results__option--selected');
 
     // Check if there are any selected options
     if ($selected.length > 0) {
@@ -961,12 +976,12 @@ S2.define('select2/results',[
     var self = this;
 
     this.data.current(function (selected) {
-      var selectedIds = $.map(selected, function (s) {
+      var selectedIds = selected.map(function (s) {
         return s.id.toString();
       });
 
       var $options = self.$results
-        .find('.select2-results__option[aria-selected]');
+        .find('.select2-results__option--selectable');
 
       $options.each(function () {
         var $option = $(this);
@@ -977,10 +992,12 @@ S2.define('select2/results',[
         var id = '' + item.id;
 
         if ((item.element != null && item.element.selected) ||
-            (item.element == null && $.inArray(id, selectedIds) > -1)) {
-          $option.attr('aria-selected', 'true');
+            (item.element == null && selectedIds.indexOf(id) > -1)) {
+          this.classList.add('select2-results__option--selected');
+          $option[0].setAttribute('aria-selected', 'true');
         } else {
-          $option.attr('aria-selected', 'false');
+          this.classList.remove('select2-results__option--selected');
+          $option[0].setAttribute('aria-selected', 'false');
         }
       });
 
@@ -1009,11 +1026,11 @@ S2.define('select2/results',[
 
   Results.prototype.option = function (data) {
     var option = document.createElement('li');
-    option.className = 'select2-results__option';
+    option.classList.add('select2-results__option');
+    option.classList.add('select2-results__option--selectable');
 
     var attrs = {
-      'role': 'option',
-      'aria-selected': 'false'
+      'role': 'option'
     };
 
     var matches = window.Element.prototype.matches ||
@@ -1022,12 +1039,14 @@ S2.define('select2/results',[
 
     if ((data.element != null && matches.call(data.element, ':disabled')) ||
         (data.element == null && data.disabled)) {
-      delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
+
+      option.classList.remove('select2-results__option--selectable');
+      option.classList.add('select2-results__option--disabled');
     }
 
     if (data.id == null) {
-      delete attrs['aria-selected'];
+      option.classList.remove('select2-results__option--selectable');
     }
 
     if (data._resultId != null) {
@@ -1041,7 +1060,9 @@ S2.define('select2/results',[
     if (data.children) {
       attrs.role = 'group';
       attrs['aria-label'] = data.text;
-      delete attrs['aria-selected'];
+
+      option.classList.remove('select2-results__option--selectable');
+      option.classList.add('select2-results__option--group');
     }
 
     for (var attr in attrs) {
@@ -1056,7 +1077,6 @@ S2.define('select2/results',[
       var label = document.createElement('strong');
       label.className = 'select2-results__group';
 
-      var $label = $(label);
       this.template(data, label);
 
       var $children = [];
@@ -1070,7 +1090,8 @@ S2.define('select2/results',[
       }
 
       var $childrenContainer = $('<ul></ul>', {
-        'class': 'select2-results__options select2-results__options--nested'
+        'class': 'select2-results__options select2-results__options--nested',
+        'role': 'none'
       });
 
       $childrenContainer.append($children);
@@ -1091,7 +1112,7 @@ S2.define('select2/results',[
 
     var id = container.id + '-results';
 
-    this.$results.attr('id', id);
+    this.$results[0].setAttribute('id', id);
 
     container.on('results:all', function (params) {
       self.clear();
@@ -1142,8 +1163,8 @@ S2.define('select2/results',[
 
     container.on('open', function () {
       // When the dropdown is open, aria-expended="true"
-      self.$results.attr('aria-expanded', 'true');
-      self.$results.attr('aria-hidden', 'false');
+      self.$results[0].setAttribute('aria-expanded', 'true');
+      self.$results[0].setAttribute('aria-hidden', 'false');
 
       self.setClasses();
       self.ensureHighlightVisible();
@@ -1151,9 +1172,9 @@ S2.define('select2/results',[
 
     container.on('close', function () {
       // When the dropdown is closed, aria-expended="false"
-      self.$results.attr('aria-expanded', 'false');
-      self.$results.attr('aria-hidden', 'true');
-      self.$results.removeAttr('aria-activedescendant');
+      self.$results[0].setAttribute('aria-expanded', 'false');
+      self.$results[0].setAttribute('aria-hidden', 'true');
+      self.$results[0].removeAttribute('aria-activedescendant');
     });
 
     container.on('results:toggle', function () {
@@ -1175,7 +1196,7 @@ S2.define('select2/results',[
 
       var data = Utils.GetData($highlighted[0], 'data');
 
-      if ($highlighted.attr('aria-selected') == 'true') {
+      if ($highlighted.hasClass('select2-results__option--selected')) {
         self.trigger('close', {});
       } else {
         self.trigger('select', {
@@ -1187,7 +1208,7 @@ S2.define('select2/results',[
     container.on('results:previous', function () {
       var $highlighted = self.getHighlightedResults();
 
-      var $options = self.$results.find('[aria-selected]');
+      var $options = self.$results.find('.select2-results__option--selectable');
 
       var currentIndex = $options.index($highlighted);
 
@@ -1222,7 +1243,7 @@ S2.define('select2/results',[
     container.on('results:next', function () {
       var $highlighted = self.getHighlightedResults();
 
-      var $options = self.$results.find('[aria-selected]');
+      var $options = self.$results.find('.select2-results__option--selectable');
 
       var currentIndex = $options.index($highlighted);
 
@@ -1250,7 +1271,8 @@ S2.define('select2/results',[
     });
 
     container.on('results:focus', function (params) {
-      params.element.addClass('select2-results__option--highlighted');
+      params.element[0].classList.add('select2-results__option--highlighted');
+      params.element[0].setAttribute('aria-selected', 'true');
     });
 
     container.on('results:message', function (params) {
@@ -1282,20 +1304,23 @@ S2.define('select2/results',[
       });
     }
 
-    this.$results.on('mouseup', '.select2-results__option[aria-selected]',
+    this.$results.on('mouseup', '.select2-results__option--selectable',
       function (evt) {
       var $this = $(this);
 
       var data = Utils.GetData(this, 'data');
 
-      if ($this.attr('aria-selected') === 'true') {
+      if ($this.hasClass('select2-results__option--selected')) {
         if (self.options.get('multiple')) {
           self.trigger('unselect', {
             originalEvent: evt,
             data: data
           });
         } else {
-          self.trigger('close', {});
+          self.trigger('close', {
+            originalEvent: evt,
+            data: data
+          });
         }
 
         return;
@@ -1307,12 +1332,15 @@ S2.define('select2/results',[
       });
     });
 
-    this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
+    this.$results.on('mouseenter', '.select2-results__option--selectable',
       function (evt) {
       var data = Utils.GetData(this, 'data');
 
-      self.getHighlightedResults()
-          .removeClass('select2-results__option--highlighted');
+      var $highlighted = self.getHighlightedResults();
+      $highlighted.removeClass('select2-results__option--highlighted');
+      $highlighted.each(function () {
+        this.setAttribute('aria-selected', 'false');
+      });
 
       self.trigger('results:focus', {
         data: data,
@@ -1339,7 +1367,7 @@ S2.define('select2/results',[
       return;
     }
 
-    var $options = this.$results.find('[aria-selected]');
+    var $options = this.$results.find('.select2-results__option--selectable');
 
     var currentIndex = $options.index($highlighted);
 
@@ -1426,13 +1454,16 @@ S2.define('select2/selection/base',[
 
     if (Utils.GetData(this.$element[0], 'old-tabindex') != null) {
       this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex');
-    } else if (this.$element.attr('tabindex') != null) {
-      this._tabindex = this.$element.attr('tabindex');
+    } else if (this.$element[0].getAttribute('tabindex') != null) {
+      this._tabindex = this.$element[0].getAttribute('tabindex');
     }
 
-    $selection.attr('title', this.$element.attr('title'));
-    $selection.attr('tabindex', this._tabindex);
-    $selection.attr('aria-disabled', 'false');
+    if(this.$element[0].getAttribute('title')) {
+      $selection[0]
+        .setAttribute('title', this.$element[0].getAttribute('title'));
+    }
+    $selection[0].setAttribute('tabindex', this._tabindex);
+    $selection[0].setAttribute('aria-disabled', 'false');
 
     this.$selection = $selection;
 
@@ -1463,7 +1494,8 @@ S2.define('select2/selection/base',[
     });
 
     container.on('results:focus', function (params) {
-      self.$selection.attr('aria-activedescendant', params.data._resultId);
+      self.$selection[0]
+        .setAttribute('aria-activedescendant', params.data._resultId);
     });
 
     container.on('selection:update', function (params) {
@@ -1472,17 +1504,17 @@ S2.define('select2/selection/base',[
 
     container.on('open', function () {
       // When the dropdown is open, aria-expanded="true"
-      self.$selection.attr('aria-expanded', 'true');
-      self.$selection.attr('aria-owns', resultsId);
+      self.$selection[0].setAttribute('aria-expanded', 'true');
+      self.$selection[0].setAttribute('aria-owns', resultsId);
 
       self._attachCloseHandler(container);
     });
 
     container.on('close', function () {
       // When the dropdown is closed, aria-expanded="false"
-      self.$selection.attr('aria-expanded', 'false');
-      self.$selection.removeAttr('aria-activedescendant');
-      self.$selection.removeAttr('aria-owns');
+      self.$selection[0].setAttribute('aria-expanded', 'false');
+      self.$selection[0].removeAttribute('aria-activedescendant');
+      self.$selection[0].removeAttribute('aria-owns');
 
       self.$selection.trigger('focus');
 
@@ -1490,13 +1522,13 @@ S2.define('select2/selection/base',[
     });
 
     container.on('enable', function () {
-      self.$selection.attr('tabindex', self._tabindex);
-      self.$selection.attr('aria-disabled', 'false');
+      self.$selection[0].setAttribute('tabindex', self._tabindex);
+      self.$selection[0].setAttribute('aria-disabled', 'false');
     });
 
     container.on('disable', function () {
-      self.$selection.attr('tabindex', '-1');
-      self.$selection.attr('aria-disabled', 'true');
+      self.$selection[0].setAttribute('tabindex', '-1');
+      self.$selection[0].setAttribute('aria-disabled', 'true');
     });
   };
 
@@ -1595,7 +1627,7 @@ S2.define('select2/selection/single',[
   SingleSelection.prototype.render = function () {
     var $selection = SingleSelection.__super__.render.call(this);
 
-    $selection.addClass('select2-selection--single');
+    $selection[0].classList.add('select2-selection--single');
 
     $selection.html(
       '<span class="select2-selection__rendered"></span>' +
@@ -1614,11 +1646,14 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered')
-      .attr('id', id)
-      .attr('role', 'textbox')
-      .attr('aria-readonly', 'true');
-    this.$selection.attr('aria-labelledby', id);
+    var rendered = this.$selection.find('.select2-selection__rendered')[0];
+    if(rendered != null) {
+      rendered.setAttribute('id', id);
+      rendered.setAttribute('role', 'textbox');
+      rendered.setAttribute('aria-readonly', 'true');
+    }
+    this.$selection[0].setAttribute('aria-labelledby', id);
+    this.$selection[0].setAttribute('aria-controls', id);
 
     this.$selection.on('mousedown', function (evt) {
       // Only respond to left clicks
@@ -1649,7 +1684,7 @@ S2.define('select2/selection/single',[
   SingleSelection.prototype.clear = function () {
     var $rendered = this.$selection.find('.select2-selection__rendered');
     $rendered.empty();
-    $rendered.removeAttr('title'); // clear tooltip on empty
+    $rendered[0].removeAttribute('title'); // clear tooltip on empty
   };
 
   SingleSelection.prototype.display = function (data, container) {
@@ -1679,9 +1714,9 @@ S2.define('select2/selection/single',[
     var title = selection.title || selection.text;
 
     if (title) {
-      $rendered.attr('title', title);
+      $rendered[0].setAttribute('title', title);
     } else {
-      $rendered.removeAttr('title');
+      $rendered[0].removeAttribute('title');
     }
   };
 
@@ -1702,7 +1737,7 @@ S2.define('select2/selection/multiple',[
   MultipleSelection.prototype.render = function () {
     var $selection = MultipleSelection.__super__.render.call(this);
 
-    $selection.addClass('select2-selection--multiple');
+    $selection[0].classList.add('select2-selection--multiple');
 
     $selection.html(
       '<ul class="select2-selection__rendered"></ul>'
@@ -1716,6 +1751,13 @@ S2.define('select2/selection/multiple',[
 
     MultipleSelection.__super__.bind.apply(this, arguments);
 
+    var id = container.id + '-container';
+
+    var rendered = this.$selection.find('.select2-selection__rendered')[0];
+    if(rendered != null) {
+      rendered.setAttribute('id', id);
+    }
+
     this.$selection.on('click', function (evt) {
       self.trigger('toggle', {
         originalEvent: evt
@@ -1742,12 +1784,25 @@ S2.define('select2/selection/multiple',[
         });
       }
     );
+
+    this.$selection.on(
+      'keydown',
+      '.select2-selection__choice__remove',
+      function (evt) {
+        // Ignore the event if it is disabled
+        if (self.isDisabled()) {
+          return;
+        }
+
+        evt.stopPropagation();
+      }
+    );
   };
 
   MultipleSelection.prototype.clear = function () {
     var $rendered = this.$selection.find('.select2-selection__rendered');
     $rendered.empty();
-    $rendered.removeAttr('title');
+    $rendered[0].removeAttribute('title');
   };
 
   MultipleSelection.prototype.display = function (data, container) {
@@ -1760,9 +1815,11 @@ S2.define('select2/selection/multiple',[
   MultipleSelection.prototype.selectionContainer = function () {
     var $container = $(
       '<li class="select2-selection__choice">' +
-        '<span class="select2-selection__choice__remove" role="presentation">' +
-          '&times;' +
-        '</span>' +
+        '<button type="button" class="select2-selection__choice__remove" ' +
+        'tabindex="-1">' +
+          '<span aria-hidden="true">&times;</span>' +
+        '</button>' +
+        '<span class="select2-selection__choice__display"></span>' +
       '</li>'
     );
 
@@ -1778,20 +1835,42 @@ S2.define('select2/selection/multiple',[
 
     var $selections = [];
 
+    var selectionIdPrefix = this.$selection
+      .find('.select2-selection__rendered')[0]
+      .getAttribute('id') + '-choice-';
+
     for (var d = 0; d < data.length; d++) {
       var selection = data[d];
 
       var $selection = this.selectionContainer();
       var formatted = this.display(selection, $selection);
 
-      $selection.append(formatted);
+      var selectionId = selectionIdPrefix + Utils.generateChars(4) + '-';
+
+      if (selection.id) {
+        selectionId += selection.id;
+      } else {
+        selectionId += Utils.generateChars(4);
+      }
+
+      $selection.find('.select2-selection__choice__display')
+        .append(formatted)[0]
+        .setAttribute('id', selectionId);
 
       var title = selection.title || selection.text;
 
       if (title) {
-        $selection.attr('title', title);
+        $selection[0].setAttribute('title', title);
       }
 
+      var removeItem = this.options.get('translations').get('removeItem');
+
+      var remove = $selection.find('.select2-selection__choice__remove')[0];
+
+      remove.setAttribute('title', removeItem());
+      remove.setAttribute('aria-label', removeItem());
+      remove.setAttribute('aria-describedby', selectionId);
+
       Utils.StoreData($selection[0], 'data', selection);
 
       $selections.push($selection);
@@ -1799,15 +1878,15 @@ S2.define('select2/selection/multiple',[
 
     var $rendered = this.$selection.find('.select2-selection__rendered');
 
-    Utils.appendMany($rendered, $selections);
+    $rendered.append($selections);
   };
 
   return MultipleSelection;
 });
 
 S2.define('select2/selection/placeholder',[
-  '../utils'
-], function (Utils) {
+
+], function () {
   function Placeholder (decorated, $element, options) {
     this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
 
@@ -1815,7 +1894,7 @@ S2.define('select2/selection/placeholder',[
   }
 
   Placeholder.prototype.normalizePlaceholder = function (_, placeholder) {
-    if (typeof placeholder === 'string') {
+    if (typeof placeholder !== 'object') {
       placeholder = {
         id: '',
         text: placeholder
@@ -1829,8 +1908,17 @@ S2.define('select2/selection/placeholder',[
     var $placeholder = this.selectionContainer();
 
     $placeholder.html(this.display(placeholder));
-    $placeholder.addClass('select2-selection__placeholder')
-                .removeClass('select2-selection__choice');
+    $placeholder[0].classList.add('select2-selection__placeholder');
+    $placeholder[0].classList.remove('select2-selection__choice');
+
+    var placeholderTitle = placeholder.title ||
+      placeholder.text ||
+      $placeholder.text();
+
+    this.$selection.find('.select2-selection__rendered')[0].setAttribute(
+      'title',
+      placeholderTitle
+    );
 
     return $placeholder;
   };
@@ -1949,21 +2037,34 @@ S2.define('select2/selection/allowClear',[
   AllowClear.prototype.update = function (decorated, data) {
     decorated.call(this, data);
 
+    this.$selection.find('.select2-selection__clear').remove();
+    this.$selection[0].classList.remove('select2-selection--clearable');
+
     if (this.$selection.find('.select2-selection__placeholder').length > 0 ||
         data.length === 0) {
       return;
     }
 
+    var rendered = this.$selection.find('.select2-selection__rendered')[0];
+    var selectionId = null;
+    if(rendered != null) {
+      selectionId = rendered.getAttribute('id');
+    }
+
     var removeAll = this.options.get('translations').get('removeAllItems');
 
     var $remove = $(
-      '<span class="select2-selection__clear" title="' + removeAll() +'">' +
-        '&times;' +
-      '</span>'
+      '<button type="button" class="select2-selection__clear" tabindex="-1">' +
+        '<span aria-hidden="true">&times;</span>' +
+      '</button>'
     );
+    $remove[0].setAttribute('title', removeAll());
+    $remove[0].setAttribute('aria-label', removeAll());
+    $remove[0].setAttribute('aria-describedby', selectionId);
     Utils.StoreData($remove[0], 'data', data);
 
-    this.$selection.find('.select2-selection__rendered').prepend($remove);
+    this.$selection.prepend($remove);
+    this.$selection[0].classList.add('select2-selection--clearable');
   };
 
   return AllowClear;
@@ -1979,20 +2080,27 @@ S2.define('select2/selection/search',[
   }
 
   Search.prototype.render = function (decorated) {
+    var searchLabel = this.options.get('translations').get('search');
     var $search = $(
-      '<li class="select2-search select2-search--inline">' +
-        '<input class="select2-search__field" type="search" tabindex="-1"' +
-        ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
-      '</li>'
+      '<span class="select2-search select2-search--inline">' +
+        '<textarea class="select2-search__field"'+
+        ' type="search" tabindex="-1"' +
+        ' autocorrect="off" autocapitalize="none"' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" >' +
+        '</textarea>' +
+      '</span>'
     );
 
     this.$searchContainer = $search;
-    this.$search = $search.find('input');
+    this.$search = $search.find('textarea');
+
+    this.$search[0].autocomplete = this.options.get('autocomplete');
+    this.$search[0].setAttribute('aria-label', searchLabel());
 
     var $rendered = decorated.call(this);
 
     this._transferTabIndex();
+    $rendered.append(this.$searchContainer);
 
     return $rendered;
   };
@@ -2001,29 +2109,33 @@ S2.define('select2/selection/search',[
     var self = this;
 
     var resultsId = container.id + '-results';
+    var selectionId = container.id + '-container';
 
     decorated.call(this, container, $container);
 
+    self.$search[0].setAttribute('aria-describedby', selectionId);
+
     container.on('open', function () {
-      self.$search.attr('aria-controls', resultsId);
+      self.$search[0].setAttribute('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
-      self.$search.removeAttr('aria-controls');
-      self.$search.removeAttr('aria-activedescendant');
+      self.resizeSearch();
+      self.$search[0].removeAttribute('aria-controls');
+      self.$search[0].removeAttribute('aria-activedescendant');
       self.$search.trigger('focus');
     });
 
     container.on('enable', function () {
-      self.$search.prop('disabled', false);
+      self.$search[0].disabled = false;
 
       self._transferTabIndex();
     });
 
     container.on('disable', function () {
-      self.$search.prop('disabled', true);
+      self.$search[0].disabled = true;
     });
 
     container.on('focus', function (evt) {
@@ -2032,9 +2144,10 @@ S2.define('select2/selection/search',[
 
     container.on('results:focus', function (params) {
       if (params.data._resultId) {
-        self.$search.attr('aria-activedescendant', params.data._resultId);
+        self.$search[0]
+          .setAttribute('aria-activedescendant', params.data._resultId);
       } else {
-        self.$search.removeAttr('aria-activedescendant');
+        self.$search[0].removeAttribute('aria-activedescendant');
       }
     });
 
@@ -2056,8 +2169,8 @@ S2.define('select2/selection/search',[
       var key = evt.which;
 
       if (key === KEYS.BACKSPACE && self.$search.val() === '') {
-        var $previousChoice = self.$searchContainer
-          .prev('.select2-selection__choice');
+        var $previousChoice = self.$selection
+          .find('.select2-selection__choice').last();
 
         if ($previousChoice.length > 0) {
           var item = Utils.GetData($previousChoice[0], 'data');
@@ -2140,24 +2253,22 @@ S2.define('select2/selection/search',[
    * @private
    */
   Search.prototype._transferTabIndex = function (decorated) {
-    this.$search.attr('tabindex', this.$selection.attr('tabindex'));
-    this.$selection.attr('tabindex', '-1');
+    this.$search[0]
+      .setAttribute('tabindex', this.$selection[0].getAttribute('tabindex'));
+    this.$selection[0].setAttribute('tabindex', '-1');
   };
 
   Search.prototype.createPlaceholder = function (decorated, placeholder) {
-    this.$search.attr('placeholder', placeholder.text);
+    this.$search[0].setAttribute('placeholder', placeholder.text);
   };
 
   Search.prototype.update = function (decorated, data) {
     var searchHadFocus = this.$search[0] == document.activeElement;
 
-    this.$search.attr('placeholder', '');
+    this.$search[0].setAttribute('placeholder', '');
 
     decorated.call(this, data);
 
-    this.$selection.find('.select2-selection__rendered')
-                   .append(this.$searchContainer);
-
     this.resizeSearch();
     if (searchHadFocus) {
       this.$search.trigger('focus');
@@ -2190,11 +2301,9 @@ S2.define('select2/selection/search',[
   Search.prototype.resizeSearch = function () {
     this.$search.css('width', '25px');
 
-    var width = '';
+    var width = '100%';
 
-    if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.find('.select2-selection__rendered').width();
-    } else {
+    if (this.$search[0].getAttribute('placeholder') === '') {
       var minimumWidth = this.$search.val().length + 1;
 
       width = (minimumWidth * 0.75) + 'em';
@@ -2206,6 +2315,34 @@ S2.define('select2/selection/search',[
   return Search;
 });
 
+S2.define('select2/selection/selectionCss',[
+  '../utils'
+], function (Utils) {
+  function SelectionCSS () { }
+
+  SelectionCSS.prototype.render = function (decorated) {
+    var $selection = decorated.call(this);
+
+    var selectionCssClass = this.options.get('selectionCssClass') || '';
+
+    if (selectionCssClass.indexOf(':all:') !== -1) {
+      selectionCssClass = selectionCssClass.replace(':all:', '');
+
+      Utils.copyNonInternalCssClasses($selection[0], this.$element[0]);
+    }
+
+    selectionCssClass.trim().split(' ').forEach(function(cssClass) {
+      if(cssClass.length > 0) {
+        $selection[0].classList.add(cssClass);
+      }
+    });
+
+    return $selection;
+  };
+
+  return SelectionCSS;
+});
+
 S2.define('select2/selection/eventRelay',[
   'jquery'
 ], function ($) {
@@ -2229,7 +2366,7 @@ S2.define('select2/selection/eventRelay',[
 
     container.on('*', function (name, params) {
       // Ignore events that should not be relayed
-      if ($.inArray(name, relayEvents) === -1) {
+      if (relayEvents.indexOf(name) === -1) {
         return;
       }
 
@@ -2244,7 +2381,7 @@ S2.define('select2/selection/eventRelay',[
       self.$element.trigger(evt);
 
       // Only handle preventable events if it was one
-      if ($.inArray(name, preventableEvents) === -1) {
+      if (preventableEvents.indexOf(name) === -1) {
         return;
       }
 
@@ -2256,9 +2393,8 @@ S2.define('select2/selection/eventRelay',[
 });
 
 S2.define('select2/translation',[
-  'jquery',
   'require'
-], function ($, require) {
+], function (require) {
   function Translation (dict) {
     this.dict = dict || {};
   }
@@ -2272,7 +2408,7 @@ S2.define('select2/translation',[
   };
 
   Translation.prototype.extend = function (translation) {
-    this.dict = $.extend({}, translation.all(), this.dict);
+    this.dict = Object.assign({}, translation.all(), this.dict);
   };
 
   // Static functions
@@ -3199,16 +3335,14 @@ S2.define('select2/data/select',[
   Utils.Extend(SelectAdapter, BaseAdapter);
 
   SelectAdapter.prototype.current = function (callback) {
-    var data = [];
     var self = this;
 
-    this.$element.find(':selected').each(function () {
-      var $option = $(this);
-
-      var option = self.item($option);
-
-      data.push(option);
-    });
+    var data = Array.prototype.map.call(
+      this.$element[0].querySelectorAll(':checked'),
+      function (selectedElement) {
+        return self.item($(selectedElement));
+      }
+    );
 
     callback(data);
   };
@@ -3219,7 +3353,9 @@ S2.define('select2/data/select',[
     data.selected = true;
 
     // If data.element is a DOM node, use it instead
-    if ($(data.element).is('option')) {
+    if (
+      data.element != null && data.element.tagName.toLowerCase() === 'option'
+    ) {
       data.element.selected = true;
 
       this.$element.trigger('input').trigger('change');
@@ -3227,7 +3363,7 @@ S2.define('select2/data/select',[
       return;
     }
 
-    if (this.$element.prop('multiple')) {
+    if (this.$element[0].multiple) {
       this.current(function (currentData) {
         var val = [];
 
@@ -3237,7 +3373,7 @@ S2.define('select2/data/select',[
         for (var d = 0; d < data.length; d++) {
           var id = data[d].id;
 
-          if ($.inArray(id, val) === -1) {
+          if (val.indexOf(id) === -1) {
             val.push(id);
           }
         }
@@ -3256,13 +3392,16 @@ S2.define('select2/data/select',[
   SelectAdapter.prototype.unselect = function (data) {
     var self = this;
 
-    if (!this.$element.prop('multiple')) {
+    if (!this.$element[0].multiple) {
       return;
     }
 
     data.selected = false;
 
-    if ($(data.element).is('option')) {
+    if (
+      data.element != null &&
+      data.element.tagName.toLowerCase() === 'option'
+    ) {
       data.element.selected = false;
 
       this.$element.trigger('input').trigger('change');
@@ -3276,7 +3415,7 @@ S2.define('select2/data/select',[
       for (var d = 0; d < currentData.length; d++) {
         var id = currentData[d].id;
 
-        if (id !== data.id && $.inArray(id, val) === -1) {
+        if (id !== data.id && val.indexOf(id) === -1) {
           val.push(id);
         }
       }
@@ -3316,12 +3455,15 @@ S2.define('select2/data/select',[
     var $options = this.$element.children();
 
     $options.each(function () {
-      var $option = $(this);
-
-      if (!$option.is('option') && !$option.is('optgroup')) {
+      if (
+        this.tagName.toLowerCase() !== 'option' &&
+        this.tagName.toLowerCase() !== 'optgroup'
+      ) {
         return;
       }
 
+      var $option = $(this);
+
       var option = self.item($option);
 
       var matches = self.matches(params, option);
@@ -3337,7 +3479,7 @@ S2.define('select2/data/select',[
   };
 
   SelectAdapter.prototype.addOptions = function ($options) {
-    Utils.appendMany(this.$element, $options);
+    this.$element.append($options);
   };
 
   SelectAdapter.prototype.option = function (data) {
@@ -3372,15 +3514,13 @@ S2.define('select2/data/select',[
       option.title = data.title;
     }
 
-    var $option = $(option);
-
     var normalizedData = this._normalizeItem(data);
     normalizedData.element = option;
 
     // Override the option's data with the combined data
     Utils.StoreData(option, 'data', normalizedData);
 
-    return $option;
+    return $(option);
   };
 
   SelectAdapter.prototype.item = function ($option) {
@@ -3392,19 +3532,21 @@ S2.define('select2/data/select',[
       return data;
     }
 
-    if ($option.is('option')) {
+    var option = $option[0];
+
+    if (option.tagName.toLowerCase() === 'option') {
       data = {
         id: $option.val(),
         text: $option.text(),
-        disabled: $option.prop('disabled'),
-        selected: $option.prop('selected'),
-        title: $option.prop('title')
+        disabled: $option[0].disabled,
+        selected: $option[0].selected,
+        title: $option[0].title
       };
-    } else if ($option.is('optgroup')) {
+    } else if (option.tagName.toLowerCase() === 'optgroup') {
       data = {
-        text: $option.prop('label'),
+        text: $option[0].label,
         children: [],
-        title: $option.prop('title')
+        title: $option[0].title
       };
 
       var $children = $option.children('option');
@@ -3458,6 +3600,12 @@ S2.define('select2/data/select',[
       item._resultId = this.generateResultId(this.container, item);
     }
 
+    if (item.children) {
+        item.children = item.children.map(
+            SelectAdapter.prototype._normalizeItem
+        );
+    }
+
     return $.extend({}, defaults, item);
   };
 
@@ -3524,7 +3672,7 @@ S2.define('select2/data/array',[
       var item = this._normalizeItem(data[d]);
 
       // Skip items which were pre-loaded, only merge the data
-      if ($.inArray(item.id, existingIds) >= 0) {
+      if (existingIds.indexOf(item.id) >= 0) {
         var $existingOption = $existing.filter(onlyItem(item));
 
         var existingData = this.item($existingOption);
@@ -3542,7 +3690,7 @@ S2.define('select2/data/array',[
       if (item.children) {
         var $children = this.convertToOptions(item.children);
 
-        Utils.appendMany($option, $children);
+        $option.append($children);
       }
 
       $options.push($option);
@@ -3601,7 +3749,7 @@ S2.define('select2/data/ajax',[
 
     if (this._request != null) {
       // JSONP requests cannot always be aborted
-      if ($.isFunction(this._request.abort)) {
+      if (typeof this._request.abort === 'function') {
         this._request.abort();
       }
 
@@ -3624,9 +3772,13 @@ S2.define('select2/data/ajax',[
       var $request = options.transport(options, function (data) {
         var results = self.processResults(data, params);
 
-        if (self.options.get('debug') && window.console && console.error) {
-          // Check to make sure that the response included a `results` key.
-          if (!results || !results.results || !$.isArray(results.results)) {
+        if (results && results.results && Array.isArray(results.results)) {
+          results.results = results.results.map(
+            AjaxAdapter.prototype._normalizeItem
+          );
+        } else {
+          if (self.options.get('debug') && window.console && console.error) {
+            // Check to make sure that the response included a `results` key.
             console.error(
               'Select2: The AJAX results did not return an array in the ' +
               '`results` key of the response.'
@@ -3638,7 +3790,7 @@ S2.define('select2/data/ajax',[
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
-        if ('status' in $request &&
+        if ($request && 'status' in $request &&
             ($request.status === 0 || $request.status === '0')) {
           return;
         }
@@ -3685,7 +3837,7 @@ S2.define('select2/data/tags',[
 
     decorated.call(this, $element, options);
 
-    if ($.isArray(tags)) {
+    if (Array.isArray(tags)) {
       for (var t = 0; t < tags.length; t++) {
         var tag = tags[t];
         var item = this._normalizeItem(tag);
@@ -3745,7 +3897,7 @@ S2.define('select2/data/tags',[
 
       if (tag != null) {
         var $option = self.option(tag);
-        $option.attr('data-select2-tag', true);
+        $option[0].setAttribute('data-select2-tag', 'true');
 
         self.addOptions([$option]);
 
@@ -3761,7 +3913,11 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype.createTag = function (decorated, params) {
-    var term = $.trim(params.term);
+    if (params.term == null) {
+      return null;
+    }
+
+    var term = params.term.trim();
 
     if (term === '') {
       return null;
@@ -3828,7 +3984,7 @@ S2.define('select2/data/tokenizer',[
       // If an existing option wasn't found for it, create the option
       if (!$existingOptions.length) {
         var $option = self.option(item);
-        $option.attr('data-select2-tag', true);
+        $option[0].setAttribute('data-select2-tag', true);
 
         self._removeOldTags();
         self.addOptions([$option]);
@@ -3876,7 +4032,7 @@ S2.define('select2/data/tokenizer',[
     while (i < term.length) {
       var termChar = term[i];
 
-      if ($.inArray(termChar, separators) === -1) {
+      if (separators.indexOf(termChar) === -1) {
         i++;
 
         continue;
@@ -4047,7 +4203,7 @@ S2.define('select2/dropdown',[
       '</span>'
     );
 
-    $dropdown.attr('dir', this.options.get('dir'));
+    $dropdown[0].setAttribute('dir', this.options.get('dir'));
 
     this.$dropdown = $dropdown;
 
@@ -4071,18 +4227,18 @@ S2.define('select2/dropdown',[
 });
 
 S2.define('select2/dropdown/search',[
-  'jquery',
-  '../utils'
-], function ($, Utils) {
+  'jquery'
+], function ($) {
   function Search () { }
 
   Search.prototype.render = function (decorated) {
     var $rendered = decorated.call(this);
+    var searchLabel = this.options.get('translations').get('search');
 
     var $search = $(
       '<span class="select2-search select2-search--dropdown">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
-        ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
+        ' autocorrect="off" autocapitalize="none"' +
         ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</span>'
     );
@@ -4090,6 +4246,9 @@ S2.define('select2/dropdown/search',[
     this.$searchContainer = $search;
     this.$search = $search.find('input');
 
+    this.$search[0].autocomplete = this.options.get('autocomplete');
+    this.$search[0].setAttribute('aria-label', searchLabel());
+
     $rendered.prepend($search);
 
     return $rendered;
@@ -4121,8 +4280,8 @@ S2.define('select2/dropdown/search',[
     });
 
     container.on('open', function () {
-      self.$search.attr('tabindex', 0);
-      self.$search.attr('aria-controls', resultsId);
+      self.$search[0].setAttribute('tabindex', 0);
+      self.$search[0].setAttribute('aria-controls', resultsId);
 
       self.$search.trigger('focus');
 
@@ -4132,9 +4291,9 @@ S2.define('select2/dropdown/search',[
     });
 
     container.on('close', function () {
-      self.$search.attr('tabindex', -1);
-      self.$search.removeAttr('aria-controls');
-      self.$search.removeAttr('aria-activedescendant');
+      self.$search[0].setAttribute('tabindex', -1);
+      self.$search[0].removeAttribute('aria-controls');
+      self.$search[0].removeAttribute('aria-activedescendant');
 
       self.$search.val('');
       self.$search.trigger('blur');
@@ -4151,18 +4310,19 @@ S2.define('select2/dropdown/search',[
         var showSearch = self.showSearch(params);
 
         if (showSearch) {
-          self.$searchContainer.removeClass('select2-search--hide');
+          self.$searchContainer[0].classList.remove('select2-search--hide');
         } else {
-          self.$searchContainer.addClass('select2-search--hide');
+          self.$searchContainer[0].classList.add('select2-search--hide');
         }
       }
     });
 
     container.on('results:focus', function (params) {
       if (params.data._resultId) {
-        self.$search.attr('aria-activedescendant', params.data._resultId);
+        self.$search[0]
+          .setAttribute('aria-activedescendant', params.data._resultId);
       } else {
-        self.$search.removeAttr('aria-activedescendant');
+        self.$search[0].removeAttribute('aria-activedescendant');
       }
     });
   };
@@ -4202,7 +4362,7 @@ S2.define('select2/dropdown/hidePlaceholder',[
   };
 
   HidePlaceholder.prototype.normalizePlaceholder = function (_, placeholder) {
-    if (typeof placeholder === 'string') {
+    if (typeof placeholder !== 'object') {
       placeholder = {
         id: '',
         text: placeholder
@@ -4363,10 +4523,10 @@ S2.define('select2/dropdown/attachBody',[
 
   AttachBody.prototype.position = function (decorated, $dropdown, $container) {
     // Clone all of the container classes
-    $dropdown.attr('class', $container.attr('class'));
+    $dropdown[0].setAttribute('class', $container[0].getAttribute('class'));
 
-    $dropdown.removeClass('select2');
-    $dropdown.addClass('select2-container--open');
+    $dropdown[0].classList.remove('select2');
+    $dropdown[0].classList.add('select2-container--open');
 
     $dropdown.css({
       position: 'absolute',
@@ -4472,8 +4632,10 @@ S2.define('select2/dropdown/attachBody',[
   AttachBody.prototype._positionDropdown = function () {
     var $window = $(window);
 
-    var isCurrentlyAbove = this.$dropdown.hasClass('select2-dropdown--above');
-    var isCurrentlyBelow = this.$dropdown.hasClass('select2-dropdown--below');
+    var isCurrentlyAbove = this.$dropdown[0].classList
+      .contains('select2-dropdown--above');
+    var isCurrentlyBelow = this.$dropdown[0].classList
+      .contains('select2-dropdown--below');
 
     var newDirection = null;
 
@@ -4545,12 +4707,13 @@ S2.define('select2/dropdown/attachBody',[
     }
 
     if (newDirection != null) {
-      this.$dropdown
-        .removeClass('select2-dropdown--below select2-dropdown--above')
-        .addClass('select2-dropdown--' + newDirection);
-      this.$container
-        .removeClass('select2-container--below select2-container--above')
-        .addClass('select2-container--' + newDirection);
+      this.$dropdown[0].classList.remove('select2-dropdown--below');
+      this.$dropdown[0].classList.remove('select2-dropdown--above');
+      this.$dropdown[0].classList.add('select2-dropdown--' + newDirection);
+
+      this.$container[0].classList.remove('select2-container--below');
+      this.$container[0].classList.remove('select2-container--above');
+      this.$container[0].classList.add('select2-container--' + newDirection);
     }
 
     this.$dropdownContainer.css(css);
@@ -4707,6 +4870,66 @@ S2.define('select2/dropdown/closeOnSelect',[
   return CloseOnSelect;
 });
 
+S2.define('select2/dropdown/dropdownCss',[
+  '../utils'
+], function (Utils) {
+  function DropdownCSS () { }
+
+  DropdownCSS.prototype.render = function (decorated) {
+    var $dropdown = decorated.call(this);
+
+    var dropdownCssClass = this.options.get('dropdownCssClass') || '';
+
+    if (dropdownCssClass.indexOf(':all:') !== -1) {
+      dropdownCssClass = dropdownCssClass.replace(':all:', '');
+
+      Utils.copyNonInternalCssClasses($dropdown[0], this.$element[0]);
+    }
+
+    dropdownCssClass.trim().split(' ').forEach(function(cssClass) {
+      if(cssClass.length > 0) {
+        $dropdown[0].classList.add(cssClass);
+      }
+    });
+
+    return $dropdown;
+  };
+
+  return DropdownCSS;
+});
+
+S2.define('select2/dropdown/tagsSearchHighlight',[
+  '../utils'
+], function (Utils) {
+  function TagsSearchHighlight () { }
+
+  TagsSearchHighlight.prototype.highlightFirstItem = function (decorated) {
+    var $options = this.$results
+    .find(
+      '.select2-results__option--selectable' +
+      ':not(.select2-results__option--selected)'
+    );
+
+    if ($options.length > 0) {
+      var $firstOption = $options.first();
+      var data = Utils.GetData($firstOption[0], 'data');
+      var firstElement = data.element;
+
+      if (firstElement && firstElement.getAttribute) {
+        if (firstElement.getAttribute('data-select2-tag') === 'true') {
+          $firstOption.trigger('mouseenter');
+
+          return;
+        }
+      }
+    }
+
+    decorated.call(this);
+  };
+
+  return TagsSearchHighlight;
+});
+
 S2.define('select2/i18n/en',[],function () {
   // English
   return {
@@ -4751,13 +4974,18 @@ S2.define('select2/i18n/en',[],function () {
     },
     removeAllItems: function () {
       return 'Remove all items';
+    },
+    removeItem: function () {
+      return 'Remove item';
+    },
+    search: function() {
+      return 'Search';
     }
   };
 });
 
 S2.define('select2/defaults',[
   'jquery',
-  'require',
 
   './results',
 
@@ -4766,6 +4994,7 @@ S2.define('select2/defaults',[
   './selection/placeholder',
   './selection/allowClear',
   './selection/search',
+  './selection/selectionCss',
   './selection/eventRelay',
 
   './utils',
@@ -4789,14 +5018,16 @@ S2.define('select2/defaults',[
   './dropdown/minimumResultsForSearch',
   './dropdown/selectOnClose',
   './dropdown/closeOnSelect',
+  './dropdown/dropdownCss',
+  './dropdown/tagsSearchHighlight',
 
   './i18n/en'
-], function ($, require,
+], function ($,
 
              ResultsList,
 
              SingleSelection, MultipleSelection, Placeholder, AllowClear,
-             SelectionSearch, EventRelay,
+             SelectionSearch, SelectionCSS, EventRelay,
 
              Utils, Translation, DIACRITICS,
 
@@ -4805,6 +5036,7 @@ S2.define('select2/defaults',[
 
              Dropdown, DropdownSearch, HidePlaceholder, InfiniteScroll,
              AttachBody, MinimumResultsForSearch, SelectOnClose, CloseOnSelect,
+             DropdownCSS, TagsSearchHighlight,
 
              EnglishTranslation) {
   function Defaults () {
@@ -4854,24 +5086,6 @@ S2.define('select2/defaults',[
           Tokenizer
         );
       }
-
-      if (options.query != null) {
-        var Query = require(options.amdBase + 'compat/query');
-
-        options.dataAdapter = Utils.Decorate(
-          options.dataAdapter,
-          Query
-        );
-      }
-
-      if (options.initSelection != null) {
-        var InitSelection = require(options.amdBase + 'compat/initSelection');
-
-        options.dataAdapter = Utils.Decorate(
-          options.dataAdapter,
-          InitSelection
-        );
-      }
     }
 
     if (options.resultsAdapter == null) {
@@ -4897,6 +5111,13 @@ S2.define('select2/defaults',[
           SelectOnClose
         );
       }
+
+      if (options.tags) {
+        options.resultsAdapter = Utils.Decorate(
+          options.resultsAdapter,
+          TagsSearchHighlight
+        );
+      }
     }
 
     if (options.dropdownAdapter == null) {
@@ -4922,13 +5143,7 @@ S2.define('select2/defaults',[
         );
       }
 
-      if (
-        options.dropdownCssClass != null ||
-        options.dropdownCss != null ||
-        options.adaptDropdownCssClass != null
-      ) {
-        var DropdownCSS = require(options.amdBase + 'compat/dropdownCss');
-
+      if (options.dropdownCssClass != null) {
         options.dropdownAdapter = Utils.Decorate(
           options.dropdownAdapter,
           DropdownCSS
@@ -4970,16 +5185,10 @@ S2.define('select2/defaults',[
         );
       }
 
-      if (
-        options.containerCssClass != null ||
-        options.containerCss != null ||
-        options.adaptContainerCssClass != null
-      ) {
-        var ContainerCSS = require(options.amdBase + 'compat/containerCss');
-
+      if (options.selectionCssClass != null) {
         options.selectionAdapter = Utils.Decorate(
           options.selectionAdapter,
-          ContainerCSS
+          SelectionCSS
         );
       }
 
@@ -5028,7 +5237,7 @@ S2.define('select2/defaults',[
 
     function matcher (params, data) {
       // Always return the object if there is nothing to compare
-      if ($.trim(params.term) === '') {
+      if (params.term == null || params.term.trim() === '') {
         return data;
       }
 
@@ -5072,8 +5281,8 @@ S2.define('select2/defaults',[
     }
 
     this.defaults = {
-      amdBase: './',
       amdLanguageBase: './i18n/',
+      autocomplete: 'off',
       closeOnSelect: true,
       debug: false,
       dropdownAutoWidth: false,
@@ -5103,8 +5312,9 @@ S2.define('select2/defaults',[
   Defaults.prototype.applyFromElement = function (options, $element) {
     var optionLanguage = options.language;
     var defaultLanguage = this.defaults.language;
-    var elementLanguage = $element.prop('lang');
-    var parentLanguage = $element.closest('[lang]').prop('lang');
+    var elementLanguage = $element[0].lang;
+    var elementClosest = $element.closest('[lang]');
+    var parentLanguage = elementClosest[0] ? elementClosest[0].lang : null;
 
     var languages = Array.prototype.concat.call(
       this._resolveLanguage(elementLanguage),
@@ -5133,7 +5343,7 @@ S2.define('select2/defaults',[
 
     var languages;
 
-    if (!$.isArray(language)) {
+    if (!Array.isArray(language)) {
       languages = [language];
     } else {
       languages = language;
@@ -5198,7 +5408,10 @@ S2.define('select2/defaults',[
   };
 
   Defaults.prototype.set = function (key, value) {
-    var camelKey = $.camelCase(key);
+    function upperCaseLetter(_, letter) {
+      return letter.toUpperCase();
+    }
+    var camelKey = key.replace(/-([a-z])/g, upperCaseLetter);
 
     var data = {};
     data[camelKey] = value;
@@ -5214,11 +5427,10 @@ S2.define('select2/defaults',[
 });
 
 S2.define('select2/options',[
-  'require',
   'jquery',
   './defaults',
   './utils'
-], function (require, $, Defaults, Utils) {
+], function ($, Defaults, Utils) {
   function Options (options, $element) {
     this.options = options;
 
@@ -5231,40 +5443,41 @@ S2.define('select2/options',[
     }
 
     this.options = Defaults.apply(this.options);
-
-    if ($element && $element.is('input')) {
-      var InputCompat = require(this.get('amdBase') + 'compat/inputData');
-
-      this.options.dataAdapter = Utils.Decorate(
-        this.options.dataAdapter,
-        InputCompat
-      );
-    }
   }
 
   Options.prototype.fromElement = function ($e) {
     var excludedData = ['select2'];
 
     if (this.options.multiple == null) {
-      this.options.multiple = $e.prop('multiple');
+      this.options.multiple = $e[0].multiple;
     }
 
     if (this.options.disabled == null) {
-      this.options.disabled = $e.prop('disabled');
+      this.options.disabled = $e[0].disabled;
     }
 
-    if (this.options.dir == null) {
-      if ($e.prop('dir')) {
-        this.options.dir = $e.prop('dir');
-      } else if ($e.closest('[dir]').prop('dir')) {
-        this.options.dir = $e.closest('[dir]').prop('dir');
+    if (this.options.autocomplete == null && $e[0].autocomplete) {
+      this.options.autocomplete = $e[0].autocomplete;
+    }
+
+    if (this.options.dir === null) {
+      var dirValue = $e[0].getAttribute('dir');
+
+      if (dirValue) {
+        this.options.dir = dirValue;
       } else {
-        this.options.dir = 'ltr';
+        var closestDirValue = $e.closest('[dir]').getAttribute('dir');
+
+        if (closestDirValue) {
+          this.options.dir = closestDirValue;
+        } else {
+          this.options.dir = 'ltr';
+        }
       }
     }
 
-    $e.prop('disabled', this.options.disabled);
-    $e.prop('multiple', this.options.multiple);
+    $e[0].disabled = this.options.disabled;
+    $e[0].multiple = this.options.multiple;
 
     if (Utils.GetData($e[0], 'select2Tags')) {
       if (this.options.debug && window.console && console.warn) {
@@ -5288,7 +5501,7 @@ S2.define('select2/options',[
         );
       }
 
-      $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
+      $e[0].setAttribute('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
       Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl'));
     }
 
@@ -5331,7 +5544,7 @@ S2.define('select2/options',[
     data = Utils._convertData(data);
 
     for (var key in data) {
-      if ($.inArray(key, excludedData) > -1) {
+      if (excludedData.indexOf(key) > -1) {
         continue;
       }
 
@@ -5379,9 +5592,9 @@ S2.define('select2/core',[
 
     // Set up the tabindex
 
-    var tabindex = $element.attr('tabindex') || 0;
+    var tabindex = $element[0].getAttribute('tabindex') || 0;
     Utils.StoreData($element[0], 'old-tabindex', tabindex);
-    $element.attr('tabindex', '-1');
+    $element[0].setAttribute('tabindex', '-1');
 
     // Set up containers and adapters
 
@@ -5435,8 +5648,8 @@ S2.define('select2/core',[
     });
 
     // Hide the original select
-    $element.addClass('select2-hidden-accessible');
-    $element.attr('aria-hidden', 'true');
+    $element[0].classList.add('select2-hidden-accessible');
+    $element[0].setAttribute('aria-hidden', 'true');
 
     // Synchronize any monitored attributes
     this._syncAttributes();
@@ -5451,11 +5664,12 @@ S2.define('select2/core',[
 
   Select2.prototype._generateId = function ($element) {
     var id = '';
+    var element = $element[0];
 
-    if ($element.attr('id') != null) {
-      id = $element.attr('id');
-    } else if ($element.attr('name') != null) {
-      id = $element.attr('name') + '-' + Utils.generateChars(2);
+    if (element != null && element.getAttribute('id') != null) {
+      id = element.getAttribute('id');
+    } else if (element != null && element.getAttribute('name') != null) {
+      id = element.getAttribute('name') + '-' + Utils.generateChars(2);
     } else {
       id = Utils.generateChars(4);
     }
@@ -5500,7 +5714,7 @@ S2.define('select2/core',[
     }
 
     if (method == 'style') {
-      var style = $element.attr('style');
+      var style = $element[0].getAttribute('style');
 
       if (typeof(style) !== 'string') {
         return null;
@@ -5555,42 +5769,15 @@ S2.define('select2/core',[
     this._syncA = Utils.bind(this._syncAttributes, this);
     this._syncS = Utils.bind(this._syncSubtree, this);
 
-    if (this.$element[0].attachEvent) {
-      this.$element[0].attachEvent('onpropertychange', this._syncA);
-    }
-
-    var observer = window.MutationObserver ||
-      window.WebKitMutationObserver ||
-      window.MozMutationObserver
-    ;
-
-    if (observer != null) {
-      this._observer = new observer(function (mutations) {
-        self._syncA();
-        self._syncS(null, mutations);
-      });
-      this._observer.observe(this.$element[0], {
-        attributes: true,
-        childList: true,
-        subtree: false
-      });
-    } else if (this.$element[0].addEventListener) {
-      this.$element[0].addEventListener(
-        'DOMAttrModified',
-        self._syncA,
-        false
-      );
-      this.$element[0].addEventListener(
-        'DOMNodeInserted',
-        self._syncS,
-        false
-      );
-      this.$element[0].addEventListener(
-        'DOMNodeRemoved',
-        self._syncS,
-        false
-      );
-    }
+    this._observer = new window.MutationObserver(function (mutations) {
+      self._syncA();
+      self._syncS(mutations);
+    });
+    this._observer.observe(this.$element[0], {
+      attributes: true,
+      childList: true,
+      subtree: false
+    });
   };
 
   Select2.prototype._registerDataEvents = function () {
@@ -5614,7 +5801,7 @@ S2.define('select2/core',[
     });
 
     this.selection.on('*', function (name, params) {
-      if ($.inArray(name, nonRelayEvents) !== -1) {
+      if (nonRelayEvents.indexOf(name) !== -1) {
         return;
       }
 
@@ -5642,23 +5829,23 @@ S2.define('select2/core',[
     var self = this;
 
     this.on('open', function () {
-      self.$container.addClass('select2-container--open');
+      self.$container[0].classList.add('select2-container--open');
     });
 
     this.on('close', function () {
-      self.$container.removeClass('select2-container--open');
+      self.$container[0].classList.remove('select2-container--open');
     });
 
     this.on('enable', function () {
-      self.$container.removeClass('select2-container--disabled');
+      self.$container[0].classList.remove('select2-container--disabled');
     });
 
     this.on('disable', function () {
-      self.$container.addClass('select2-container--disabled');
+      self.$container[0].classList.add('select2-container--disabled');
     });
 
     this.on('blur', function () {
-      self.$container.removeClass('select2-container--focus');
+      self.$container[0].classList.remove('select2-container--focus');
     });
 
     this.on('query', function (params) {
@@ -5687,12 +5874,11 @@ S2.define('select2/core',[
       var key = evt.which;
 
       if (self.isOpen()) {
-        if (key === KEYS.ESC || key === KEYS.TAB ||
-            (key === KEYS.UP && evt.altKey)) {
+        if (key === KEYS.ESC || (key === KEYS.UP && evt.altKey)) {
           self.close(evt);
 
           evt.preventDefault();
-        } else if (key === KEYS.ENTER) {
+        } else if (key === KEYS.ENTER || key === KEYS.TAB) {
           self.trigger('results:select', {});
 
           evt.preventDefault();
@@ -5721,7 +5907,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype._syncAttributes = function () {
-    this.options.set('disabled', this.$element.prop('disabled'));
+    this.options.set('disabled', this.$element[0].disabled);
 
     if (this.isDisabled()) {
       if (this.isOpen()) {
@@ -5734,49 +5920,30 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._isChangeMutation = function (evt, mutations) {
-    var changed = false;
+  Select2.prototype._isChangeMutation = function (mutations) {
     var self = this;
 
-    // Ignore any mutation events raised for elements that aren't options or
-    // optgroups. This handles the case when the select element is destroyed
-    if (
-      evt && evt.target && (
-        evt.target.nodeName !== 'OPTION' && evt.target.nodeName !== 'OPTGROUP'
-      )
-    ) {
-      return;
-    }
-
-    if (!mutations) {
-      // If mutation events aren't supported, then we can only assume that the
-      // change affected the selections
-      changed = true;
-    } else if (mutations.addedNodes && mutations.addedNodes.length > 0) {
+    if (mutations.addedNodes && mutations.addedNodes.length > 0) {
       for (var n = 0; n < mutations.addedNodes.length; n++) {
         var node = mutations.addedNodes[n];
 
         if (node.selected) {
-          changed = true;
+          return true;
         }
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
-      changed = true;
-    } else if ($.isArray(mutations)) {
-      $.each(mutations, function(evt, mutation) {
-        if (self._isChangeMutation(evt, mutation)) {
-          // We've found a change mutation.
-          // Let's escape from the loop and continue
-          changed = true;
-          return false;
-        }
+      return true;
+    } else if (Array.isArray(mutations)) {
+      return mutations.some(function (mutation) {
+        return self._isChangeMutation(mutation);
       });
     }
-    return changed;
+
+    return false;
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
-    var changed = this._isChangeMutation(evt, mutations);
+  Select2.prototype._syncSubtree = function (mutations) {
+    var changed = this._isChangeMutation(mutations);
     var self = this;
 
     // Only re-pull the data if we think there is a change
@@ -5881,11 +6048,11 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.isOpen = function () {
-    return this.$container.hasClass('select2-container--open');
+    return this.$container[0].classList.contains('select2-container--open');
   };
 
   Select2.prototype.hasFocus = function () {
-    return this.$container.hasClass('select2-container--focus');
+    return this.$container[0].classList.contains('select2-container--focus');
   };
 
   Select2.prototype.focus = function (data) {
@@ -5894,7 +6061,7 @@ S2.define('select2/core',[
       return;
     }
 
-    this.$container.addClass('select2-container--focus');
+    this.$container[0].classList.add('select2-container--focus');
     this.trigger('focus', {});
   };
 
@@ -5902,7 +6069,7 @@ S2.define('select2/core',[
     if (this.options.get('debug') && window.console && console.warn) {
       console.warn(
         'Select2: The `select2("enable")` method has been deprecated and will' +
-        ' be removed in later Select2 versions. Use $element.prop("disabled")' +
+        ' be removed in later Select2 versions. Use $element[0].disabled' +
         ' instead.'
       );
     }
@@ -5913,7 +6080,7 @@ S2.define('select2/core',[
 
     var disabled = !args[0];
 
-    this.$element.prop('disabled', disabled);
+    this.$element[0].disabled = disabled;
   };
 
   Select2.prototype.data = function () {
@@ -5948,8 +6115,8 @@ S2.define('select2/core',[
 
     var newVal = args[0];
 
-    if ($.isArray(newVal)) {
-      newVal = $.map(newVal, function (obj) {
+    if (Array.isArray(newVal)) {
+      newVal = newVal.map(function (obj) {
         return obj.toString();
       });
     }
@@ -5958,33 +6125,21 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.destroy = function () {
+    Utils.RemoveData(this.$container[0]);
     this.$container.remove();
 
-    if (this.$element[0].detachEvent) {
-      this.$element[0].detachEvent('onpropertychange', this._syncA);
-    }
-
-    if (this._observer != null) {
-      this._observer.disconnect();
-      this._observer = null;
-    } else if (this.$element[0].removeEventListener) {
-      this.$element[0]
-        .removeEventListener('DOMAttrModified', this._syncA, false);
-      this.$element[0]
-        .removeEventListener('DOMNodeInserted', this._syncS, false);
-      this.$element[0]
-        .removeEventListener('DOMNodeRemoved', this._syncS, false);
-    }
+    this._observer.disconnect();
+    this._observer = null;
 
     this._syncA = null;
     this._syncS = null;
 
     this.$element.off('.select2');
-    this.$element.attr('tabindex',
+    this.$element[0].setAttribute('tabindex',
     Utils.GetData(this.$element[0], 'old-tabindex'));
 
-    this.$element.removeClass('select2-hidden-accessible');
-    this.$element.attr('aria-hidden', 'false');
+    this.$element[0].classList.remove('select2-hidden-accessible');
+    this.$element[0].setAttribute('aria-hidden', 'false');
     Utils.RemoveData(this.$element[0]);
     this.$element.removeData('select2');
 
@@ -6007,11 +6162,12 @@ S2.define('select2/core',[
       '</span>'
     );
 
-    $container.attr('dir', this.options.get('dir'));
+    $container[0].setAttribute('dir', this.options.get('dir'));
 
     this.$container = $container;
 
-    this.$container.addClass('select2-container--' + this.options.get('theme'));
+    this.$container[0].classList
+      .add('select2-container--' + this.options.get('theme'));
 
     Utils.StoreData($container[0], 'element', this.$element);
 
@@ -6069,7 +6225,7 @@ S2.define('jquery.select2',[
         });
 
         // Check if we should be returning `this`
-        if ($.inArray(options, thisMethods) > -1) {
+        if (thisMethods.indexOf(options) > -1) {
           return this;
         }
 
diff --git a/assets/vendor/select2/select2.min.css b/assets/vendor/select2/select2.min.css
index 7c18ad5..e079918 100644
--- a/assets/vendor/select2/select2.min.css
+++ b/assets/vendor/select2/select2.min.css
@@ -1 +1 @@
-.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{background-color:rgba(0,0,0,0);border:none;font-size:1em}.select2-container[dir=rtl] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline;list-style:none;padding:0}.select2-container .select2-selection--multiple .select2-selection__clear{background-color:rgba(0,0,0,0);border:none;font-size:1em}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;margin-left:5px;padding:0;max-width:100%;resize:none;height:20px;vertical-align:bottom;font-family:sans-serif;overflow:hidden;word-break:keep-all}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-container .select2-search--inline .select2-search__field::placeholder{line-height:normal}.select2-dropdown{background-color:#fff;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option--selectable{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;height:26px;margin-right:20px;padding-right:0px}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0);border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir=rtl] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:rgba(0,0,0,0) rgba(0,0,0,0) #888 rgba(0,0,0,0);border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:#fff;border:1px solid #aaa;border-radius:4px;cursor:text;padding-bottom:5px;padding-right:5px;position:relative}.select2-container--default .select2-selection--multiple.select2-selection--clearable{padding-right:25px}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;font-weight:bold;height:20px;margin-right:10px;margin-top:5px;position:absolute;right:0;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:inline-block;margin-left:5px;margin-top:5px;padding:0;padding-left:20px;position:relative;max-width:100%;overflow:hidden;text-overflow:ellipsis;vertical-align:bottom;white-space:nowrap}.select2-container--default .select2-selection--multiple .select2-selection__choice__display{cursor:default;padding-left:2px;padding-right:5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{background-color:rgba(0,0,0,0);border:none;border-right:1px solid #aaa;border-top-left-radius:4px;border-bottom-left-radius:4px;color:#999;cursor:pointer;font-size:1em;font-weight:bold;padding:0 4px;position:absolute;left:0;top:0}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover,.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:focus{background-color:#f1f1f1;color:#333;outline:none}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice{padding:0 20px 0 0;margin-left:5px;margin-right:auto}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice__display{padding-left:5px;padding-right:2px}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove{left:auto;right:0;border-left:1px solid #aaa;border-right:none;border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:4px;border-bottom-right-radius:4px}.select2-container--default[dir=rtl] .select2-selection--multiple .select2-selection__clear{float:left;margin-left:10px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid #000 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:rgba(0,0,0,0);border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--group{padding:0}.select2-container--default .select2-results__option--disabled{color:#999}.select2-container--default .select2-results__option--selected{background-color:#ddd}.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable{background-color:#5897fb;color:#fff}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:rgb(246.5,246.5,246.5);border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, white 50%, #eeeeee 100%);background-image:-o-linear-gradient(top, white 50%, #eeeeee 100%);background-image:linear-gradient(to bottom, white 50%, #eeeeee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;height:26px;margin-right:20px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);background-image:-o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);background-image:linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0);border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir=rtl] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:rgba(0,0,0,0);border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:rgba(0,0,0,0) rgba(0,0,0,0) #888 rgba(0,0,0,0);border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, white 0%, #eeeeee 50%);background-image:-o-linear-gradient(top, white 0%, #eeeeee 50%);background-image:linear-gradient(to bottom, white 0%, #eeeeee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eeeeee 50%, white 100%);background-image:-o-linear-gradient(top, #eeeeee 50%, white 100%);background-image:linear-gradient(to bottom, #eeeeee 50%, white 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:#fff;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0;padding-bottom:5px;padding-right:5px}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;display:inline-block;margin-left:5px;margin-top:5px;padding:0}.select2-container--classic .select2-selection--multiple .select2-selection__choice__display{cursor:default;padding-left:2px;padding-right:5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{background-color:rgba(0,0,0,0);border:none;border-top-left-radius:4px;border-bottom-left-radius:4px;color:#888;cursor:pointer;font-size:1em;font-weight:bold;padding:0 4px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555;outline:none}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice__display{padding-left:5px;padding-right:2px}.select2-container--classic[dir=rtl] .select2-selection--multiple .select2-selection__choice__remove{border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:4px;border-bottom-right-radius:4px}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid rgba(0,0,0,0)}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option--group{padding:0}.select2-container--classic .select2-results__option--disabled{color:gray}.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
\ No newline at end of file
diff --git a/assets/vendor/select2/select2.min.js b/assets/vendor/select2/select2.min.js
index 091d4b5..f13b190 100644
--- a/assets/vendor/select2/select2.min.js
+++ b/assets/vendor/select2/select2.min.js
@@ -1,2 +1,2 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(u){var e=function(){if(u&&u.fn&&u.fn.select2&&u.fn.select2.amd)var e=u.fn.select2.amd;var t,n,r,h,o,s,f,g,m,v,y,_,i,a,b;function w(e,t){return i.call(e,t)}function l(e,t){var n,r,i,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&b.test(e[s])&&(e[s]=e[s].replace(b,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),--u;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;--u){if(r=n.slice(0,u).join("/"),h)for(d=h.length;0<d;--d)if(i=(i=f[h.slice(0,d).join("/")])&&i[r]){o=i,a=u;break}if(o)break;!l&&g&&g[r]&&(l=g[r],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(w(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!w(m,e)&&!w(_,e))throw new Error("No "+e);return m[e]}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?c(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},i=Object.prototype.hasOwnProperty,a=[].slice,b=/\.js$/,f=function(e,t){var n,r,i=c(e),o=i[0],s=t[1];return e=i[1],o&&(n=D(o=l(o,s))),o?e=n&&n.normalize?n.normalize(e,(r=s,function(e){return l(e,r)})):l(e,s):(o=(i=c(e=l(e,s)))[0],e=i[1],o&&(n=D(o))),{f:o?o+"!"+e:e,n:e,pr:o,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:(t=e,function(){return y&&y.config&&y.config[t]||{}})};var t}},o=function(e,t,n,r){var i,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(r=r||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)i=d[l]=g.module(e);else if(w(m,o)||w(v,o)||w(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(r,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(i&&i.exports!==h&&i.exports!==m[e]?m[e]=i.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,r,i){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=r,r=i),r?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(r=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),w(m,e)||w(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=r),e.define("almond",function(){}),e.define("jquery",[],function(){var e=u||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var i={};function u(e){var t=e.prototype,n=[];for(var r in t){"function"==typeof t[r]&&"constructor"!==r&&n.push(r)}return n}i.Extend=function(e,t){var n={}.hasOwnProperty;function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},i.Decorate=function(r,i){var e=u(i),t=u(r);function o(){var e=Array.prototype.unshift,t=i.prototype.constructor.length,n=r.prototype.constructor;0<t&&(e.call(arguments,r.prototype.constructor),n=i.prototype.constructor),n.apply(this,arguments)}i.displayName=r.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=r.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=i.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,r=e.length;n<r;n++)e[n].apply(this,t)},i.Observable=e,i.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},i.bind=function(e,t){return function(){e.apply(t,arguments)}},i._convertData=function(e){for(var t in e){var n=t.split("-"),r=e;if(1!==n.length){for(var i=0;i<n.length;i++){var o=n[i];(o=o.substring(0,1).toLowerCase()+o.substring(1))in r||(r[o]={}),i==n.length-1&&(r[o]=e[t]),r=r[o]}delete e[t]}}return e},i.hasScroll=function(e,t){var n=o(t),r=t.style.overflowX,i=t.style.overflowY;return(r!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===r||"scroll"===i||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},i.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},i.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},i.__cache={};var n=0;return i.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},i.StoreData=function(e,t,n){var r=i.GetUniqueElementId(e);i.__cache[r]||(i.__cache[r]={}),i.__cache[r][t]=n},i.GetData=function(e,t){var n=i.GetUniqueElementId(e);return t?i.__cache[n]&&null!=i.__cache[n][t]?i.__cache[n][t]:o(e).data(t):i.__cache[n]},i.RemoveData=function(e){var t=i.GetUniqueElementId(e);null!=i.__cache[t]&&delete i.__cache[t],e.removeAttribute("data-select2-id")},i}),e.define("select2/results",["jquery","./utils"],function(h,f){function r(e,t,n){this.$element=e,this.data=n,this.options=t,r.__super__.constructor.call(this)}return f.Extend(r,f.Observable),r.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},r.prototype.clear=function(){this.$results.empty()},r.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),r=this.options.get("translations").get(e.message);n.append(t(r(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},r.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},r.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var r=e.results[n],i=this.option(r);t.push(i)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},r.prototype.position=function(e,t){t.find(".select2-results").append(e)},r.prototype.sort=function(e){return this.options.get("sorter")(e)},r.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},r.prototype.setClasses=function(){var t=this;this.data.current(function(e){var r=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,r)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},r.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},r.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},r.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},r=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var i in(null!=e.element&&r.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[i];t.setAttribute(i,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},r.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var r=n-1;0===e.length&&(r=0);var i=t.eq(r);i.trigger("mouseenter");var o=l.$results.offset().top,s=i.offset().top,a=l.$results.scrollTop()+(s-o);0===r?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var r=t.eq(n);r.trigger("mouseenter");var i=l.$results.offset().top+l.$results.outerHeight(!1),o=r.offset().top+r.outerHeight(!1),s=l.$results.scrollTop()+o-i;0===n?l.$results.scrollTop(0):i<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,r=0<e.deltaY&&t-e.deltaY<=0,i=e.deltaY<0&&n<=l.$results.height();r?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):i&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},r.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},r.prototype.destroy=function(){this.$results.remove()},r.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,r=e.offset().top,i=this.$results.scrollTop()+(r-n),o=r-n;i-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(i)}},r.prototype.template=function(e,t){var n=this.options.get("templateResult"),r=this.options.get("escapeMarkup"),i=n(e,t);null==i?t.style.display="none":"string"==typeof i?t.innerHTML=r(i):h(t).append(i)},r}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,r,i){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return r.Extend(o,r.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=r.GetData(this.$element[0],"old-tabindex")?this._tabindex=r.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,r=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===i.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",r),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&r.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,r){function i(){i.__super__.constructor.apply(this,arguments)}return n.Extend(i,t),i.prototype.render=function(){var e=i.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},i.prototype.bind=function(t,e){var n=this;i.__super__.bind.apply(this,arguments);var r=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",r).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",r),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},i.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},i.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},i.prototype.selectionContainer=function(){return e("<span></span>")},i.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),r=this.display(t,n);n.empty().append(r);var i=t.title||t.text;i?n.attr("title",i):n.removeAttr("title")}else this.clear()},i}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(i,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var r=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){r.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!r.isDisabled()){var t=i(this).parent(),n=l.GetData(t[0],"data");r.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return i('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var r=e[n],i=this.selectionContainer(),o=this.display(r,i);i.append(o);var s=r.title||r.text;s&&i.attr("title",s),l.StoreData(i[0],"data",r),t.push(i)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var r=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(r)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(i,r,a){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){r._handleClear(e)}),t.on("keypress",function(e){r._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var r=a.GetData(n[0],"data"),i=this.$element.val();this.$element.val(this.placeholder.id);var o={data:r};if(this.trigger("clear",o),o.prevented)this.$element.val(i);else{for(var s=0;s<r.length;s++)if(o={data:r[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(i);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=r.DELETE&&t.which!=r.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),r=i('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(r[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(r)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(r,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=r('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),t.on("open",function(){r.$search.attr("aria-controls",i),r.$search.trigger("focus")}),t.on("close",function(){r.$search.val(""),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.trigger("focus")}),t.on("enable",function(){r.$search.prop("disabled",!1),r._transferTabIndex()}),t.on("disable",function(){r.$search.prop("disabled",!0)}),t.on("focus",function(e){r.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){r.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){r._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===r.$search.val()){var t=r.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");r.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){r.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?r.$selection.off("input.search input.searchcheck"):r.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)r.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&r.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var r=this,i=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,i)){t=t||{};var n=s.Event("select2:"+e,{params:t});r.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function r(e){this.dict=e||{}}return r.prototype.all=function(){return this.dict},r.prototype.get=function(e){return this.dict[e]},r.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},r._cache={},r.loadPath=function(e){if(!(e in r._cache)){var t=n(e);r._cache[e]=t}return new r(r._cache[e])},r}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(r){function n(e,t){n.__super__.constructor.call(this)}return r.Extend(n,r.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=r.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+r.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],r=this;this.$element.find(":selected").each(function(){var e=l(this),t=r.item(e);n.push(t)}),e(n)},n.prototype.select=function(i){var o=this;if(i.selected=!0,l(i.element).is("option"))return i.element.selected=!0,void this.$element.trigger("input").trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(i=[i]).push.apply(i,e);for(var n=0;n<i.length;n++){var r=i[n].id;-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")});else{var e=i.id;this.$element.val(e),this.$element.trigger("input").trigger("change")}},n.prototype.unselect=function(i){var o=this;if(this.$element.prop("multiple")){if(i.selected=!1,l(i.element).is("option"))return i.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var r=e[n].id;r!==i.id&&-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(r,e){var i=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(r,t);null!==n&&i.push(n)}}),e({results:i})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),r=this._normalizeItem(e);return r.element=t,a.StoreData(t,"data",r),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),r=[],i=0;i<n.length;i++){var o=l(n[i]),s=this.item(o);r.push(s)}t.children=r}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function r(e,t){this._dataToConvert=t.get("data")||[],r.__super__.constructor.call(this,e,t)}return f.Extend(r,e),r.prototype.bind=function(e,t){r.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},r.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),r.__super__.select.call(this,n)},r.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),r=n.map(function(){return t.item(g(this)).id}).get(),i=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,r)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}i.push(p)}}return i},r}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var r=o.ajax(e);return r.then(t),r.fail(n),r}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,r){var i=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=i.processResults(e,n);i.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),r(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||i.trigger("results:message",{message:"errorLoading"})});i._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var r=n.get("tags"),i=n.get("createTag");void 0!==i&&(this.createTag=i);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(r))for(var s=0;s<r.length;s++){var a=r[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var r=t.results,i=0;i<r.length;i++){var o=r[i],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=r,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(r,a)}t.results=r,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var r=n.get("tokenizer");void 0!==r&&(this.tokenizer=r),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var i=this;t.term=t.term||"";var r=this.tokenizer(t,this.options,function(e){var t,n=i._normalizeItem(e);if(!i.$element.find("option").filter(function(){return d(this).val()===n.id}).length){var r=i.option(n);r.attr("data-select2-tag",!0),i._removeOldTags(),i.addOptions([r])}t=n,i.trigger("select",{data:t})});r.term!==t.term&&(this.$search.length&&(this.$search.val(r.term),this.$search.trigger("focus")),t.term=r.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,r){for(var i=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,i)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(r(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(){r._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var r=this;this._checkIfMaximumSelected(function(){e.call(r,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var r=this;this.current(function(e){var t=null!=e?e.length:0;0<r.maximumSelectionLength&&t>=r.maximumSelectionLength?r.trigger("results:message",{message:"maximumSelected",args:{maximum:r.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){r.handleSearch(e)}),t.on("open",function(){r.$search.attr("tabindex",0),r.$search.attr("aria-controls",i),r.$search.trigger("focus"),window.setTimeout(function(){r.$search.trigger("focus")},0)}),t.on("close",function(){r.$search.attr("tabindex",-1),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.val(""),r.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||r.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(r.showSearch(e)?r.$searchContainer.removeClass("select2-search--hide"):r.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,r){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,r)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),r=t.length-1;0<=r;r--){var i=t[r];this.placeholder.id===i.id&&n.splice(r,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,r){this.lastParams={},e.call(this,t,n,r),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("query",function(e){r.lastParams=e,r.loading=!0}),t.on("query:append",function(e){r.lastParams=e,r.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("open",function(){r._showDropdown(),r._attachPositioningHandler(t),r._bindContainerResultHandlers(t)}),t.on("close",function(){r._hideDropdown(),r._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,r="scroll.select2."+t.id,i="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(r,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(r+" "+i+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,r="resize.select2."+t.id,i="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+r+" "+i)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),r=null,i=this.$container.offset();i.bottom=i.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=i.top,o.bottom=i.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<i.top-s,u=l>i.bottom+s,d={left:i.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(r="below"),u||!c||t?!c&&u&&t&&(r="below"):r="above",("above"==r||t&&"below"!==r)&&(d.top=o.top-h.top-s),null!=r&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+r),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+r)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,r){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,r)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,r=0;r<t.length;r++){var i=t[r];i.children?n+=e(i.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("close",function(e){r._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var r=this.getHighlightedResults();if(!(r.length<1)){var i=o.GetData(r[0],"data");null!=i.element&&i.element.selected||null==i.element&&i.selected||this.trigger("select",{data:i})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(e){r._selectTriggered(e)}),t.on("unselect",function(e){r._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,$,b,w,A,x,D,S,E,C,O,T,q,L,I,j,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=b:null!=e.data?e.dataAdapter=$:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,w)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,I))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=E;else{var r=y.Decorate(E,C);e.dropdownAdapter=r}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,L)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var i=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,i)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var r=c.extend(!0,{},n),i=n.children.length-1;0<=i;i--)null==e(t,n.children[i])&&r.children.splice(i,1);return 0<r.children.length?r:e(t,r)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,r=this.defaults.language,i=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(i),this._resolveLanguage(n),this._resolveLanguage(r),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],r=0;r<t.length;r++)if(n.push(t[r]),"string"==typeof t[r]&&0<t[r].indexOf("-")){var i=t[r].split("-")[0];n.push(i)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,r=0;r<e.length;r++){var i=new s,o=e[r];if("string"==typeof o)try{i=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,i=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else i=c.isPlainObject(o)?new s(o):o;n.extend(i)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var r=y._convertData(n);c.extend(!0,this.defaults,r)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(r,d,i,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=i.applyFromElement(this.options,t)),this.options=i.apply(this.options),t&&t.is("input")){var n=r(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function r(e,t){return t.toUpperCase()}for(var i=0;i<e[0].attributes.length;i++){var o=e[0].attributes[i].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,r)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(o,c,u,r){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var r=this.options.get("dataAdapter");this.dataAdapter=new r(e,this.options);var i=this.render();this._placeContainer(i);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,i);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,i);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var r=this._resolveWidth(e,"style");return null!=r?r:this._resolveWidth(e,"element")}if("element"==t){var i=e.outerWidth(!1);return i<=0?"auto":i+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){t._syncA(),t._syncS(null,e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,r=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===o.inArray(e,r)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===r.ESC||t===r.TAB||t===r.UP&&e.altKey?(n.close(e),e.preventDefault()):t===r.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===r.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===r.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===r.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===r.ENTER||t===r.SPACE||t===r.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._isChangeMutation=function(e,t){var n=!1,r=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var i=0;i<t.addedNodes.length;i++){t.addedNodes[i].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length?n=!0:o.isArray(t)&&o.each(t,function(e,t){if(r._isChangeMutation(e,t))return!(n=!0)});else n=!0;return n}},d.prototype._syncSubtree=function(e,t){var n=this._isChangeMutation(e,t),r=this;n&&this.dataAdapter.current(function(e){r.trigger("selection:update",{data:e})})},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,r={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in r){var i=r[e],o={prevented:!1,name:e,args:t};if(n.call(this,i,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},d.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},d.prototype.isEnabled=function(){return!this.isDisabled()},d.prototype.isDisabled=function(){return this.options.get("disabled")},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];o.isArray(t)&&(t=o.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("input").trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=o('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("jquery-mousewheel",["jquery"],function(e){return e}),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(i,e,o,t,s){if(null==i.fn.select2){var a=["open","close","destroy"];i.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=i.extend(!0,{},t);new o(i(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,r=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,r)}),-1<i.inArray(t,a)?this:n}}return null==i.fn.select2.defaults&&(i.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return u.fn.select2.amd=e,t});
\ No newline at end of file
+/*! Select2 4.1.0 | https://github.com/select2/select2/blob/master/LICENSE.md */
+(n=>{"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)})(function(t){(e=t&&t.fn&&t.fn.select2&&t.fn.select2.amd?t.fn.select2.amd:e)&&e.requirejs||(e?n=e:e={},g={},m={},y={},v={},i=Object.prototype.hasOwnProperty,s=[].slice,b=/\.js$/,h=function(e,t){var n,i,s=c(e),o=s[0],t=t[1];return e=s[1],o&&(n=A(o=a(o,t))),o?e=n&&n.normalize?n.normalize(e,(i=t,function(e){return a(e,i)})):a(e,t):(o=(s=c(e=a(e,t)))[0],e=s[1],o&&(n=A(o))),{f:o?o+"!"+e:e,n:e,pr:o,p:n}},f={require:function(e){return w(e)},exports:function(e){var t=g[e];return void 0!==t?t:g[e]={}},module:function(e){return{id:e,uri:"",exports:g[e],config:(t=e,function(){return y&&y.config&&y.config[t]||{}})};var t}},o=function(e,t,n,i){var s,o,r,l,a,c=[],u=typeof n,d=x(i=i||e);if("undefined"==u||"function"==u){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(r=h(t[l],d)).f))c[l]=f.require(e);else if("exports"===o)c[l]=f.exports(e),a=!0;else if("module"===o)s=c[l]=f.module(e);else if(_(g,o)||_(m,o)||_(v,o))c[l]=A(o);else{if(!r.p)throw new Error(e+" missing "+o);r.p.load(r.n,w(i,!0),(t=>function(e){g[t]=e})(o),{}),c[l]=g[o]}u=n?n.apply(g[e],c):void 0,e&&(s&&s.exports!==p&&s.exports!==g[e]?g[e]=s.exports:u===p&&a||(g[e]=u))}else e&&(g[e]=n)},l=n=r=function(e,t,n,i,s){if("string"==typeof e)return f[e]?f[e](t):A(h(e,x(t)).f);if(!e.splice){if((y=e).deps&&r(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=p}return t=t||function(){},"function"==typeof n&&(n=i,i=s),i?o(p,e,t,n):setTimeout(function(){o(p,e,t,n)},4),r},r.config=function(e){return r(e)},l._defined=g,(u=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),_(g,e)||_(m,e)||(m[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=l,e.require=n,e.define=u),e.define("almond",function(){}),e.define("jquery",[],function(){var e=t||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",[],function(){var s={};function c(e){var t,n=e.prototype,i=[];for(t in n)"function"==typeof n[t]&&"constructor"!==t&&i.push(t);return i}s.Extend=function(e,t){var n,i={}.hasOwnProperty;function s(){this.constructor=e}for(n in t)i.call(t,n)&&(e[n]=t[n]);return s.prototype=t.prototype,e.prototype=new s,e.__super__=t.prototype,e},s.Decorate=function(i,s){var e=c(s),t=c(i);function o(){var e=Array.prototype.unshift,t=s.prototype.constructor.length,n=i.prototype.constructor;0<t&&(e.call(arguments,i.prototype.constructor),n=s.prototype.constructor),n.apply(this,arguments)}s.displayName=i.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var r=t[n];o.prototype[r]=i.prototype[r]}for(var l=0;l<e.length;l++){var a=e[l];o.prototype[a]=(e=>{var t=function(){},n=(e in o.prototype&&(t=o.prototype[e]),s.prototype[e]);return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}})(a)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},0===(n=null==n?[]:n).length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,i=e.length;n<i;n++)e[n].apply(this,t)},s.Observable=e,s.generateChars=function(e){for(var t="",n=0;n<e;n++)t+=Math.floor(36*Math.random()).toString(36);return t},s.bind=function(e,t){return function(){e.apply(t,arguments)}},s._convertData=function(e){for(var t in e){var n=t.split("-"),i=e;if(1!==n.length){for(var s=0;s<n.length;s++){var o=n[s];(o=o.substring(0,1).toLowerCase()+o.substring(1))in i||(i[o]={}),s==n.length-1&&(i[o]=e[t]),i=i[o]}delete e[t]}}return e},s.hasScroll=function(e,t){var n=t.style.overflowX,i=t.style.overflowY;return(n!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===n||"scroll"===i||(n=window.getComputedStyle(t),parseFloat(n.height)<t.scrollHeight)||parseFloat(n.width)<t.scrollWidth)},s.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},s.__cache={};var n=0;return s.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(t=e.id?"select2-data-"+e.id:"select2-data-"+(++n).toString()+"-"+s.generateChars(4),e.setAttribute("data-select2-id",t)),t},s.StoreData=function(e,t,n){e=s.GetUniqueElementId(e);s.__cache[e]||(s.__cache[e]={}),s.__cache[e][t]=n},s.GetData=function(e,t){var n,i=s.GetUniqueElementId(e);return t?(n=t.replace(/-([a-z])/g,function(e,t){return t.toUpperCase()}),s.__cache[i]&&null!=s.__cache[i][t]?s.__cache[i][t]:e.dataset[n]):s.__cache[i]},s.RemoveData=function(e){var t=s.GetUniqueElementId(e);null!=s.__cache[t]&&delete s.__cache[t],e.removeAttribute("data-select2-id")},s.copyNonInternalCssClasses=function(e,t){var n=(n=e.getAttribute("class").trim().split(/\s+/)).filter(function(e){return 0===e.indexOf("select2-")}),t=(t=t.getAttribute("class").trim().split(/\s+/)).filter(function(e){return 0!==e.indexOf("select2-")}),n=n.concat(t);e.setAttribute("class",n.join(" "))},s}),e.define("select2/results",["jquery","./utils"],function(u,d){function i(e,t,n){this.$element=e,this.data=n,this.options=t,i.__super__.constructor.call(this)}return d.Extend(i,d.Observable),i.prototype.render=function(){var e=u('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e[0].setAttribute("aria-multiselectable","true"),this.$results=e},i.prototype.clear=function(){this.$results.empty()},i.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup"),n=(this.clear(),this.hideLoading(),u('<li role="alert" aria-live="assertive" class="select2-results__option"></li>')),i=this.options.get("translations").get(e.message);n.append(t(i(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},i.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},i.prototype.append=function(e){this.hideLoading();var t=[];if(null==e.results||0===e.results.length)0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"});else{e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var i=e.results[n],i=this.option(i);t.push(i)}this.$results.append(t)}},i.prototype.position=function(e,t){t.find(".select2-results").append(e)},i.prototype.sort=function(e){return this.options.get("sorter")(e)},i.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option--selectable"),t=e.filter(".select2-results__option--selected");(0<t.length?t:e).first().trigger("mouseenter"),this.ensureHighlightVisible()},i.prototype.setClasses=function(){var t=this;this.data.current(function(e){var i=e.map(function(e){return e.id.toString()});t.$results.find(".select2-results__option--selectable").each(function(){var e=u(this),t=d.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<i.indexOf(n)?(this.classList.add("select2-results__option--selected"),e[0].setAttribute("aria-selected","true")):(this.classList.remove("select2-results__option--selected"),e[0].setAttribute("aria-selected","false"))})})},i.prototype.showLoading=function(e){this.hideLoading();e={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},e=this.option(e);e.className+=" loading-results",this.$results.prepend(e)},i.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},i.prototype.option=function(e){var t,n=document.createElement("li"),i=(n.classList.add("select2-results__option"),n.classList.add("select2-results__option--selectable"),{role:"option"}),s=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(t in(null!=e.element&&s.call(e.element,":disabled")||null==e.element&&e.disabled)&&(i["aria-disabled"]="true",n.classList.remove("select2-results__option--selectable"),n.classList.add("select2-results__option--disabled")),null==e.id&&n.classList.remove("select2-results__option--selectable"),null!=e._resultId&&(n.id=e._resultId),e.title&&(n.title=e.title),e.children&&(i.role="group",i["aria-label"]=e.text,n.classList.remove("select2-results__option--selectable"),n.classList.add("select2-results__option--group")),i)n.setAttribute(t,i[t]);if(e.children){for(var s=u(n),o=document.createElement("strong"),r=(o.className="select2-results__group",this.template(e,o),[]),l=0;l<e.children.length;l++){var a=e.children[l],a=this.option(a);r.push(a)}var c=u("<ul></ul>",{class:"select2-results__options select2-results__options--nested",role:"none"});c.append(r),s.append(o),s.append(c)}else this.template(e,n);return d.StoreData(n,"data",e),n},i.prototype.bind=function(t,e){var s=this,n=t.id+"-results";this.$results[0].setAttribute("id",n),t.on("results:all",function(e){s.clear(),s.append(e.data),t.isOpen()&&(s.setClasses(),s.highlightFirstItem())}),t.on("results:append",function(e){s.append(e.data),t.isOpen()&&s.setClasses()}),t.on("query",function(e){s.hideMessages(),s.showLoading(e)}),t.on("select",function(){t.isOpen()&&(s.setClasses(),s.options.get("scrollAfterSelect"))&&s.highlightFirstItem()}),t.on("unselect",function(){t.isOpen()&&(s.setClasses(),s.options.get("scrollAfterSelect"))&&s.highlightFirstItem()}),t.on("open",function(){s.$results[0].setAttribute("aria-expanded","true"),s.$results[0].setAttribute("aria-hidden","false"),s.setClasses(),s.ensureHighlightVisible()}),t.on("close",function(){s.$results[0].setAttribute("aria-expanded","false"),s.$results[0].setAttribute("aria-hidden","true"),s.$results[0].removeAttribute("aria-activedescendant")}),t.on("results:toggle",function(){var e=s.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e,t=s.getHighlightedResults();0!==t.length&&(e=d.GetData(t[0],"data"),t.hasClass("select2-results__option--selected")?s.trigger("close",{}):s.trigger("select",{data:e}))}),t.on("results:previous",function(){var e,t=s.getHighlightedResults(),n=s.$results.find(".select2-results__option--selectable"),i=n.index(t);i<=0||(i=i-1,0===t.length&&(i=0),(t=n.eq(i)).trigger("mouseenter"),n=s.$results.offset().top,t=t.offset().top,e=s.$results.scrollTop()+(t-n),0===i?s.$results.scrollTop(0):t-n<0&&s.$results.scrollTop(e))}),t.on("results:next",function(){var e,t,n=s.getHighlightedResults(),i=s.$results.find(".select2-results__option--selectable"),n=i.index(n)+1;n>=i.length||((i=i.eq(n)).trigger("mouseenter"),e=s.$results.offset().top+s.$results.outerHeight(!1),i=i.offset().top+i.outerHeight(!1),t=s.$results.scrollTop()+i-e,0===n?s.$results.scrollTop(0):e<i&&s.$results.scrollTop(t))}),t.on("results:focus",function(e){e.element[0].classList.add("select2-results__option--highlighted"),e.element[0].setAttribute("aria-selected","true")}),t.on("results:message",function(e){s.displayMessage(e)}),u.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=s.$results.scrollTop(),n=s.$results.get(0).scrollHeight-t+e.deltaY,t=0<e.deltaY&&t-e.deltaY<=0,n=e.deltaY<0&&n<=s.$results.height();t?(s.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):n&&(s.$results.scrollTop(s.$results.get(0).scrollHeight-s.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option--selectable",function(e){var t=u(this),n=d.GetData(this,"data");t.hasClass("select2-results__option--selected")?s.options.get("multiple")?s.trigger("unselect",{originalEvent:e,data:n}):s.trigger("close",{originalEvent:e,data:n}):s.trigger("select",{originalEvent:e,data:n})}),this.$results.on("mouseenter",".select2-results__option--selectable",function(e){var t=d.GetData(this,"data"),n=s.getHighlightedResults();n.removeClass("select2-results__option--highlighted"),n.each(function(){this.setAttribute("aria-selected","false")}),s.trigger("results:focus",{data:t,element:u(this)})})},i.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},i.prototype.destroy=function(){this.$results.remove()},i.prototype.ensureHighlightVisible=function(){var e,t,n,i,s=this.getHighlightedResults();0!==s.length&&(e=this.$results.find(".select2-results__option--selectable").index(s),t=this.$results.offset().top,i=s.offset().top,n=this.$results.scrollTop()+(i-t),i=i-t,n-=2*s.outerHeight(!1),e<=2?this.$results.scrollTop(0):(i>this.$results.outerHeight()||i<0)&&this.$results.scrollTop(n))},i.prototype.template=function(e,t){var n=this.options.get("templateResult"),i=this.options.get("escapeMarkup"),n=n(e,t);null==n?t.style.display="none":"string"==typeof n?t.innerHTML=i(n):u(t).append(n)},i}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,i,s){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return i.Extend(o,i.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=i.GetData(this.$element[0],"old-tabindex")?this._tabindex=i.GetData(this.$element[0],"old-tabindex"):null!=this.$element[0].getAttribute("tabindex")&&(this._tabindex=this.$element[0].getAttribute("tabindex")),this.$element[0].getAttribute("title")&&e[0].setAttribute("title",this.$element[0].getAttribute("title")),e[0].setAttribute("tabindex",this._tabindex),e[0].setAttribute("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,i=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===s.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection[0].setAttribute("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection[0].setAttribute("aria-expanded","true"),n.$selection[0].setAttribute("aria-owns",i),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection[0].setAttribute("aria-expanded","false"),n.$selection[0].removeAttribute("aria-activedescendant"),n.$selection[0].removeAttribute("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection[0].setAttribute("tabindex",n._tabindex),n.$selection[0].setAttribute("aria-disabled","false")}),e.on("disable",function(){n.$selection[0].setAttribute("tabindex","-1"),n.$selection[0].setAttribute("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&i.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,i){function o(){o.__super__.constructor.apply(this,arguments)}return n.Extend(o,t),o.prototype.render=function(){var e=o.__super__.render.call(this);return e[0].classList.add("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},o.prototype.bind=function(t,e){var n=this,i=(o.__super__.bind.apply(this,arguments),t.id+"-container"),s=this.$selection.find(".select2-selection__rendered")[0];null!=s&&(s.setAttribute("id",i),s.setAttribute("role","textbox"),s.setAttribute("aria-readonly","true")),this.$selection[0].setAttribute("aria-labelledby",i),this.$selection[0].setAttribute("aria-controls",i),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},o.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e[0].removeAttribute("title")},o.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},o.prototype.selectionContainer=function(){return e("<span></span>")},o.prototype.update=function(e){var t,n;0===e.length?this.clear():(e=e[0],t=this.$selection.find(".select2-selection__rendered"),n=this.display(e,t),t.empty().append(n),(n=e.title||e.text)?t[0].setAttribute("title",n):t[0].removeAttribute("title"))},o}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(s,e,c){function o(e,t){o.__super__.constructor.apply(this,arguments)}return c.Extend(o,e),o.prototype.render=function(){var e=o.__super__.render.call(this);return e[0].classList.add("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},o.prototype.bind=function(e,t){var n=this,e=(o.__super__.bind.apply(this,arguments),e.id+"-container"),i=this.$selection.find(".select2-selection__rendered")[0];null!=i&&i.setAttribute("id",e),this.$selection.on("click",function(e){n.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){var t;n.isDisabled()||(t=s(this).parent(),t=c.GetData(t[0],"data"),n.trigger("unselect",{originalEvent:e,data:t}))}),this.$selection.on("keydown",".select2-selection__choice__remove",function(e){n.isDisabled()||e.stopPropagation()})},o.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e[0].removeAttribute("title")},o.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},o.prototype.selectionContainer=function(){return s('<li class="select2-selection__choice"><button type="button" class="select2-selection__choice__remove" tabindex="-1"><span aria-hidden="true">&times;</span></button><span class="select2-selection__choice__display"></span></li>')},o.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=this.$selection.find(".select2-selection__rendered")[0].getAttribute("id")+"-choice-",i=0;i<e.length;i++){var s=e[i],o=this.selectionContainer(),r=this.display(s,o),l=n+c.generateChars(4)+"-",r=(s.id?l+=s.id:l+=c.generateChars(4),o.find(".select2-selection__choice__display").append(r)[0].setAttribute("id",l),s.title||s.text),r=(r&&o[0].setAttribute("title",r),this.options.get("translations").get("removeItem")),a=o.find(".select2-selection__choice__remove")[0];a.setAttribute("title",r()),a.setAttribute("aria-label",r()),a.setAttribute("aria-describedby",l),c.StoreData(o[0],"data",s),t.push(o)}this.$selection.find(".select2-selection__rendered").append(t)}},o}),e.define("select2/selection/placeholder",[],function(){function e(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return e.prototype.normalizePlaceholder=function(e,t){return t="object"!=typeof t?{id:"",text:t}:t},e.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer(),t=(n.html(this.display(t)),n[0].classList.add("select2-selection__placeholder"),n[0].classList.remove("select2-selection__choice"),t.title||t.text||n.text());return this.$selection.find(".select2-selection__rendered")[0].setAttribute("title",t),n},e.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();n=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(n)},e}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(s,i,l){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){i._handleClear(e)}),t.on("keypress",function(e){i._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var i=l.GetData(n[0],"data"),s=this.$element.val(),o=(this.$element.val(this.placeholder.id),{data:i});if(this.trigger("clear",o),o.prevented)this.$element.val(s);else{for(var r=0;r<i.length;r++)if(o={data:i[r]},this.trigger("unselect",o),o.prevented)return void this.$element.val(s);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=i.DELETE&&t.which!=i.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){var n,i;e.call(this,t),this.$selection.find(".select2-selection__clear").remove(),this.$selection[0].classList.remove("select2-selection--clearable"),0<this.$selection.find(".select2-selection__placeholder").length||0===t.length||((e=null)!=(n=this.$selection.find(".select2-selection__rendered")[0])&&(e=n.getAttribute("id")),n=this.options.get("translations").get("removeAllItems"),(i=s('<button type="button" class="select2-selection__clear" tabindex="-1"><span aria-hidden="true">&times;</span></button>'))[0].setAttribute("title",n()),i[0].setAttribute("aria-label",n()),i[0].setAttribute("aria-describedby",e),l.StoreData(i[0],"data",t),this.$selection.prepend(i),this.$selection[0].classList.add("select2-selection--clearable"))},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(i,l,a){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=this.options.get("translations").get("search"),n=i('<span class="select2-search select2-search--inline"><textarea class="select2-search__field" type="search" tabindex="-1" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" ></textarea></span>'),n=(this.$searchContainer=n,this.$search=n.find("textarea"),this.$search[0].autocomplete=this.options.get("autocomplete"),this.$search[0].setAttribute("aria-label",t()),e.call(this));return this._transferTabIndex(),n.append(this.$searchContainer),n},e.prototype.bind=function(e,t,n){var i=this,s=t.id+"-results",o=t.id+"-container",e=(e.call(this,t,n),i.$search[0].setAttribute("aria-describedby",o),t.on("open",function(){i.$search[0].setAttribute("aria-controls",s),i.$search.trigger("focus")}),t.on("close",function(){i.$search.val(""),i.resizeSearch(),i.$search[0].removeAttribute("aria-controls"),i.$search[0].removeAttribute("aria-activedescendant"),i.$search.trigger("focus")}),t.on("enable",function(){i.$search[0].disabled=!1,i._transferTabIndex()}),t.on("disable",function(){i.$search[0].disabled=!0}),t.on("focus",function(e){i.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?i.$search[0].setAttribute("aria-activedescendant",e.data._resultId):i.$search[0].removeAttribute("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){i.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){i._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){var t;e.stopPropagation(),i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented(),e.which===a.BACKSPACE&&""===i.$search.val()&&0<(t=i.$selection.find(".select2-selection__choice").last()).length&&(t=l.GetData(t[0],"data"),i.searchRemoveChoice(t),e.preventDefault())}),this.$selection.on("click",".select2-search--inline",function(e){i.$search.val()&&e.stopPropagation()}),document.documentMode),r=e&&e<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){r?i.$selection.off("input.search input.searchcheck"):i.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){var t;r&&"input"===e.type?i.$selection.off("input.search input.searchcheck"):(t=e.which)!=a.SHIFT&&t!=a.CTRL&&t!=a.ALT&&t!=a.TAB&&i.handleSearch(e)})},e.prototype._transferTabIndex=function(e){this.$search[0].setAttribute("tabindex",this.$selection[0].getAttribute("tabindex")),this.$selection[0].setAttribute("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search[0].setAttribute("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search[0].setAttribute("placeholder",""),e.call(this,t),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){var e;this.resizeSearch(),this._keyUpPrevented||(e=this.$search.val(),this.trigger("query",{term:e})),this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="100%";""===this.$search[0].getAttribute("placeholder")&&(e=.75*(this.$search.val().length+1)+"em"),this.$search.css("width",e)},e}),e.define("select2/selection/selectionCss",["../utils"],function(n){function e(){}return e.prototype.render=function(e){var t=e.call(this),e=this.options.get("selectionCssClass")||"";return-1!==e.indexOf(":all:")&&(e=e.replace(":all:",""),n.copyNonInternalCssClasses(t[0],this.$element[0])),e.trim().split(" ").forEach(function(e){0<e.length&&t[0].classList.add(e)}),t},e}),e.define("select2/selection/eventRelay",["jquery"],function(r){function e(){}return e.prototype.bind=function(e,t,n){var i=this,s=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){var n;-1!==s.indexOf(e)&&(n=r.Event("select2:"+e,{params:t=t||{}}),i.$element.trigger(n),-1!==o.indexOf(e))&&(t.prevented=n.isDefaultPrevented())})},e}),e.define("select2/translation",["require"],function(n){function i(e){this.dict=e||{}}return i.prototype.all=function(){return this.dict},i.prototype.get=function(e){return this.dict[e]},i.prototype.extend=function(e){this.dict=Object.assign({},e.all(),this.dict)},i._cache={},i.loadPath=function(e){var t;return e in i._cache||(t=n(e),i._cache[e]=t),new i(i._cache[e])},i}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(n){function i(e,t){i.__super__.constructor.call(this)}return n.Extend(i,n.Observable),i.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},i.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},i.prototype.bind=function(e,t){},i.prototype.destroy=function(){},i.prototype.generateResultId=function(e,t){e=e.id+"-result-";return e+=n.generateChars(4),null!=t.id?e+="-"+t.id.toString():e+="-"+n.generateChars(4),e},i}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,l,a){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return l.Extend(n,e),n.prototype.current=function(e){var t=this;e(Array.prototype.map.call(this.$element[0].querySelectorAll(":checked"),function(e){return t.item(a(e))}))},n.prototype.select=function(s){var e,o=this;s.selected=!0,null!=s.element&&"option"===s.element.tagName.toLowerCase()?(s.element.selected=!0,this.$element.trigger("input").trigger("change")):this.$element[0].multiple?this.current(function(e){var t=[];(s=[s]).push.apply(s,e);for(var n=0;n<s.length;n++){var i=s[n].id;-1===t.indexOf(i)&&t.push(i)}o.$element.val(t),o.$element.trigger("input").trigger("change")}):(e=s.id,this.$element.val(e),this.$element.trigger("input").trigger("change"))},n.prototype.unselect=function(s){var o=this;this.$element[0].multiple&&(s.selected=!1,null!=s.element&&"option"===s.element.tagName.toLowerCase()?(s.element.selected=!1,this.$element.trigger("input").trigger("change")):this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n].id;i!==s.id&&-1===t.indexOf(i)&&t.push(i)}o.$element.val(t),o.$element.trigger("input").trigger("change")}))},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){l.RemoveData(this)})},n.prototype.query=function(t,e){var n=[],i=this;this.$element.children().each(function(){var e;"option"!==this.tagName.toLowerCase()&&"optgroup"!==this.tagName.toLowerCase()||(e=a(this),e=i.item(e),null!==(e=i.matches(t,e))&&n.push(e))}),e({results:n})},n.prototype.addOptions=function(e){this.$element.append(e)},n.prototype.option=function(e){e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var t,e=this._normalizeItem(e);return e.element=t,l.StoreData(t,"data",e),a(t)},n.prototype.item=function(e){var t={};if(null==(t=l.GetData(e[0],"data"))){var n=e[0];if("option"===n.tagName.toLowerCase())t={id:e.val(),text:e.text(),disabled:e[0].disabled,selected:e[0].selected,title:e[0].title};else if("optgroup"===n.tagName.toLowerCase()){for(var t={text:e[0].label,children:[],title:e[0].title},i=e.children("option"),s=[],o=0;o<i.length;o++){var r=a(i[o]),r=this.item(r);s.push(r)}t.children=s}(t=this._normalizeItem(t)).element=e[0],l.StoreData(e[0],"data",t)}return t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=a.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),e.children&&(e.children=e.children.map(n.prototype._normalizeItem)),a.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,t,c){function i(e,t){this._dataToConvert=t.get("data")||[],i.__super__.constructor.call(this,e,t)}return t.Extend(i,e),i.prototype.bind=function(e,t){i.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},i.prototype.select=function(n){var e;0===this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()}).length&&(e=this.option(n),this.addOptions(e)),i.__super__.select.call(this,n)},i.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),i=n.map(function(){return t.item(c(this)).id}).get(),s=[];for(var o=0;o<e.length;o++){var r,l,a=this._normalizeItem(e[o]);0<=i.indexOf(a.id)?(r=n.filter((e=>function(){return c(this).val()==e.id})(a)),l=this.item(r),l=c.extend(!0,{},a,l),l=this.option(l),r.replaceWith(l)):(r=this.option(a),a.children&&(l=this.convertToOptions(a.children),r.append(l)),s.push(r))}return s},i}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function r(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),r.__super__.constructor.call(this,e,t)}return t.Extend(r,e),r.prototype._applyDefaults=function(e){return o.extend({},{data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){e=o.ajax(e);return e.then(t),e.fail(n),e}},e,!0)},r.prototype.processResults=function(e){return e},r.prototype.query=function(t,n){var i=this,s=(null!=this._request&&("function"==typeof this._request.abort&&this._request.abort(),this._request=null),o.extend({type:"GET"},this.ajaxOptions));function e(){var e=s.transport(s,function(e){e=i.processResults(e,t);e&&e.results&&Array.isArray(e.results)?e.results=e.results.map(r.prototype._normalizeItem):i.options.get("debug")&&window.console&&console.error&&console.error("Select2: The AJAX results did not return an array in the `results` key of the response."),n(e)},function(){e&&"status"in e&&(0===e.status||"0"===e.status)||i.trigger("results:message",{message:"errorLoading"})});i._request=e}"function"==typeof s.url&&(s.url=s.url.call(this.$element,t)),"function"==typeof s.data&&(s.data=s.data.call(this.$element,t)),this.ajaxOptions.delay&&null!=t.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},r}),e.define("select2/data/tags",["jquery"],function(t){function e(e,t,n){var i=n.get("tags"),s=n.get("createTag"),s=(void 0!==s&&(this.createTag=s),n.get("insertTag"));if(void 0!==s&&(this.insertTag=s),e.call(this,t,n),Array.isArray(i))for(var o=0;o<i.length;o++){var r=i[o],r=this._normalizeItem(r),r=this.option(r);this.$element.append(r)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null==c.term||null!=c.page?e.call(this,c,u):e.call(this,c,function e(t,n){for(var i=t.results,s=0;s<i.length;s++){var o=i[s],r=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||r)return!n&&(t.data=i,void u(t))}if(n)return!0;var l,a=d.createTag(c);null!=a&&((l=d.option(a))[0].setAttribute("data-select2-tag","true"),d.addOptions([l]),d.insertTag(i,a)),t.results=i,u(t)})},e.prototype.createTag=function(e,t){return null==t.term||""===(t=t.term.trim())?null:{id:t,text:t}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||t(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(c){function e(e,t,n){var i=n.get("tokenizer");void 0!==i&&(this.tokenizer=i),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var i=this;t.term=t.term||"";var s=this.tokenizer(t,this.options,function(e){var t=i._normalizeItem(e);i.$element.find("option").filter(function(){return c(this).val()===t.id}).length||((e=i.option(t))[0].setAttribute("data-select2-tag",!0),i._removeOldTags(),i.addOptions([e])),i.trigger("select",{data:t})});s.term!==t.term&&(this.$search.length&&(this.$search.val(s.term),this.$search.trigger("focus")),t.term=s.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,i){for(var s=n.get("tokenSeparators")||[],o=t.term,r=0,l=this.createTag||function(e){return{id:e.term,text:e.term}};r<o.length;){var a=o[r];-1===s.indexOf(a)?r++:(a=o.substr(0,r),null==(a=l(c.extend({},t,{term:a})))?r++:(i(a),o=o.substr(r+1)||"",r=0))}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(){i._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var i=this;this._checkIfMaximumSelected(function(){e.call(i,t,n)})},e.prototype._checkIfMaximumSelected=function(e,t){var n=this;this.current(function(e){e=null!=e?e.length:0;0<n.maximumSelectionLength&&e>=n.maximumSelectionLength?n.trigger("results:message",{message:"maximumSelected",args:{maximum:n.maximumSelectionLength}}):t&&t()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e[0].setAttribute("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery"],function(o){function e(){}return e.prototype.render=function(e){var e=e.call(this),t=this.options.get("translations").get("search"),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),this.$search[0].autocomplete=this.options.get("autocomplete"),this.$search[0].setAttribute("aria-label",t()),e.prepend(n),e},e.prototype.bind=function(e,t,n){var i=this,s=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){i.handleSearch(e)}),t.on("open",function(){i.$search[0].setAttribute("tabindex",0),i.$search[0].setAttribute("aria-controls",s),i.$search.trigger("focus"),window.setTimeout(function(){i.$search.trigger("focus")},0)}),t.on("close",function(){i.$search[0].setAttribute("tabindex",-1),i.$search[0].removeAttribute("aria-controls"),i.$search[0].removeAttribute("aria-activedescendant"),i.$search.val(""),i.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||i.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(i.showSearch(e)?i.$searchContainer[0].classList.remove("select2-search--hide"):i.$searchContainer[0].classList.add("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?i.$search[0].setAttribute("aria-activedescendant",e.data._resultId):i.$search[0].removeAttribute("aria-activedescendant")})},e.prototype.handleSearch=function(e){var t;this._keyUpPrevented||(t=this.$search.val(),this.trigger("query",{term:t})),this._keyUpPrevented=!1},e.prototype.showSearch=function(e,t){return!0},e}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,i){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,i)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return t="object"!=typeof t?{id:"",text:t}:t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),i=t.length-1;0<=i;i--){var s=t[i];this.placeholder.id===s.id&&n.splice(i,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,i){this.lastParams={},e.call(this,t,n,i),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("query",function(e){i.lastParams=e,i.loading=!0}),t.on("query:append",function(e){i.lastParams=e,i.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);!this.loading&&e&&(e=this.$results.offset().top+this.$results.outerHeight(!1),this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=e+50)&&this.loadMore()},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(u,r){function e(e,t,n){this.$dropdownParent=u(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("open",function(){i._showDropdown(),i._attachPositioningHandler(t),i._bindContainerResultHandlers(t)}),t.on("close",function(){i._hideDropdown(),i._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t[0].setAttribute("class",n[0].getAttribute("class")),t[0].classList.remove("select2"),t[0].classList.add("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=u("<span></span>"),e=e.call(this);return t.append(e),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){var n;this._containerResultsHandlersBound||(n=this,t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0)},e.prototype._attachPositioningHandler=function(e,t){var n=this,i="scroll.select2."+t.id,s="resize.select2."+t.id,t="orientationchange.select2."+t.id,o=this.$container.parents().filter(r.hasScroll);o.each(function(){r.StoreData(this,"select2-scroll-position",{x:u(this).scrollLeft(),y:u(this).scrollTop()})}),o.on(i,function(e){var t=r.GetData(this,"select2-scroll-position");u(this).scrollTop(t.y)}),u(window).on(i+" "+s+" "+t,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,i="resize.select2."+t.id,t="orientationchange.select2."+t.id;this.$container.parents().filter(r.hasScroll).off(n),u(window).off(n+" "+i+" "+t)},e.prototype._positionDropdown=function(){var e=u(window),t=this.$dropdown[0].classList.contains("select2-dropdown--above"),n=this.$dropdown[0].classList.contains("select2-dropdown--below"),i=null,s=this.$container.offset(),o=(s.bottom=s.top+this.$container.outerHeight(!1),{height:this.$container.outerHeight(!1)});o.top=s.top,o.bottom=s.top+o.height;var r=this.$dropdown.outerHeight(!1),l=e.scrollTop(),e=e.scrollTop()+e.height(),l=l<s.top-r,e=e>s.bottom+r,s={left:s.left,top:o.bottom},a=this.$dropdownParent,c=("static"===a.css("position")&&(a=a.offsetParent()),{top:0,left:0});(u.contains(document.body,a[0])||a[0].isConnected)&&(c=a.offset()),s.top-=c.top,s.left-=c.left,t||n||(i="below"),e||!l||t?!l&&e&&t&&(i="below"):i="above",("above"==i||t&&"below"!==i)&&(s.top=o.top-c.top-r),null!=i&&(this.$dropdown[0].classList.remove("select2-dropdown--below"),this.$dropdown[0].classList.remove("select2-dropdown--above"),this.$dropdown[0].classList.add("select2-dropdown--"+i),this.$container[0].classList.remove("select2-container--below"),this.$container[0].classList.remove("select2-container--above"),this.$container[0].classList.add("select2-container--"+i)),this.$dropdownContainer.css(s)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,i){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,i)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,i=0;i<t.length;i++){var s=t[i];s.children?n+=e(s.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(n){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("close",function(e){i._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){t=t.originalSelect2Event;if("select"===t._type||"unselect"===t._type)return}var t=this.getHighlightedResults();t.length<1||null!=(t=n.GetData(t[0],"data")).element&&t.element.selected||null==t.element&&t.selected||this.trigger("select",{data:t})},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(e){i._selectTriggered(e)}),t.on("unselect",function(e){i._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/dropdown/dropdownCss",["../utils"],function(n){function e(){}return e.prototype.render=function(e){var t=e.call(this),e=this.options.get("dropdownCssClass")||"";return-1!==e.indexOf(":all:")&&(e=e.replace(":all:",""),n.copyNonInternalCssClasses(t[0],this.$element[0])),e.trim().split(" ").forEach(function(e){0<e.length&&t[0].classList.add(e)}),t},e}),e.define("select2/dropdown/tagsSearchHighlight",["../utils"],function(i){function e(){}return e.prototype.highlightFirstItem=function(e){var t=this.$results.find(".select2-results__option--selectable:not(.select2-results__option--selected)");if(0<t.length){var t=t.first(),n=i.GetData(t[0],"data").element;if(n&&n.getAttribute&&"true"===n.getAttribute("data-select2-tag"))return void t.trigger("mouseenter")}e.call(this)},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var e=e.input.length-e.maximum,t="Please delete "+e+" character";return 1!=e&&(t+="s"),t},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"},removeItem:function(){return"Remove item"},search:function(){return"Search"}}}),e.define("select2/defaults",["jquery","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/selectionCss","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./dropdown/dropdownCss","./dropdown/tagsSearchHighlight","./i18n/en"],function(a,o,r,l,c,u,d,p,h,f,g,t,m,y,v,b,_,$,w,A,x,D,S,E,O,C,L,T,q,I,e){function n(){this.reset()}return n.prototype.apply=function(e){null==(e=a.extend(!0,{},this.defaults,e)).dataAdapter&&(null!=e.ajax?e.dataAdapter=v:null!=e.data?e.dataAdapter=y:e.dataAdapter=m,0<e.minimumInputLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,$)),0<e.maximumInputLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,w)),0<e.maximumSelectionLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,A)),e.tags&&(e.dataAdapter=f.Decorate(e.dataAdapter,b)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=f.Decorate(e.dataAdapter,_))),null==e.resultsAdapter&&(e.resultsAdapter=o,null!=e.ajax&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,E)),null!=e.placeholder&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,S)),e.selectOnClose&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,L)),e.tags)&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,I)),null==e.dropdownAdapter&&(e.multiple?e.dropdownAdapter=x:(t=f.Decorate(x,D),e.dropdownAdapter=t),0!==e.minimumResultsForSearch&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,C)),e.closeOnSelect&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,T)),null!=e.dropdownCssClass&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,q)),e.dropdownAdapter=f.Decorate(e.dropdownAdapter,O)),null==e.selectionAdapter&&(e.multiple?e.selectionAdapter=l:e.selectionAdapter=r,null!=e.placeholder&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,c)),e.allowClear&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,u)),e.multiple&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,d)),null!=e.selectionCssClass&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,p)),e.selectionAdapter=f.Decorate(e.selectionAdapter,h)),e.language=this._resolveLanguage(e.language),e.language.push("en");for(var t,n=[],i=0;i<e.language.length;i++){var s=e.language[i];-1===n.indexOf(s)&&n.push(s)}return e.language=n,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function l(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdLanguageBase:"./i18n/",autocomplete:"off",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:f.escapeMarkup,language:{},matcher:function e(t,n){if(null==t.term||""===t.term.trim())return n;if(n.children&&0<n.children.length){for(var i=a.extend(!0,{},n),s=n.children.length-1;0<=s;s--)null==e(t,n.children[s])&&i.children.splice(s,1);return 0<i.children.length?i:e(t,i)}var o=l(n.text).toUpperCase(),r=l(t.term).toUpperCase();return-1<o.indexOf(r)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,i=this.defaults.language,s=t[0].lang,t=t.closest("[lang]"),t=t[0]?t[0].lang:null,s=Array.prototype.concat.call(this._resolveLanguage(s),this._resolveLanguage(n),this._resolveLanguage(i),this._resolveLanguage(t));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(a.isEmptyObject(e))return[];if(a.isPlainObject(e))return[e];for(var t,n=Array.isArray(e)?e:[e],i=[],s=0;s<n.length;s++)i.push(n[s]),"string"==typeof n[s]&&0<n[s].indexOf("-")&&(t=n[s].split("-")[0],i.push(t));return i},n.prototype._processTranslations=function(e,t){for(var n=new g,i=0;i<e.length;i++){var s=new g,o=e[i];if("string"==typeof o)try{s=g.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,s=g.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else s=a.isPlainObject(o)?new g(o):o;n.extend(s)}return n},n.prototype.set=function(e,t){var n={},e=(n[e.replace(/-([a-z])/g,function(e,t){return t.toUpperCase()})]=t,f._convertData(n));a.extend(!0,this.defaults,e)},new n}),e.define("select2/options",["jquery","./defaults","./utils"],function(u,n,d){function e(e,t){this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=n.applyFromElement(this.options,t)),this.options=n.apply(this.options)}return e.prototype.fromElement=function(e){var t,n=["select2"],i=(null==this.options.multiple&&(this.options.multiple=e[0].multiple),null==this.options.disabled&&(this.options.disabled=e[0].disabled),null==this.options.autocomplete&&e[0].autocomplete&&(this.options.autocomplete=e[0].autocomplete),null===this.options.dir&&((t=e[0].getAttribute("dir"))?this.options.dir=t:(t=e.closest("[dir]").getAttribute("dir"),this.options.dir=t||"ltr")),e[0].disabled=this.options.disabled,e[0].multiple=this.options.multiple,d.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),d.StoreData(e[0],"data",d.GetData(e[0],"select2Tags")),d.StoreData(e[0],"tags",!0)),d.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e[0].setAttribute("ajax--url",d.GetData(e[0],"ajaxUrl")),d.StoreData(e[0],"ajax-Url",d.GetData(e[0],"ajaxUrl"))),{});function s(e,t){return t.toUpperCase()}for(var o=0;o<e[0].attributes.length;o++){var r=e[0].attributes[o].name,l="data-";r.substr(0,l.length)==l&&(r=r.substring(l.length),l=d.GetData(e[0],r),i[r.replace(/-([a-z])/g,s)]=l)}u.fn.jquery&&"1."==u.fn.jquery.substr(0,2)&&e[0].dataset&&(i=u.extend(!0,{},e[0].dataset,i));var a,c=u.extend(!0,{},d.GetData(e[0]),i);for(a in c=d._convertData(c))-1<n.indexOf(a)||(u.isPlainObject(this.options[a])?u.extend(this.options[a],c[a]):this.options[a]=c[a]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(t,s,o,i){function r(e,t){null!=o.GetData(e[0],"select2")&&o.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),this.options=new s(t=t||{},e),r.__super__.constructor.call(this);var t=e[0].getAttribute("tabindex")||0,t=(o.StoreData(e[0],"old-tabindex",t),e[0].setAttribute("tabindex","-1"),this.options.get("dataAdapter")),t=(this.dataAdapter=new t(e,this.options),this.render()),n=(this._placeContainer(t),this.options.get("selectionAdapter")),n=(this.selection=new n(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,t),this.options.get("dropdownAdapter")),n=(this.dropdown=new n(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,t),this.options.get("resultsAdapter")),i=(this.results=new n(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown),this);this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){i.trigger("selection:update",{data:e})}),e[0].classList.add("select2-hidden-accessible"),e[0].setAttribute("aria-hidden","true"),this._syncAttributes(),o.StoreData(e[0],"select2",this),e.data("select2",this)}return o.Extend(r,o.Observable),r.prototype._generateId=function(e){e=e[0];return"select2-"+(null!=e&&null!=e.getAttribute("id")?e.getAttribute("id"):null!=e&&null!=e.getAttribute("name")?e.getAttribute("name")+"-"+o.generateChars(2):o.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},r.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},r.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t)return null!=(i=this._resolveWidth(e,"style"))?i:this._resolveWidth(e,"element");if("element"==t)return(i=e.outerWidth(!1))<=0?"auto":i+"px";if("style"!=t)return"computedstyle"==t?window.getComputedStyle(e[0]).width:t;var i=e[0].getAttribute("style");if("string"==typeof i)for(var s=i.split(";"),o=0,r=s.length;o<r;o+=1){var l=s[o].replace(/\s/g,"").match(n);if(null!==l&&1<=l.length)return l[1]}return null},r.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},r.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=o.bind(this._syncAttributes,this),this._syncS=o.bind(this._syncSubtree,this),this._observer=new window.MutationObserver(function(e){t._syncA(),t._syncS(e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})},r.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerSelectionEvents=function(){var n=this,i=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===i.indexOf(e)&&n.trigger(e,t)})},r.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container[0].classList.add("select2-container--open")}),this.on("close",function(){n.$container[0].classList.remove("select2-container--open")}),this.on("enable",function(){n.$container[0].classList.remove("select2-container--disabled")}),this.on("disable",function(){n.$container[0].classList.add("select2-container--disabled")}),this.on("blur",function(){n.$container[0].classList.remove("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===i.ESC||t===i.UP&&e.altKey?(n.close(e),e.preventDefault()):t===i.ENTER||t===i.TAB?(n.trigger("results:select",{}),e.preventDefault()):t===i.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===i.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===i.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===i.ENTER||t===i.SPACE||t===i.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},r.prototype._syncAttributes=function(){this.options.set("disabled",this.$element[0].disabled),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},r.prototype._isChangeMutation=function(e){var t=this;if(e.addedNodes&&0<e.addedNodes.length){for(var n=0;n<e.addedNodes.length;n++)if(e.addedNodes[n].selected)return!0}else{if(e.removedNodes&&0<e.removedNodes.length)return!0;if(Array.isArray(e))return e.some(function(e){return t._isChangeMutation(e)})}return!1},r.prototype._syncSubtree=function(e){var e=this._isChangeMutation(e),t=this;e&&this.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})},r.prototype.trigger=function(e,t){var n=r.__super__.trigger,i={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in i){var s={prevented:!1,name:e,args:t};if(n.call(this,i[e],s),s.prevented)return void(t.prevented=!0)}n.call(this,e,t)},r.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},r.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},r.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},r.prototype.isEnabled=function(){return!this.isDisabled()},r.prototype.isDisabled=function(){return this.options.get("disabled")},r.prototype.isOpen=function(){return this.$container[0].classList.contains("select2-container--open")},r.prototype.hasFocus=function(){return this.$container[0].classList.contains("select2-container--focus")},r.prototype.focus=function(e){this.hasFocus()||(this.$container[0].classList.add("select2-container--focus"),this.trigger("focus",{}))},r.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element[0].disabled instead.');e=!(e=null!=e&&0!==e.length?e:[!0])[0];this.$element[0].disabled=e},r.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},r.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();e=e[0];Array.isArray(e)&&(e=e.map(function(e){return e.toString()})),this.$element.val(e).trigger("input").trigger("change")},r.prototype.destroy=function(){o.RemoveData(this.$container[0]),this.$container.remove(),this._observer.disconnect(),this._observer=null,this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element[0].setAttribute("tabindex",o.GetData(this.$element[0],"old-tabindex")),this.$element[0].classList.remove("select2-hidden-accessible"),this.$element[0].setAttribute("aria-hidden","false"),o.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},r.prototype.render=function(){var e=t('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e[0].setAttribute("dir",this.options.get("dir")),this.$container=e,this.$container[0].classList.add("select2-container--"+this.options.get("theme")),o.StoreData(e[0],"element",this.$element),e},r}),e.define("jquery-mousewheel",["jquery"],function(e){return e}),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(s,e,o,t,r){var l;return null==s.fn.select2&&(l=["open","close","destroy"],s.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=s.extend(!0,{},t);new o(s(this),e)}),this;var n,i;if("string"==typeof t)return i=Array.prototype.slice.call(arguments,1),this.each(function(){var e=r.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,i)}),-1<l.indexOf(t)?this:n;throw new Error("Invalid arguments for Select2: "+t)}),null==s.fn.select2.defaults&&(s.fn.select2.defaults=t),o});var e,n,p,o,r,h,f,g,m,y,v,i,s,b,l={define:e.define,require:e.require};function _(e,t){return i.call(e,t)}function a(e,t){var n,i,s,o,r,l,a,c,u,d,p=t&&t.split("/"),h=y.map,f=h&&h["*"]||{};if(e){for(t=(e=e.split("/")).length-1,y.nodeIdCompat&&b.test(e[t])&&(e[t]=e[t].replace(b,"")),"."===e[0].charAt(0)&&p&&(e=p.slice(0,p.length-1).concat(e)),c=0;c<e.length;c++)"."===(d=e[c])?(e.splice(c,1),--c):".."!==d||0===c||1===c&&".."===e[2]||".."===e[c-1]||0<c&&(e.splice(c-1,2),c-=2);e=e.join("/")}if((p||f)&&h){for(c=(n=e.split("/")).length;0<c;--c){if(i=n.slice(0,c).join("/"),p)for(u=p.length;0<u;--u)if(s=(s=h[p.slice(0,u).join("/")])&&s[i]){o=s,r=c;break}if(o)break;!l&&f&&f[i]&&(l=f[i],a=c)}!o&&l&&(o=l,r=a),o&&(n.splice(0,r,o),e=n.join("/"))}return e}function w(t,n){return function(){var e=s.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),r.apply(p,e.concat([t,n]))}}function A(e){var t;if(_(m,e)&&(t=m[e],delete m[e],v[e]=!0,o.apply(p,t)),_(g,e)||_(v,e))return g[e];throw new Error("No "+e)}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function x(e){return e?c(e):[]}var u=l.require("jquery.select2");return t.fn.select2.amd=l,u});
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 0b3cc56..0274c8f 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "WordPress plugin to manage FAQ items as CPT and inject FAQ JSON-LD with advanced caching and queueing.",
   "type": "wordpress-plugin",
   "license": "GPL-2.0-or-later",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "keywords": ["wordpress", "plugin", "faq", "json-ld", "schema", "cpt"],
   "authors": [
     {
diff --git a/composer.lock b/composer.lock
index cf7e660..1b794c5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6f0be443bc9b784ba822a5bc302430b4",
+    "content-hash": "15e48b154a283df2dae0558d030ad27c",
     "packages": [
         {
             "name": "composer/installers",
@@ -3018,5 +3018,5 @@
     "platform-overrides": {
         "php": "7.4.33"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
diff --git a/faq-jsonld.php b/faq-jsonld.php
index 166c49e..e0b29f4 100644
--- a/faq-jsonld.php
+++ b/faq-jsonld.php
@@ -3,7 +3,7 @@
  * Plugin Name: FAQ JSON-LD Manager
  * Plugin URI:  https://github.com/renderbit-technologies/faq-jsonld-wordpress-plugin
  * Description: Manage FAQ items as a custom post type and output FAQPage JSON-LD on the posts and pages they apply to.
- * Version:     3.1.0
+ * Version:     3.1.1
  * Requires at least: 6.5
  * Requires PHP: 7.2
  * Author:      Renderbit Technologies
@@ -21,7 +21,7 @@
 // phpcs:disable PSR1.Files.SideEffects
 
 // Keep in sync with the Version header above; used to version the plugin's own assets.
-define( 'FQJ_VERSION', '3.1.0' );
+define( 'FQJ_VERSION', '3.1.1' );
 // Upper bound for the invalidation batch size setting.
 define( 'FQJ_MAX_BATCH_SIZE', 5000 );
 define( 'FQJ_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
@@ -37,6 +37,11 @@
 // URL associations rewritten by data migration 3, shown on the FAQ list screen until dismissed.
 define( 'FQJ_URL_MIGRATION_REPORT_OPTION', 'fqj_url_migration_report' );
 
+// Post type of FAQ items. Older post type names in FQJ_LEGACY_POST_TYPES are renamed to it on existing sites.
+define( 'FQJ_POST_TYPE', 'fqj_faq' );
+define( 'FQJ_LEGACY_POST_TYPES', array( 'faq_item' ) );
+define( 'FQJ_POST_TYPE_OPTION', 'fqj_post_type' );
+
 /**
  * Autoload includes
  */
@@ -76,10 +81,38 @@ function fqj_register_cpt_faq_item() {
 		'menu_icon'       => 'dashicons-editor-help',
 		'has_archive'     => false,
 	);
-	register_post_type( 'faq_item', $args );
+	register_post_type( FQJ_POST_TYPE, $args );
 }
 add_action( 'init', 'fqj_register_cpt_faq_item' );
 
+/**
+ * Rename FAQ items stored under a legacy post type to FQJ_POST_TYPE, once per site.
+ *
+ * Runs before the schema upgrade and the data migration, which only look at FQJ_POST_TYPE.
+ */
+function fqj_migrate_legacy_post_types() {
+	global $wpdb;
+
+	if ( FQJ_POST_TYPE === get_option( FQJ_POST_TYPE_OPTION ) ) {
+		return;
+	}
+
+	foreach ( FQJ_LEGACY_POST_TYPES as $legacy ) {
+		// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+		$ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s", $legacy ) );
+		if ( $ids ) {
+			$wpdb->update( $wpdb->posts, array( 'post_type' => FQJ_POST_TYPE ), array( 'post_type' => $legacy ) );
+		}
+		// phpcs:enable
+		foreach ( $ids as $id ) {
+			clean_post_cache( (int) $id );
+		}
+	}
+
+	update_option( FQJ_POST_TYPE_OPTION, FQJ_POST_TYPE );
+}
+add_action( 'plugins_loaded', 'fqj_migrate_legacy_post_types', 5 );
+
 /**
  * Run a callback for every site of the network, or once when the install is single-site.
  *
@@ -108,6 +141,8 @@ function fqj_for_each_site( $callback ) {
  * Activate the plugin for the current site: create DB table, defaults, schedule cron.
  */
 function fqj_activate_site() {
+	fqj_migrate_legacy_post_types();
+
 	// A site with no FAQs yet has nothing to migrate.
 	if ( false === get_option( FQJ_DATA_VERSION_OPTION ) && ! fqj_has_faq_items() ) {
 		// Cached output can outlive deleted FAQs on a reactivated site.
diff --git a/includes/admin.php b/includes/admin.php
index b5813ce..0ae4bbd 100644
--- a/includes/admin.php
+++ b/includes/admin.php
@@ -12,7 +12,7 @@
 // phpcs:disable PSR1.Files.SideEffects
 
 /**
- * Enqueue admin assets for faq_item edit screen
+ * Enqueue admin assets for the FAQ edit screen
  *
  * @param string $hook The current admin page.
  */
@@ -21,7 +21,7 @@ function fqj_admin_assets( $hook ) {
 	if ( ! in_array( $hook, array( 'post.php', 'post-new.php' ), true ) ) {
 		return;
 	}
-	if ( ! $post || 'faq_item' !== $post->post_type ) {
+	if ( ! $post || FQJ_POST_TYPE !== $post->post_type ) {
 		return;
 	}
 
@@ -45,13 +45,13 @@ function fqj_admin_assets( $hook ) {
 			'fqj-select2-css',
 			FQJ_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.css',
 			array(),
-			'4.0.13'
+			'4.1.0'
 		);
 		wp_enqueue_script(
 			'fqj-select2-js',
 			FQJ_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.js',
 			array( 'jquery' ),
-			'4.0.13',
+			'4.1.0',
 			true
 		);
 	} else {
@@ -71,7 +71,7 @@ function fqj_admin_assets( $hook ) {
 				'fqj-select2-css',
 				FQJ_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.css',
 				array(),
-				'4.0.13'
+				'4.1.0'
 			);
 		}
 	}
@@ -112,7 +112,7 @@ function fqj_add_meta_boxes() {
 		'fqj_assoc_rules',
 		__( 'Associations & Output', 'faq-jsonld' ),
 		'fqj_assoc_rules_meta_box_cb',
-		'faq_item',
+		FQJ_POST_TYPE,
 		'normal',
 		'default'
 	);
@@ -221,7 +221,7 @@ function fqj_save_meta_handler( $post_id, $post ) {
 	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 		return;
 	}
-	if ( 'faq_item' !== $post->post_type ) {
+	if ( FQJ_POST_TYPE !== $post->post_type ) {
 		return;
 	}
 	if ( ! current_user_can( 'edit_post', $post_id ) ) {
@@ -376,7 +376,7 @@ function fqj_unmatched_urls_notice() {
  */
 function fqj_url_migration_report_notice() {
 	$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : null;
-	if ( ! $screen || 'edit-faq_item' !== $screen->id || ! current_user_can( 'edit_others_posts' ) ) {
+	if ( ! $screen || 'edit-' . FQJ_POST_TYPE !== $screen->id || ! current_user_can( 'edit_others_posts' ) ) {
 		return;
 	}
 	$report = get_option( FQJ_URL_MIGRATION_REPORT_OPTION );
@@ -423,7 +423,7 @@ function fqj_dismiss_url_migration_report() {
  */
 function fqj_admin_post_dismiss_url_migration_report() {
 	fqj_dismiss_url_migration_report();
-	wp_safe_redirect( admin_url( 'edit.php?post_type=faq_item' ) );
+	wp_safe_redirect( admin_url( 'edit.php?post_type=' . FQJ_POST_TYPE ) );
 	exit;
 }
 add_action( 'admin_post_fqj_dismiss_url_migration_report', 'fqj_admin_post_dismiss_url_migration_report' );
@@ -444,7 +444,7 @@ function fqj_ajax_search_posts() {
 
 	$args  = array(
 		's'              => $q,
-		'post_type'      => array_values( array_diff( get_post_types( array( 'public' => true ) ), array( 'attachment', 'faq_item' ) ) ),
+		'post_type'      => array_values( array_diff( get_post_types( array( 'public' => true ) ), array( 'attachment', FQJ_POST_TYPE ) ) ),
 		'posts_per_page' => 20,
 		'post_status'    => 'publish',
 	);
diff --git a/includes/coverage.php b/includes/coverage.php
index 4ad31de..cecfd66 100644
--- a/includes/coverage.php
+++ b/includes/coverage.php
@@ -393,7 +393,7 @@ function fqj_posts_covered_by_mapping( $mapping, $after_id = 0, $limit = 100 ) {
  */
 function fqj_on_object_terms_set( $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids ) {
 	$type = get_post_type( $object_id );
-	if ( ! $type || 'faq_item' === $type || wp_is_post_revision( $object_id ) ) {
+	if ( ! $type || FQJ_POST_TYPE === $type || wp_is_post_revision( $object_id ) ) {
 		return;
 	}
 	if ( ! $append ) {
@@ -417,7 +417,7 @@ function fqj_on_object_terms_set( $object_id, $terms, $tt_ids, $taxonomy, $appen
  * @param WP_Post $post_before Post before the update.
  */
 function fqj_on_post_permalink_change( $post_id, $post_after, $post_before ) {
-	if ( 'faq_item' === $post_after->post_type || wp_is_post_revision( $post_id ) ) {
+	if ( FQJ_POST_TYPE === $post_after->post_type || wp_is_post_revision( $post_id ) ) {
 		return;
 	}
 	if ( $post_after->post_name === $post_before->post_name
diff --git a/includes/frontend.php b/includes/frontend.php
index a17e5b7..beff415 100644
--- a/includes/frontend.php
+++ b/includes/frontend.php
@@ -153,7 +153,7 @@ function fqj_render_faq_jsonld( $post_id ) {
 
 	$faqs = get_posts(
 		array(
-			'post_type'      => 'faq_item',
+			'post_type'      => FQJ_POST_TYPE,
 			'post_status'    => 'publish',
 			'posts_per_page' => -1,
 			'post__in'       => $faq_ids,
diff --git a/includes/health.php b/includes/health.php
index 894fbb9..8ff9e8c 100644
--- a/includes/health.php
+++ b/includes/health.php
@@ -25,7 +25,7 @@
  */
 function fqj_register_health_page() {
 	add_submenu_page(
-		'edit.php?post_type=faq_item',
+		'edit.php?post_type=' . FQJ_POST_TYPE,
 		__( 'FAQ JSON-LD Health', 'faq-jsonld' ),
 		__( 'Health', 'faq-jsonld' ),
 		'manage_options',
@@ -42,7 +42,7 @@ function fqj_register_health_page() {
  */
 function fqj_health_admin_assets( $hook ) {
 	// check page hook: load only on fqj-health page.
-	if ( 'faq_item_page_fqj-health' !== $hook ) {
+	if ( FQJ_POST_TYPE . '_page_fqj-health' !== $hook ) {
 		return;
 	}
 
diff --git a/includes/indexer.php b/includes/indexer.php
index b464823..19cab1a 100644
--- a/includes/indexer.php
+++ b/includes/indexer.php
@@ -109,7 +109,7 @@ function fqj_get_faq_ids_after( $after_id, $limit ) {
 	$ids = $wpdb->get_col(
 		$wpdb->prepare(
 			"SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_status <> 'auto-draft' AND ID > %d ORDER BY ID ASC LIMIT %d",
-			'faq_item',
+			FQJ_POST_TYPE,
 			(int) $after_id,
 			(int) $limit
 		)
@@ -473,7 +473,7 @@ function fqj_invalidate_faq_mappings( $faq_id ) {
  * @param WP_Post $post       Post object.
  */
 function fqj_on_faq_transition_status( $new_status, $old_status, $post ) {
-	if ( 'faq_item' !== $post->post_type || $new_status === $old_status ) {
+	if ( FQJ_POST_TYPE !== $post->post_type || $new_status === $old_status ) {
 		return;
 	}
 	fqj_invalidate_faq_mappings( $post->ID );
@@ -488,7 +488,7 @@ function fqj_on_faq_transition_status( $new_status, $old_status, $post ) {
  * @param WP_Post $post_before Post before the update.
  */
 function fqj_on_faq_updated( $post_id, $post_after, $post_before ) {
-	if ( 'faq_item' !== $post_after->post_type ) {
+	if ( FQJ_POST_TYPE !== $post_after->post_type ) {
 		return;
 	}
 	if ( $post_after->post_title === $post_before->post_title && $post_after->post_content === $post_before->post_content ) {
@@ -510,7 +510,7 @@ function fqj_on_faq_updated( $post_id, $post_after, $post_before ) {
  */
 function fqj_on_faq_before_delete( $post_id, $post = null ) {
 	$post = $post ? $post : get_post( $post_id );
-	if ( ! $post || 'faq_item' !== $post->post_type ) {
+	if ( ! $post || FQJ_POST_TYPE !== $post->post_type ) {
 		return;
 	}
 	fqj_invalidate_faq_mappings( $post_id );
diff --git a/includes/queue.php b/includes/queue.php
index fd360b0..277dbac 100644
--- a/includes/queue.php
+++ b/includes/queue.php
@@ -393,18 +393,26 @@ function fqj_process_invalidation_queue_now( $limit = null ) {
 }
 
 /**
- * Admin notice helper: show queue length on admin screens for admins.
+ * Admin notice on the plugin's own screens (FAQ list and editor, Health, Settings): show the queue length to admins.
  */
 function fqj_admin_queue_notice() {
 	if ( ! current_user_can( 'manage_options' ) ) {
 		return;
 	}
+	$screen    = function_exists( 'get_current_screen' ) ? get_current_screen() : null;
+	$own_pages = array( FQJ_POST_TYPE . '_page_fqj-health', FQJ_POST_TYPE . '_page_fqj-settings' );
+	if ( ! $screen || ( FQJ_POST_TYPE !== $screen->post_type && ! in_array( $screen->id, $own_pages, true ) ) ) {
+		return;
+	}
 	$len = fqj_queue_length();
 	if ( $len > 0 ) {
 		printf(
-			'<div class="notice notice-info"><p>FAQ JSON-LD queue: <strong>%d</strong> ' .
-			'items pending invalidation. The background worker (WP-Cron) will process them in batches.</p></div>',
-			intval( $len )
+			'<div class="notice notice-info"><p>%s</p></div>',
+			sprintf(
+				/* translators: %s: number of queued items. */
+				esc_html( _n( 'FAQ JSON-LD queue: %s item pending invalidation. The background worker (WP-Cron) will process it in batches.', 'FAQ JSON-LD queue: %s items pending invalidation. The background worker (WP-Cron) will process them in batches.', $len, 'faq-jsonld' ) ),
+				'<strong>' . intval( $len ) . '</strong>'
+			)
 		);
 	}
 }
diff --git a/includes/settings.php b/includes/settings.php
index 6485d58..26250d2 100644
--- a/includes/settings.php
+++ b/includes/settings.php
@@ -16,7 +16,7 @@
  */
 function fqj_register_settings_page() {
 	add_submenu_page(
-		'edit.php?post_type=faq_item',
+		'edit.php?post_type=' . FQJ_POST_TYPE,
 		__( 'FAQ JSON-LD Settings', 'faq-jsonld' ),
 		__( 'Settings', 'faq-jsonld' ),
 		'manage_options',
diff --git a/readme.txt b/readme.txt
index 2715a1b..bb7bdec 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: faq, schema, json-ld, structured data, seo
 Requires at least: 6.5
 Tested up to: 7.1
 Requires PHP: 7.2
-Stable tag: 3.1.0
+Stable tag: 3.1.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 
@@ -38,7 +38,7 @@ Built for large sites:
 
 * `fqj_question_text( $text, $faq_post )` filters the plain-text question.
 * `fqj_answer_text( $text, $faq_post )` filters the plain-text answer.
-* `fqj_uninstall_delete_faqs` (default `false`): return `true` to delete `faq_item` posts when the plugin is deleted.
+* `fqj_uninstall_delete_faqs` (default `false`): return `true` to delete FAQ posts when the plugin is deleted.
 
 Development happens on [GitHub](https://github.com/renderbit-technologies/faq-jsonld-wordpress-plugin).
 
@@ -69,6 +69,11 @@ Its options, transients, scheduled events, post meta and mapping table are remov
 
 == Changelog ==
 
+= 3.1.1 =
+* FAQ items now use the prefixed post type `fqj_faq` instead of `faq_item`, so they cannot collide with another plugin's FAQ post type. Existing FAQs are moved over automatically on upgrade; links or code that use `post_type=faq_item` need updating.
+* The invalidation queue notice only appears on the plugin's own screens (FAQ list and editor, Health, Settings) instead of on every admin page, and can be translated.
+* Updated the bundled Select2 to 4.1.0.
+
 = 3.1.0 =
 * URL associations now mean the URL itself: a FAQ shows on whichever post has that permalink now. Before, saving a URL also tied the FAQ to the post found there, so it followed that post when it was renamed and appeared on shortlinks and the front page's slug URL.
 * URLs on your own site are stored relative to the site root, so moving between `http` and `https`, adding or dropping `www.`, or changing domain keeps them working.
@@ -92,6 +97,9 @@ Its options, transients, scheduled events, post meta and mapping table are remov
 
 == Upgrade Notice ==
 
+= 3.1.1 =
+FAQ items move to the prefixed post type `fqj_faq` automatically. Update any bookmarks or custom code that use `post_type=faq_item`.
+
 = 3.1.0 =
 URL associations now match the URL itself. The upgrade rewrites URLs that only matched the old way and lists every change on the FAQ list screen.
 
diff --git a/tests/php/class-fqj-testcase.php b/tests/php/class-fqj-testcase.php
index 3b82f72..8d6aee9 100644
--- a/tests/php/class-fqj-testcase.php
+++ b/tests/php/class-fqj-testcase.php
@@ -41,7 +41,7 @@ public function tear_down() {
 	protected function create_faq( $question = 'What is it?', $answer = 'It is a thing.', $payload = null ) {
 		$faq_id = self::factory()->post->create(
 			array(
-				'post_type'    => 'faq_item',
+				'post_type'    => 'fqj_faq',
 				'post_status'  => 'publish',
 				'post_title'   => $question,
 				'post_content' => $answer,
diff --git a/tests/php/test-admin.php b/tests/php/test-admin.php
index 3908fb9..60a15ed 100644
--- a/tests/php/test-admin.php
+++ b/tests/php/test-admin.php
@@ -54,10 +54,10 @@ protected function payload( $faq_id ) {
 		return json_decode( get_post_meta( $faq_id, 'fqj_assoc_data_json', true ), true );
 	}
 
-	public function test_meta_box_is_registered_for_faq_items() {
+	public function test_meta_box_is_registered_for_faqs() {
 		global $wp_meta_boxes;
 		fqj_add_meta_boxes();
-		$this->assertArrayHasKey( 'fqj_assoc_rules', $wp_meta_boxes['faq_item']['normal']['default'] );
+		$this->assertArrayHasKey( 'fqj_assoc_rules', $wp_meta_boxes['fqj_faq']['normal']['default'] );
 	}
 
 	public function test_save_urls() {
diff --git a/tests/php/test-ajax.php b/tests/php/test-ajax.php
index 659372f..6c17698 100644
--- a/tests/php/test-ajax.php
+++ b/tests/php/test-ajax.php
@@ -94,7 +94,7 @@ public function test_search_posts_includes_custom_public_post_types_only() {
 		register_post_type( 'fqj_secret', array( 'public' => false ) );
 		$book   = self::factory()->post->create( array( 'post_title' => 'Zebra book', 'post_type' => 'fqj_book' ) );
 		self::factory()->post->create( array( 'post_title' => 'Zebra secret', 'post_type' => 'fqj_secret' ) );
-		self::factory()->post->create( array( 'post_title' => 'Zebra faq', 'post_type' => 'faq_item' ) );
+		self::factory()->post->create( array( 'post_title' => 'Zebra faq', 'post_type' => 'fqj_faq' ) );
 		$attach = self::factory()->post->create( array( 'post_title' => 'Zebra file', 'post_type' => 'attachment', 'post_status' => 'inherit' ) );
 
 		$this->nonce( 'fqj_admin_nonce' );
@@ -147,7 +147,7 @@ public function test_get_post_types_lists_public_types() {
 
 		$this->assertContains( 'post', $names );
 		$this->assertContains( 'page', $names );
-		$this->assertNotContains( 'faq_item', $names, 'FAQ items are not public.' );
+		$this->assertNotContains( 'fqj_faq', $names, 'FAQ items are not public.' );
 
 		$by_name = array_column( $results, 'label', 'name' );
 		$this->assertSame( 'Page', $by_name['page'] );
diff --git a/tests/php/test-frontend.php b/tests/php/test-frontend.php
index 29a7f1a..3076a35 100644
--- a/tests/php/test-frontend.php
+++ b/tests/php/test-frontend.php
@@ -433,7 +433,7 @@ public function test_text_filters_can_modify_question_and_answer() {
 		$json = $this->extract_json_ld( $this->render_head_for( $post ) );
 		remove_filter( 'fqj_question_text', $q, 10 );
 		remove_filter( 'fqj_answer_text', $a );
-		$this->assertSame( 'Q [faq_item]', $json['mainEntity'][0]['name'] );
+		$this->assertSame( 'Q [fqj_faq]', $json['mainEntity'][0]['name'] );
 		$this->assertSame( 'ANSWER', $json['mainEntity'][0]['acceptedAnswer']['text'] );
 	}
 }
diff --git a/tests/php/test-health.php b/tests/php/test-health.php
index 8d59bbf..bca4bc5 100644
--- a/tests/php/test-health.php
+++ b/tests/php/test-health.php
@@ -37,7 +37,7 @@ protected function render() {
 	public function test_submenu_is_registered() {
 		global $submenu;
 		fqj_register_health_page();
-		$slugs = wp_list_pluck( $submenu['edit.php?post_type=faq_item'], 2 );
+		$slugs = wp_list_pluck( $submenu['edit.php?post_type=fqj_faq'], 2 );
 		$this->assertContains( 'fqj-health', $slugs );
 	}
 
@@ -99,7 +99,7 @@ public function test_assets_only_on_health_page() {
 		fqj_health_admin_assets( 'edit.php' );
 		$this->assertFalse( wp_script_is( 'fqj-health-js', 'enqueued' ) );
 
-		fqj_health_admin_assets( 'faq_item_page_fqj-health' );
+		fqj_health_admin_assets( 'fqj_faq_page_fqj-health' );
 		$this->assertTrue( wp_script_is( 'fqj-health-js', 'enqueued' ) );
 		$this->assertStringContainsString( 'var fqjHealth', wp_scripts()->get_data( 'fqj-health-js', 'data' ) );
 	}
diff --git a/tests/php/test-indexer.php b/tests/php/test-indexer.php
index 390da94..34436a1 100644
--- a/tests/php/test-indexer.php
+++ b/tests/php/test-indexer.php
@@ -69,7 +69,7 @@ public function test_maybe_upgrade_db_skips_newer_stored_version() {
 	}
 
 	public function test_data_migration_reindexes_and_purges_once() {
-		$faq = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
+		$faq = self::factory()->post->create( array( 'post_type' => 'fqj_faq' ) );
 		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array( 'posts' => array( 5 ) ) ) );
 		fqj_insert_mappings(
 			$faq,
@@ -115,7 +115,7 @@ public function test_data_migration_normalizes_legacy_faqsection_option_and_purg
 	public function test_data_migration_reindexes_trashed_faqs() {
 		$faq = self::factory()->post->create(
 			array(
-				'post_type'   => 'faq_item',
+				'post_type'   => 'fqj_faq',
 				'post_status' => 'trash',
 			)
 		);
@@ -139,7 +139,7 @@ public function test_data_migration_reindexes_trashed_faqs() {
 
 	public function test_data_migration_runs_in_batches() {
 		add_filter( 'fqj_data_migration_batch_size', array( $this, 'tiny_batch' ) );
-		self::factory()->post->create_many( 3, array( 'post_type' => 'faq_item' ) );
+		self::factory()->post->create_many( 3, array( 'post_type' => 'fqj_faq' ) );
 		delete_option( FQJ_DATA_VERSION_OPTION );
 		delete_option( FQJ_DATA_MIGRATION_CURSOR_OPTION );
 		wp_clear_scheduled_hook( 'fqj_data_migration' );
@@ -157,7 +157,7 @@ public function test_data_migration_runs_in_batches() {
 	}
 
 	public function test_data_migration_restarts_cursor_left_by_an_older_migration() {
-		$ids = self::factory()->post->create_many( 3, array( 'post_type' => 'faq_item' ) );
+		$ids = self::factory()->post->create_many( 3, array( 'post_type' => 'fqj_faq' ) );
 		foreach ( $ids as $faq ) {
 			update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array( 'posts' => array( 5 ) ) ) );
 		}
@@ -175,7 +175,7 @@ public function test_data_migration_restarts_cursor_left_by_an_older_migration()
 
 	public function test_data_migration_cursor_records_its_version() {
 		add_filter( 'fqj_data_migration_batch_size', array( $this, 'tiny_batch' ) );
-		$ids = self::factory()->post->create_many( 3, array( 'post_type' => 'faq_item' ) );
+		$ids = self::factory()->post->create_many( 3, array( 'post_type' => 'fqj_faq' ) );
 		sort( $ids );
 		delete_option( FQJ_DATA_VERSION_OPTION );
 		delete_option( FQJ_DATA_MIGRATION_CURSOR_OPTION );
diff --git a/tests/php/test-multisite.php b/tests/php/test-multisite.php
index 6154c18..52bcf0c 100644
--- a/tests/php/test-multisite.php
+++ b/tests/php/test-multisite.php
@@ -99,6 +99,26 @@ public function test_network_activation_keeps_each_sites_settings() {
 		$this->assertSame( 12 * HOUR_IN_SECONDS, get_option( FQJ_OPTION_KEY )['cache_ttl'] );
 	}
 
+	public function test_network_activation_renames_legacy_faqs_on_every_site() {
+		$site_id = self::factory()->blog->create();
+		$faqs    = array();
+		foreach ( array( get_main_site_id(), $site_id ) as $id ) {
+			switch_to_blog( $id );
+			$faqs[ $id ] = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
+			delete_option( FQJ_POST_TYPE_OPTION );
+			restore_current_blog();
+		}
+
+		fqj_activate( true );
+
+		foreach ( $faqs as $id => $faq ) {
+			switch_to_blog( $id );
+			$type = get_post( $faq )->post_type;
+			restore_current_blog();
+			$this->assertSame( FQJ_POST_TYPE, $type, "site {$id}" );
+		}
+	}
+
 	public function test_new_site_is_set_up_when_network_active() {
 		$this->network_activate_plugin();
 
diff --git a/tests/php/test-plugin.php b/tests/php/test-plugin.php
index bb1549c..3b7cd0e 100644
--- a/tests/php/test-plugin.php
+++ b/tests/php/test-plugin.php
@@ -18,17 +18,17 @@ public function test_constants_are_defined() {
 		$this->assertFileExists( FQJ_PLUGIN_DIR . 'faq-jsonld.php' );
 	}
 
-	public function test_faq_item_post_type_is_registered() {
-		$this->assertTrue( post_type_exists( 'faq_item' ) );
+	public function test_faq_post_type_is_registered() {
+		$this->assertTrue( post_type_exists( 'fqj_faq' ) );
 
-		$pt = get_post_type_object( 'faq_item' );
+		$pt = get_post_type_object( 'fqj_faq' );
 		$this->assertFalse( $pt->public );
 		$this->assertTrue( $pt->show_ui );
 		$this->assertFalse( $pt->hierarchical );
 		$this->assertFalse( $pt->has_archive );
 		$this->assertSame( 'FAQ Items', $pt->labels->name );
-		$this->assertTrue( post_type_supports( 'faq_item', 'title' ) );
-		$this->assertTrue( post_type_supports( 'faq_item', 'editor' ) );
+		$this->assertTrue( post_type_supports( 'fqj_faq', 'title' ) );
+		$this->assertTrue( post_type_supports( 'fqj_faq', 'editor' ) );
 	}
 
 	public function test_activation_creates_table() {
diff --git a/tests/php/test-post-type-migration.php b/tests/php/test-post-type-migration.php
new file mode 100644
index 0000000..7eaba2d
--- /dev/null
+++ b/tests/php/test-post-type-migration.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Renaming FAQ items stored under a legacy post type (faq_item) to FQJ_POST_TYPE.
+ *
+ * @package FAQ_JSON_LD
+ */
+
+/**
+ * Post type migration tests.
+ */
+class Test_FQJ_Post_Type_Migration extends FQJ_TestCase {
+
+	/**
+	 * Create a FAQ stored under the legacy post type, as an older version saved it.
+	 *
+	 * @param array $payload Association payload stored as JSON meta.
+	 * @param array $args    Extra post fields.
+	 * @return int FAQ ID.
+	 */
+	protected function create_legacy_faq( $payload = null, $args = array() ) {
+		$faq = self::factory()->post->create(
+			array_merge(
+				array(
+					'post_type'    => 'faq_item',
+					'post_status'  => 'publish',
+					'post_title'   => 'Legacy?',
+					'post_content' => 'Yes.',
+				),
+				$args
+			)
+		);
+		if ( null !== $payload ) {
+			update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( $payload ) );
+		}
+		delete_option( FQJ_POST_TYPE_OPTION );
+
+		return $faq;
+	}
+
+	public function test_legacy_post_type_is_not_the_current_one() {
+		$this->assertSame( 'fqj_faq', FQJ_POST_TYPE );
+		$this->assertContains( 'faq_item', FQJ_LEGACY_POST_TYPES );
+		$this->assertNotContains( FQJ_POST_TYPE, FQJ_LEGACY_POST_TYPES );
+		$this->assertFalse( post_type_exists( 'faq_item' ) );
+	}
+
+	public function test_migration_renames_legacy_faqs_in_every_status() {
+		$published = $this->create_legacy_faq();
+		$draft     = $this->create_legacy_faq( null, array( 'post_status' => 'draft' ) );
+		$trashed   = $this->create_legacy_faq( null, array( 'post_status' => 'trash' ) );
+		$post      = self::factory()->post->create();
+		// Prime the object cache with the old post type.
+		$this->assertSame( 'faq_item', get_post( $published )->post_type );
+
+		fqj_migrate_legacy_post_types();
+
+		foreach ( array( $published, $draft, $trashed ) as $id ) {
+			$this->assertSame( FQJ_POST_TYPE, get_post( $id )->post_type, "post {$id}" );
+		}
+		$this->assertSame( 'post', get_post( $post )->post_type );
+		$this->assertSame( FQJ_POST_TYPE, get_option( FQJ_POST_TYPE_OPTION ) );
+	}
+
+	public function test_migration_runs_once_per_site() {
+		fqj_migrate_legacy_post_types();
+		$this->assertSame( FQJ_POST_TYPE, get_option( FQJ_POST_TYPE_OPTION ) );
+
+		// A legacy row added after the migration (e.g. by an import) is left alone; the option short-circuits.
+		$late = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
+		fqj_migrate_legacy_post_types();
+		$this->assertSame( 'faq_item', get_post( $late )->post_type );
+	}
+
+	public function test_migration_runs_before_the_schema_upgrade_and_data_migration() {
+		$migrate = has_action( 'plugins_loaded', 'fqj_migrate_legacy_post_types' );
+		$this->assertNotFalse( $migrate );
+		$this->assertLessThan( has_action( 'plugins_loaded', 'fqj_maybe_upgrade_db' ), $migrate );
+		$this->assertLessThan( has_action( 'plugins_loaded', 'fqj_maybe_schedule_data_migration' ), $migrate );
+	}
+
+	public function test_upgrade_from_data_version_2_reindexes_renamed_faqs() {
+		$post = self::factory()->post->create();
+		$faq  = $this->create_legacy_faq( array( 'posts' => array( $post ) ) );
+		update_option( FQJ_DATA_VERSION_OPTION, '2' );
+
+		fqj_migrate_legacy_post_types();
+		fqj_run_data_migration();
+
+		$this->assertSame( FQJ_DATA_VERSION, get_option( FQJ_DATA_VERSION_OPTION ) );
+		$this->assertSame( array( $faq ), fqj_faq_ids_for_post( $post ) );
+		$this->assertStringContainsString( 'Legacy?', fqj_render_faq_jsonld( $post ) );
+	}
+
+	public function test_activation_renames_legacy_faqs_before_checking_for_faqs() {
+		$faq = $this->create_legacy_faq();
+		delete_option( FQJ_DATA_VERSION_OPTION );
+
+		fqj_activate();
+
+		$this->assertSame( FQJ_POST_TYPE, get_post( $faq )->post_type );
+		// The site has FAQs, so the data migration still has to run on it.
+		$this->assertFalse( get_option( FQJ_DATA_VERSION_OPTION ) );
+	}
+}
diff --git a/tests/php/test-queue.php b/tests/php/test-queue.php
index 000f702..4601c85 100644
--- a/tests/php/test-queue.php
+++ b/tests/php/test-queue.php
@@ -285,6 +285,7 @@ public function test_process_now_uses_batch_size_when_no_limit() {
 
 	public function test_admin_notice_shows_for_admins_with_pending_items() {
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+		set_current_screen( 'edit-' . FQJ_POST_TYPE );
 
 		ob_start();
 		fqj_admin_queue_notice();
@@ -306,4 +307,41 @@ public function test_admin_notice_hidden_for_non_admins() {
 		fqj_admin_queue_notice();
 		$this->assertSame( '', ob_get_clean() );
 	}
+
+	/**
+	 * Screens the queue notice appears on.
+	 *
+	 * @dataProvider notice_screen_provider
+	 *
+	 * @param string $screen   Screen ID.
+	 * @param bool   $expected Whether the notice is shown.
+	 */
+	public function test_admin_notice_only_on_plugin_screens( $screen, $expected ) {
+		wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+		fqj_queue_add_posts( array( 1 ) );
+		set_current_screen( $screen );
+
+		ob_start();
+		fqj_admin_queue_notice();
+		$out = ob_get_clean();
+		set_current_screen( 'front' );
+
+		if ( $expected ) {
+			$this->assertStringContainsString( '<strong>1</strong> item pending', $out );
+		} else {
+			$this->assertSame( '', $out );
+		}
+	}
+
+	public function notice_screen_provider() {
+		return array(
+			'FAQ list'      => array( 'edit-fqj_faq', true ),
+			'FAQ editor'    => array( 'fqj_faq', true ),
+			'Health page'   => array( 'fqj_faq_page_fqj-health', true ),
+			'Settings page' => array( 'fqj_faq_page_fqj-settings', true ),
+			'dashboard'     => array( 'dashboard', false ),
+			'posts list'    => array( 'edit-post', false ),
+			'plugins'       => array( 'plugins', false ),
+		);
+	}
 }
diff --git a/tests/php/test-settings.php b/tests/php/test-settings.php
index e765ff9..a46fad7 100644
--- a/tests/php/test-settings.php
+++ b/tests/php/test-settings.php
@@ -45,7 +45,7 @@ protected function save( $fields ) {
 	public function test_submenu_is_registered() {
 		global $submenu;
 		fqj_register_settings_page();
-		$slugs = wp_list_pluck( $submenu['edit.php?post_type=faq_item'], 2 );
+		$slugs = wp_list_pluck( $submenu['edit.php?post_type=fqj_faq'], 2 );
 		$this->assertContains( 'fqj-settings', $slugs );
 	}
 
diff --git a/tests/php/test-uninstall.php b/tests/php/test-uninstall.php
index 5730075..67eb3f2 100644
--- a/tests/php/test-uninstall.php
+++ b/tests/php/test-uninstall.php
@@ -64,6 +64,7 @@ public function test_uninstall_removes_options_table_and_transients() {
 		global $wpdb;
 
 		update_option( FQJ_OPTION_KEY, array( 'cache_ttl' => 60 ) );
+		update_option( FQJ_POST_TYPE_OPTION, FQJ_POST_TYPE );
 		fqj_update_option_no_autoload( FQJ_URL_MIGRATION_REPORT_OPTION, array( array( 'faq_id' => 1, 'old' => '', 'new' => '/x' ) ) );
 		set_transient( 'fqj_unmatched_urls_1_2', array( 'x' ), 600 );
 		$key = fqj_cache_key( 1 );
@@ -77,6 +78,7 @@ public function test_uninstall_removes_options_table_and_transients() {
 		$this->assertFalse( get_option( '_transient_timeout_' . $key ) );
 		$this->assertFalse( get_option( 'fqj_cache_gen' ) );
 		$this->assertFalse( get_option( FQJ_URL_MIGRATION_REPORT_OPTION ) );
+		$this->assertFalse( get_option( FQJ_POST_TYPE_OPTION ) );
 		$this->assertFalse( get_transient( 'fqj_unmatched_urls_1_2' ) );
 		$this->assertSame( 'y', get_transient( 'keep_me' ) );
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
@@ -93,7 +95,7 @@ public function test_uninstall_removes_log_queue_events_and_meta_but_keeps_faqs(
 		set_transient( 'fqj_rejected_urls_1_2', array( 'bad' ), 600 );
 		wp_schedule_event( time() + 60, 'hourly', 'fqj_process_invalidation_queue' );
 		wp_schedule_single_event( time() + 60, 'fqj_data_migration' );
-		$faq              = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
+		$faq              = self::factory()->post->create( array( 'post_type' => 'fqj_faq' ) );
 		$this->post_ids[] = $faq;
 		update_post_meta( $faq, 'fqj_assoc_type', 'urls' );
 		update_post_meta( $faq, 'fqj_assoc_data_json', '{}' );
@@ -115,19 +117,20 @@ public function test_uninstall_removes_log_queue_events_and_meta_but_keeps_faqs(
 	}
 
 	public function test_uninstall_deletes_faqs_when_filter_allows() {
-		$faq   = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
+		$faq   = self::factory()->post->create( array( 'post_type' => 'fqj_faq' ) );
 		$draft = self::factory()->post->create(
 			array(
-				'post_type'   => 'faq_item',
+				'post_type'   => 'fqj_faq',
 				'post_status' => 'draft',
 			)
 		);
 		$trashed = self::factory()->post->create(
 			array(
-				'post_type'   => 'faq_item',
+				'post_type'   => 'fqj_faq',
 				'post_status' => 'trash',
 			)
 		);
+		$legacy  = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
 		$post    = self::factory()->post->create();
 		$this->post_ids[] = $post;
 		update_post_meta( $faq, 'fqj_assoc_type', 'urls' );
@@ -139,6 +142,7 @@ public function test_uninstall_deletes_faqs_when_filter_allows() {
 		$this->assertNull( get_post( $faq ) );
 		$this->assertNull( get_post( $draft ) );
 		$this->assertNull( get_post( $trashed ) );
+		$this->assertNull( get_post( $legacy ), 'FAQs never migrated off the legacy post type are deleted too.' );
 		$this->assertNotNull( get_post( $post ) );
 	}
 }
diff --git a/tests/php/test-url-migration.php b/tests/php/test-url-migration.php
index 00cc7e7..196cc0e 100644
--- a/tests/php/test-url-migration.php
+++ b/tests/php/test-url-migration.php
@@ -223,7 +223,7 @@ public function test_report_notice_shows_on_faq_list_until_dismissed() {
 		$this->create_legacy_faq( array( home_url( '/?p=' . $post ) ), array( $post ) );
 		$this->migrate();
 
-		set_current_screen( 'edit-faq_item' );
+		set_current_screen( 'edit-fqj_faq' );
 		wp_set_current_user( $author );
 		ob_start();
 		fqj_url_migration_report_notice();
diff --git a/uninstall.php b/uninstall.php
index b9a7af4..bfecec2 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -3,7 +3,7 @@
  * Uninstall script for FAQ JSON-LD Manager.
  *
  * WARNING: This removes plugin options, scheduled events, transients, post meta and the mapping table
- * permanently, on every site of a multisite network. The faq_item posts are kept unless the
+ * permanently, on every site of a multisite network. FAQ posts are kept unless the
  * `fqj_uninstall_delete_faqs` filter returns true.
  *
  * Plugin functions are not loaded during uninstall, so everything here is self-contained.
@@ -22,7 +22,7 @@
 	global $wpdb;
 
 	// Options.
-	foreach ( array( 'fqj_settings', 'fqj_db_version', 'fqj_data_version', 'fqj_data_migration_cursor', 'fqj_invalidation_log', 'fqj_last_queue_run', 'fqj_cache_gen', 'fqj_url_migration_report' ) as $option ) {
+	foreach ( array( 'fqj_settings', 'fqj_db_version', 'fqj_data_version', 'fqj_data_migration_cursor', 'fqj_invalidation_log', 'fqj_last_queue_run', 'fqj_cache_gen', 'fqj_url_migration_report', 'fqj_post_type' ) as $option ) {
 		delete_option( $option );
 	}
 
@@ -51,7 +51,7 @@
 		do {
 			$faq_ids = get_posts(
 				array(
-					'post_type'              => 'faq_item',
+					'post_type'              => array( 'fqj_faq', 'faq_item' ),
 					// 'any' skips statuses excluded from search, such as trash.
 					'post_status'            => array_keys( get_post_stati() ),
 					'posts_per_page'         => 100,

From c716dc6965d8f4f0003254e836b08d91732913d0 Mon Sep 17 00:00:00 2001
From: Soham Banerjee <soham@renderbit.com>
Date: Fri, 23 Oct 2026 15:29:29 +0530
Subject: [PATCH 2/6] Rename to Renderbit FAQ Structured Data with the rfsd
 prefix

WordPress.org review: the name and slug were too generic, and prefixes
must be at least 4 characters. Plugin name, slug and text domain become
renderbit-faq-structured-data; every fqj_/FQJ_/fqj- name becomes
rfsd_/RFSD_/rfsd-, including the CPT (rfsd_faq), tables, options, meta,
hooks, public filters, AJAX actions, JS globals and the WP-CLI command
(wp rfsd). The main file is renderbit-faq-structured-data.php.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .cursor/Dockerfile                            |   2 +-
 .cursor/cloud-install.sh                      |   4 +-
 .cursor/environment.json                      |   2 +-
 .github/ISSUE_TEMPLATE/bug_report.yml         |   4 +-
 .github/ISSUE_TEMPLATE/feature_request.yml    |   2 +-
 .github/copilot-instructions.md               |  22 +-
 .github/workflows/deploy-wporg.yml            |   8 +-
 .github/workflows/draft-release.yml           |   2 +-
 .github/workflows/tests.yml                   |   8 +-
 AGENTS.md                                     |  14 +-
 CLAUDE.md                                     |  38 +--
 CONTEXT.md                                    |   2 +-
 CONTRIBUTING.md                               |   8 +-
 README.md                                     |  32 +--
 _config.yml                                   |   2 +-
 assets/js/{fqj-admin.js => rfsd-admin.js}     |  62 ++---
 assets/js/{fqj-health.js => rfsd-health.js}   |  38 +--
 bin/bump-version.php                          |  72 ++---
 bin/check-zip.sh                              |  10 +-
 composer.json                                 |  10 +-
 composer.lock                                 |   2 +-
 faq-jsonld.php                                | 231 ---------------
 includes/admin.php                            | 216 +++++++--------
 .../{class-fqjcli.php => class-rfsd-cli.php}  |  16 +-
 includes/coverage.php                         |  96 +++----
 includes/frontend.php                         |  46 +--
 includes/health.php                           | 164 +++++------
 includes/indexer.php                          | 176 ++++++------
 includes/queue.php                            | 116 ++++----
 includes/settings.php                         | 108 ++++----
 package-lock.json                             |   4 +-
 package.json                                  |   4 +-
 phpcs.xml                                     |   8 +-
 phpunit-multisite.xml.dist                    |   4 +-
 phpunit.xml.dist                              |   4 +-
 readme.txt                                    |  24 +-
 renderbit-faq-structured-data.php             | 231 +++++++++++++++
 .../{fqj-admin.test.js => rfsd-admin.test.js} |  88 +++---
 ...fqj-health.test.js => rfsd-health.test.js} |  70 ++---
 tests/php/bootstrap.php                       |  10 +-
 ....php => class-rfsd-multisite-testcase.php} |  10 +-
 ...j-testcase.php => class-rfsd-testcase.php} |  18 +-
 tests/php/stubs/class-wp-cli.php              |   2 +-
 tests/php/test-admin.php                      | 188 ++++++-------
 tests/php/test-ajax.php                       | 153 +++++-----
 tests/php/test-cli.php                        |  28 +-
 tests/php/test-coverage.php                   | 123 ++++----
 tests/php/test-frontend.php                   |  82 +++---
 tests/php/test-health.php                     |  50 ++--
 tests/php/test-indexer.php                    | 206 +++++++-------
 tests/php/test-invalidation-hooks.php         |  48 ++--
 ...e-migration.php => test-legacy-import.php} |  54 ++--
 tests/php/test-multisite-uninstall.php        |  50 ++--
 tests/php/test-multisite.php                  | 118 ++++----
 tests/php/test-plugin.php                     | 156 ++++++-----
 tests/php/test-queue.php                      | 262 +++++++++---------
 tests/php/test-settings.php                   | 114 ++++----
 tests/php/test-uninstall.php                  | 101 ++++---
 tests/php/test-url-migration.php              |  64 ++---
 tests/php/wp-tests-config.php                 |   2 +-
 uninstall.php                                 |  40 +--
 61 files changed, 1944 insertions(+), 1885 deletions(-)
 rename assets/js/{fqj-admin.js => rfsd-admin.js} (80%)
 rename assets/js/{fqj-health.js => rfsd-health.js} (68%)
 delete mode 100644 faq-jsonld.php
 rename includes/{class-fqjcli.php => class-rfsd-cli.php} (80%)
 create mode 100644 renderbit-faq-structured-data.php
 rename tests/js/{fqj-admin.test.js => rfsd-admin.test.js} (73%)
 rename tests/js/{fqj-health.test.js => rfsd-health.test.js} (68%)
 rename tests/php/{class-fqj-multisite-testcase.php => class-rfsd-multisite-testcase.php} (84%)
 rename tests/php/{class-fqj-testcase.php => class-rfsd-testcase.php} (87%)
 rename tests/php/{test-post-type-migration.php => test-legacy-import.php} (58%)

diff --git a/.cursor/Dockerfile b/.cursor/Dockerfile
index 5898f3f..f8d431d 100644
--- a/.cursor/Dockerfile
+++ b/.cursor/Dockerfile
@@ -24,7 +24,7 @@ RUN printf '%s\n' \
 	'export WP_TESTS_DB_USER=root' \
 	'export WP_TESTS_DB_PASSWORD=root' \
 	'export WP_TESTS_DB_HOST=127.0.0.1' \
-	> /etc/profile.d/fqj-wp-tests-db.sh
+	> /etc/profile.d/rfsd-wp-tests-db.sh
 
 RUN echo 'ubuntu ALL=(ALL) NOPASSWD: /usr/sbin/service mariadb *' > /etc/sudoers.d/mariadb \
 	&& chmod 440 /etc/sudoers.d/mariadb
diff --git a/.cursor/cloud-install.sh b/.cursor/cloud-install.sh
index 4deb9c2..603a325 100755
--- a/.cursor/cloud-install.sh
+++ b/.cursor/cloud-install.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "$ROOT"
 
-if [[ ! -f /etc/profile.d/fqj-wp-tests-db.sh ]]; then
-	sudo tee /etc/profile.d/fqj-wp-tests-db.sh >/dev/null <<'EOF'
+if [[ ! -f /etc/profile.d/rfsd-wp-tests-db.sh ]]; then
+	sudo tee /etc/profile.d/rfsd-wp-tests-db.sh >/dev/null <<'EOF'
 export WP_TESTS_DB_NAME=wordpress_test
 export WP_TESTS_DB_USER=root
 export WP_TESTS_DB_PASSWORD=root
diff --git a/.cursor/environment.json b/.cursor/environment.json
index 66ac950..3480ea8 100644
--- a/.cursor/environment.json
+++ b/.cursor/environment.json
@@ -1,5 +1,5 @@
 {
-  "name": "FAQ JSON-LD WordPress Plugin",
+  "name": "Renderbit FAQ Structured Data WordPress Plugin",
   "build": {
     "dockerfile": "Dockerfile",
     "context": "."
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 3f5d898..3ce993e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,5 @@
 name: Bug Report
-description: Report a bug or issue with the FAQ JSON-LD Manager plugin
+description: Report a bug or issue with the Renderbit FAQ Structured Data plugin
 title: "[Bug]: "
 labels: ["bug"]
 body:
@@ -12,7 +12,7 @@ body:
     id: version
     attributes:
       label: Plugin Version
-      description: What version of FAQ JSON-LD Manager are you using?
+      description: What version of Renderbit FAQ Structured Data are you using?
       placeholder: e.g., 3.0.0
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 9776822..9ac1f67 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,5 +1,5 @@
 name: Feature Request
-description: Suggest a new feature or improvement for the FAQ JSON-LD Manager plugin
+description: Suggest a new feature or improvement for the Renderbit FAQ Structured Data plugin
 title: "[Feature]: "
 labels: ["enhancement"]
 body:
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index bbe5c74..1346777 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,4 +1,4 @@
-# Copilot Instructions for FAQ JSON-LD WordPress Plugin
+# Copilot Instructions for Renderbit FAQ Structured Data WordPress Plugin
 
 ## Overview
 
@@ -6,20 +6,20 @@ This plugin manages FAQ items as a custom post type (CPT) and injects FAQ JSON-L
 
 ## Architecture & Key Components
 
-- **Custom Post Type:** `fqj_faq` (formerly `faq_item`) is registered for FAQ entries.
-- **Mapping Table:** MySQL table (`fqj_mappings`) links FAQ items to posts, post types, terms, URLs, or global context. See `includes/indexer.php`.
+- **Custom Post Type:** `rfsd_faq` (formerly `faq_item`) is registered for FAQ entries.
+- **Mapping Table:** MySQL table (`rfsd_mappings`) links FAQ items to posts, post types, terms, URLs, or global context. See `includes/indexer.php`.
 - **JSON-LD Output:** Injected on the frontend using `includes/frontend.php`, with per-post transient caching for performance.
 - **Cache Invalidation:** Uses a background queue (`includes/queue.php`) processed by WP-Cron or WP-CLI. Queue state and logs are visible in the Health admin page.
-- **Admin UI:** Custom meta boxes and settings in `includes/admin.php` and `includes/settings.php`. Select2 (bundled in `assets/vendor/select2`) is used for post selectors (see `assets/js/fqj-admin.js`).
+- **Admin UI:** Custom meta boxes and settings in `includes/admin.php` and `includes/settings.php`. Select2 (bundled in `assets/vendor/select2`) is used for post selectors (see `assets/js/rfsd-admin.js`).
 - **Health & Diagnostics:** Admin page (`includes/health.php`) shows queue status, logs, and provides manual actions.
-- **WP-CLI Integration:** `includes/class-fqjcli.php` provides commands for purging transients, processing the invalidation queue and showing its length.
+- **WP-CLI Integration:** `includes/class-rfsd-cli.php` provides commands for purging transients, processing the invalidation queue and showing its length.
 
 ## Developer Workflows
 
 - **Activate/Upgrade:** On plugin activation, the mapping table is created/updated automatically.
 - **Settings:** Accessible under the FAQ Items menu. Options include cache TTL, batch size, and output type.
 - **Cache Management:**
-  - Manual: Use Health admin page or WP-CLI (`wp fqj purge-transients`, `wp fqj process-queue [--limit=N]`, `wp fqj queue-info`).
+  - Manual: Use Health admin page or WP-CLI (`wp rfsd purge-transients`, `wp rfsd process-queue [--limit=N]`, `wp rfsd queue-info`).
   - Automatic: Invalidation queue is processed every 5 minutes by WP-Cron.
 - **Debugging:**
   - Check the Health admin page for queue/logs.
@@ -28,8 +28,8 @@ This plugin manages FAQ items as a custom post type (CPT) and injects FAQ JSON-L
 ## Project-Specific Patterns
 
 - **Mapping Structure:** All associations (post, post_type, term, url, global) are stored in a single table for fast lookups.
-- **Transient Keys:** Format is `fqj_faq_json_{generation}_{post_id}`; always build it with `fqj_cache_key( $post_id )`. The mapping table name comes from `fqj_table_name()`.
-- **Admin JS:** Uses Select2 for post selectors, AJAX for search (`fqj_search_posts` action).
+- **Transient Keys:** Format is `rfsd_faq_json_{generation}_{post_id}`; always build it with `rfsd_cache_key( $post_id )`. The mapping table name comes from `rfsd_table_name()`.
+- **Admin JS:** Uses Select2 for post selectors, AJAX for search (`rfsd_search_posts` action).
 - **Settings/Health Pages:** Registered as submenus under the FAQ Items CPT.
 
 ## Integration Points
@@ -40,15 +40,15 @@ This plugin manages FAQ items as a custom post type (CPT) and injects FAQ JSON-L
 
 ## Key Files
 
-- `faq-jsonld.php`: Main plugin loader and CPT registration.
+- `renderbit-faq-structured-data.php`: Main plugin loader and CPT registration.
 - `includes/indexer.php`: Mapping table logic.
 - `includes/queue.php`: Invalidation queue logic.
 - `includes/frontend.php`: JSON-LD output and caching.
 - `includes/admin.php`: Admin UI/meta boxes.
 - `includes/settings.php`: Settings page.
 - `includes/health.php`: Health/diagnostics UI.
-- `includes/class-fqjcli.php`: WP-CLI commands.
-- `assets/js/fqj-admin.js`, `assets/js/fqj-health.js`: Admin JS (Select2, AJAX).
+- `includes/class-rfsd-cli.php`: WP-CLI commands.
+- `assets/js/rfsd-admin.js`, `assets/js/rfsd-health.js`: Admin JS (Select2, AJAX).
 
 ## Example: Adding a New Mapping Type
 
diff --git a/.github/workflows/deploy-wporg.yml b/.github/workflows/deploy-wporg.yml
index 7a4606c..eddb6f0 100644
--- a/.github/workflows/deploy-wporg.yml
+++ b/.github/workflows/deploy-wporg.yml
@@ -22,10 +22,10 @@ jobs:
         run: |
           tag="${GITHUB_REF#refs/tags/}"
           tag="${tag#v}"
-          header="$(sed -n 's/^ \* Version: *//p' faq-jsonld.php)"
-          constant="$(sed -n "s/^define( 'FQJ_VERSION', '\(.*\)' );$/\1/p" faq-jsonld.php)"
+          header="$(sed -n 's/^ \* Version: *//p' renderbit-faq-structured-data.php)"
+          constant="$(sed -n "s/^define( 'RFSD_VERSION', '\(.*\)' );$/\1/p" renderbit-faq-structured-data.php)"
           stable="$(sed -n 's/^Stable tag: *//p' readme.txt)"
-          echo "tag=$tag header=$header FQJ_VERSION=$constant stable=$stable"
+          echo "tag=$tag header=$header RFSD_VERSION=$constant stable=$stable"
           [ "$tag" = "$header" ] && [ "$tag" = "$constant" ] && [ "$tag" = "$stable" ]
 
       - name: Deploy to WordPress.org SVN
@@ -33,4 +33,4 @@ jobs:
         env:
           SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
           SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
-          SLUG: faq-jsonld
+          SLUG: renderbit-faq-structured-data
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
index 7006952..bf6ff74 100644
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -40,6 +40,6 @@ jobs:
           name: Release ${{ env.TAG_NAME }}
           draft: true
           generate_release_notes: true
-          files: faq-jsonld.zip
+          files: renderbit-faq-structured-data.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5eee2dd..ee3dd46 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,7 +32,7 @@ jobs:
           tools: none
 
       - name: Lint plugin files
-        run: find faq-jsonld.php uninstall.php includes -name '*.php' -print0 | xargs -0 -n1 php -l
+        run: find renderbit-faq-structured-data.php uninstall.php includes -name '*.php' -print0 | xargs -0 -n1 php -l
 
   phpcs:
     name: Coding standards
@@ -59,12 +59,12 @@ jobs:
 
       # Check what ships (the git archive, as in the release zip and WordPress.org SVN), not the dev files.
       - name: Export plugin files
-        run: mkdir -p build/faq-jsonld && git archive HEAD | tar -x -C build/faq-jsonld
+        run: mkdir -p build/renderbit-faq-structured-data && git archive HEAD | tar -x -C build/renderbit-faq-structured-data
 
       - uses: WordPress/plugin-check-action@10857da14b6c2246d15402b3e69f777edcf8c12e # v1.1.9
         with:
-          build-dir: build/faq-jsonld
-          slug: faq-jsonld
+          build-dir: build/renderbit-faq-structured-data
+          slug: renderbit-faq-structured-data
           strict: true
 
   phpunit:
diff --git a/AGENTS.md b/AGENTS.md
index 1fcf18e..b5e3f0a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,8 +1,8 @@
 # AGENTS.md
 
-WordPress plugin `faq-jsonld`: FAQs as a `fqj_faq` CPT (`FQJ_POST_TYPE`; renamed from `faq_item` on upgrade), schema.org `FAQPage` JSON-LD printed on singular posts/pages. Procedural PHP, every function prefixed `fqj_`, no build step, no runtime Composer deps.
+WordPress plugin `renderbit-faq-structured-data`: FAQs as a `rfsd_faq` CPT (`RFSD_POST_TYPE`; renamed from `faq_item` on upgrade), schema.org `FAQPage` JSON-LD printed on singular posts/pages. Procedural PHP, every function prefixed `rfsd_`, no build step, no runtime Composer deps.
 
-**PHP ceiling is 7.2 for shipped code** — `composer.json` pins platform 7.4, so syntax up to 7.4 passes locally while CI's `php -l` matrix (7.2–8.4) fails. Write 7.2-compatible syntax in `faq-jsonld.php`, `uninstall.php`, `includes/`.
+**PHP ceiling is 7.2 for shipped code** — `composer.json` pins platform 7.4, so syntax up to 7.4 passes locally while CI's `php -l` matrix (7.2–8.4) fails. Write 7.2-compatible syntax in `renderbit-faq-structured-data.php`, `uninstall.php`, `includes/`.
 
 Full architecture, data flow (save → index → render → invalidate), and versioning rules live in `CLAUDE.md` — read its Architecture section before touching `includes/indexer.php`, `includes/queue.php`, `includes/frontend.php`, or cache keys. Keep `CLAUDE.md` in sync if you change behavior it describes.
 
@@ -11,13 +11,13 @@ Full architecture, data flow (save → index → render → invalidate), and ver
 ```bash
 composer install && npm install   # setup; .env.testing must exist (copy .env.testing.example)
 
-composer lint                     # phpcs, WordPress Coding Standards, text domain faq-jsonld
+composer lint                     # phpcs, WordPress Coding Standards, text domain renderbit-faq-structured-data
 composer test                     # PHPUnit, single-site
 composer test:multisite           # same suite as a multisite network
 vendor/bin/phpunit --filter test_name   # one test
 vendor/bin/phpunit tests/php/test-queue.php   # one file
 npm test                          # Jest (jsdom) for assets/js
-npx jest tests/js/fqj-admin.test.js -t "name"  # one JS test
+npx jest tests/js/rfsd-admin.test.js -t "name"  # one JS test
 ```
 
 CI (`.github/workflows/tests.yml`) runs all of the above plus `WordPress/plugin-check` on every PR. Verify with `composer lint && composer test && npm test` before claiming done.
@@ -29,6 +29,6 @@ CI (`.github/workflows/tests.yml`) runs all of the above plus `WordPress/plugin-
 - Test groups: network-only tests are tagged `@group ms-required`, single-site-only `@group ms-excluded`; each phpunit config excludes the other group, so a test in neither group runs twice and one in both runs never.
 - `composer build-zip` runs `git archive HEAD` — **uncommitted changes are not in the zip**. `composer check-zip` verifies contents against `.gitattributes` `export-ignore`, which also decides what ships to WordPress.org SVN. Add new dev-only files there.
 - Raw `$wpdb` queries use `%i` for table identifiers and carry targeted `phpcs:ignore`/`phpcs:disable … phpcs:enable` comments naming the specific sniffs — keep this pattern so `composer lint` stays clean.
-- Two independent version constants: bump `FQJ_DB_VERSION` only when `CREATE TABLE` SQL in `fqj_create_table()` changes (dbDelta rules: no `IF NOT EXISTS`, two spaces after `PRIMARY KEY`, `KEY` not `INDEX`, no inline comments); bump `FQJ_DATA_VERSION` only to force a one-time reindex + cache purge.
-- Transient keys are always built with `fqj_cache_key( $post_id )` (embeds `fqj_cache_gen`) — never hand-build `fqj_faq_json_*` keys, or purge-all breaks with a persistent object cache.
-- Releasing: `composer bump-patch|minor|major` keeps four version strings in sync (`composer.json`, plugin header, `FQJ_VERSION`, `readme.txt` Stable tag); add the `readme.txt` changelog entry by hand. Pushing a `vX.Y.Z` tag to `main` creates a draft release; publishing it deploys to WordPress.org SVN.
+- Two independent version constants: bump `RFSD_DB_VERSION` only when `CREATE TABLE` SQL in `rfsd_create_table()` changes (dbDelta rules: no `IF NOT EXISTS`, two spaces after `PRIMARY KEY`, `KEY` not `INDEX`, no inline comments); bump `RFSD_DATA_VERSION` only to force a one-time reindex + cache purge.
+- Transient keys are always built with `rfsd_cache_key( $post_id )` (embeds `rfsd_cache_gen`) — never hand-build `rfsd_faq_json_*` keys, or purge-all breaks with a persistent object cache.
+- Releasing: `composer bump-patch|minor|major` keeps four version strings in sync (`composer.json`, plugin header, `RFSD_VERSION`, `readme.txt` Stable tag); add the `readme.txt` changelog entry by hand. Pushing a `vX.Y.Z` tag to `main` creates a draft release; publishing it deploys to WordPress.org SVN.
diff --git a/CLAUDE.md b/CLAUDE.md
index 59623b6..1c3a788 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -2,61 +2,61 @@
 
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
-WordPress plugin (slug `faq-jsonld`, published on WordPress.org) that manages FAQs as a `fqj_faq` custom post type (`FQJ_POST_TYPE`) and prints schema.org `FAQPage` JSON-LD in `wp_head` on the singular posts/pages each FAQ is mapped to. Procedural PHP, every function prefixed `fqj_`; no build step and no runtime Composer dependencies. Supports WordPress 6.5+ and PHP 7.2+, so don't use syntax newer than PHP 7.2 in shipped code.
+WordPress plugin (slug `renderbit-faq-structured-data`, published on WordPress.org) that manages FAQs as a `rfsd_faq` custom post type (`RFSD_POST_TYPE`) and prints schema.org `FAQPage` JSON-LD in `wp_head` on the singular posts/pages each FAQ is mapped to. Procedural PHP, every function prefixed `rfsd_`; no build step and no runtime Composer dependencies. Supports WordPress 6.5+ and PHP 7.2+, so don't use syntax newer than PHP 7.2 in shipped code.
 
 ## Commands
 
 ```bash
 composer install && npm install
 
-composer lint                      # phpcs with WordPress Coding Standards (phpcs.xml), text domain faq-jsonld
+composer lint                      # phpcs with WordPress Coding Standards (phpcs.xml), text domain renderbit-faq-structured-data
 composer test                      # PHPUnit integration suite, single-site
 composer test:multisite            # same suite as a multisite network
 vendor/bin/phpunit --filter test_name_here            # one test
 vendor/bin/phpunit tests/php/test-queue.php           # one file
 npm test                           # Jest (jsdom) tests for assets/js
-npx jest tests/js/fqj-admin.test.js -t "name"         # one JS test
+npx jest tests/js/rfsd-admin.test.js -t "name"         # one JS test
 
 composer build-zip && composer check-zip              # release zip from `git archive HEAD`, then verify contents
 composer bump-patch                # or bump-minor / bump-major
 ```
 
-PHPUnit runs against a real MySQL/MariaDB database that the suite **wipes on every run**. Settings come from `.env.testing` (copy `.env.testing.example`); shell env vars win. Tests are loaded by `tests/php/bootstrap.php`, which loads the plugin on `muplugins_loaded` and calls `fqj_activate()` on `init`. Extend `FQJ_TestCase` (`tests/php/class-fqj-testcase.php`, has `create_faq()` helpers) or `FQJ_Multisite_TestCase`. Tag network-only tests `@group ms-required` and single-site-only tests `@group ms-excluded`; each config excludes the other group. PHPUnit converts notices, warnings and deprecations to failures. WP-CLI is stubbed in `tests/php/stubs/class-wp-cli.php`.
+PHPUnit runs against a real MySQL/MariaDB database that the suite **wipes on every run**. Settings come from `.env.testing` (copy `.env.testing.example`); shell env vars win. Tests are loaded by `tests/php/bootstrap.php`, which loads the plugin on `muplugins_loaded` and calls `rfsd_activate()` on `init`. Extend `RFSD_TestCase` (`tests/php/class-rfsd-testcase.php`, has `create_faq()` helpers) or `RFSD_Multisite_TestCase`. Tag network-only tests `@group ms-required` and single-site-only tests `@group ms-excluded`; each config excludes the other group. PHPUnit converts notices, warnings and deprecations to failures. WP-CLI is stubbed in `tests/php/stubs/class-wp-cli.php`.
 
 ## Architecture
 
-`faq-jsonld.php` defines constants, requires every file in `includes/`, registers the CPT (renaming FAQs stored under a post type in `FQJ_LEGACY_POST_TYPES` once per site, on `plugins_loaded` priority 5 and on activation, before the schema upgrade and data migration), and handles activation/deactivation (looping over all sites via `fqj_for_each_site()` on network activation and setting up new sites on `wp_initialize_site`).
+`renderbit-faq-structured-data.php` defines constants, requires every file in `includes/`, registers the CPT (renaming FAQs stored under a post type in `RFSD_LEGACY_POST_TYPES` once per site, on `plugins_loaded` priority 5 and on activation, before the schema upgrade and data migration), and handles activation/deactivation (looping over all sites via `rfsd_for_each_site()` on network activation and setting up new sites on `wp_initialize_site`).
 
 Data flow:
 
-1. **Save (`includes/admin.php`)**: the meta box stores the FAQ's associations as JSON in post meta `fqj_assoc_data_json` (keys `urls`, `posts`, `post_types`, `terms`, `global`), then the index is rebuilt.
-2. **Index (`includes/indexer.php`)**: `fqj_rebuild_index_for_faq()` replaces the FAQ's rows in the `{prefix}fqj_mappings` table (`faq_id`, `mapping_type` ∈ post/post_type/term/url/global, `mapping_value`). URLs go through `fqj_normalize_url()`, which stores URLs on this site relative to the site root (`/about`, `/`, `/?p=12`). A URL association covers whichever post's permalink equals that URL now, so it never gets a `post` row (ADR-0001). Old and new mappings are both passed to `fqj_enqueue_invalidation_for_mappings()`. Hooks on status transitions, post updates, deletes, term changes and permalink changes keep the index and cache in sync.
-3. **Render (`includes/frontend.php`)**: on `is_singular()` only, builds candidate (type, value) pairs for the current post (its ID, post type, terms in all its taxonomies, normalized permalink, global; the legacy absolute and trailing-slash URL shapes only while data version is below 3), runs one query against the mapping table, and caches the `<script>` in a transient for coverable (published) posts only; private posts and previews render uncached. Empty results are cached as the sentinel `__FQJ_EMPTY__`.
-4. **Invalidate (`includes/queue.php`)**: `{prefix}fqj_queue` table. `post` items are single cache deletes. `post_type`/`term` items are *jobs* that the worker expands incrementally using `job_cursor`, so saving a FAQ never lists every matching post. Re-adding a job resets its cursor to 0. A WP-Cron event (`fqj_process_invalidation_queue`, custom `fqj_five_minutes` interval) processes up to `batch_size` posts per run. It can also be run from the Health page (`includes/health.php`) or `wp fqj process-queue` (`includes/class-fqjcli.php`).
+1. **Save (`includes/admin.php`)**: the meta box stores the FAQ's associations as JSON in post meta `rfsd_assoc_data_json` (keys `urls`, `posts`, `post_types`, `terms`, `global`), then the index is rebuilt.
+2. **Index (`includes/indexer.php`)**: `rfsd_rebuild_index_for_faq()` replaces the FAQ's rows in the `{prefix}rfsd_mappings` table (`faq_id`, `mapping_type` ∈ post/post_type/term/url/global, `mapping_value`). URLs go through `rfsd_normalize_url()`, which stores URLs on this site relative to the site root (`/about`, `/`, `/?p=12`). A URL association covers whichever post's permalink equals that URL now, so it never gets a `post` row (ADR-0001). Old and new mappings are both passed to `rfsd_enqueue_invalidation_for_mappings()`. Hooks on status transitions, post updates, deletes, term changes and permalink changes keep the index and cache in sync.
+3. **Render (`includes/frontend.php`)**: on `is_singular()` only, builds candidate (type, value) pairs for the current post (its ID, post type, terms in all its taxonomies, normalized permalink, global; the legacy absolute and trailing-slash URL shapes only while data version is below 3), runs one query against the mapping table, and caches the `<script>` in a transient for coverable (published) posts only; private posts and previews render uncached. Empty results are cached as the sentinel `__RFSD_EMPTY__`.
+4. **Invalidate (`includes/queue.php`)**: `{prefix}rfsd_queue` table. `post` items are single cache deletes. `post_type`/`term` items are *jobs* that the worker expands incrementally using `job_cursor`, so saving a FAQ never lists every matching post. Re-adding a job resets its cursor to 0. A WP-Cron event (`rfsd_process_invalidation_queue`, custom `rfsd_five_minutes` interval) processes up to `batch_size` posts per run. It can also be run from the Health page (`includes/health.php`) or `wp rfsd process-queue` (`includes/class-rfsd-cli.php`).
 
-**Coverage (`includes/coverage.php`)** owns both directions of "which posts does a mapping apply to": URL normalization, lookup candidates and `fqj_faq_ids_for_post()` (the only read of the mapping table at render time), `fqj_post_for_url()` (the post whose normalized permalink equals the URL; `fqj_post_routed_from_url()` is the looser "where WordPress would route it"), `fqj_posts_covered_by_mapping()` (used by job expansion), `fqj_post_is_coverable()`, and the freshness hooks (terms, permalinks, and a full purge when `permalink_structure`, `category_base`, `tag_base` or `home` change). `tests/php/test-coverage.php` checks that the two directions agree; keep it passing when changing either side.
+**Coverage (`includes/coverage.php`)** owns both directions of "which posts does a mapping apply to": URL normalization, lookup candidates and `rfsd_faq_ids_for_post()` (the only read of the mapping table at render time), `rfsd_post_for_url()` (the post whose normalized permalink equals the URL; `rfsd_post_routed_from_url()` is the looser "where WordPress would route it"), `rfsd_posts_covered_by_mapping()` (used by job expansion), `rfsd_post_is_coverable()`, and the freshness hooks (terms, permalinks, and a full purge when `permalink_structure`, `category_base`, `tag_base` or `home` change). `tests/php/test-coverage.php` checks that the two directions agree; keep it passing when changing either side.
 
-Cache keys: always use `fqj_cache_key( $post_id )` → `fqj_faq_json_{generation}_{post_id}`. "Purge all" (`fqj_purge_all_faq_transients()` in `includes/settings.php`) bumps the `fqj_cache_gen` option so it also works with persistent object caches. A `global` mapping change and any settings change trigger a full purge.
+Cache keys: always use `rfsd_cache_key( $post_id )` → `rfsd_faq_json_{generation}_{post_id}`. "Purge all" (`rfsd_purge_all_faq_transients()` in `includes/settings.php`) bumps the `rfsd_cache_gen` option so it also works with persistent object caches. A `global` mapping change and any settings change trigger a full purge.
 
-Schema and data versioning (constants in `faq-jsonld.php`):
-- `FQJ_DB_VERSION`: bump whenever the `CREATE TABLE` SQL in `fqj_create_table()` changes. `fqj_maybe_upgrade_db()` reruns `dbDelta` on `plugins_loaded`. dbDelta needs a strict format (no `IF NOT EXISTS`, two spaces after `PRIMARY KEY`, `KEY` not `INDEX`, no inline comments).
-- `FQJ_DATA_VERSION`: bump to force a one-time reindex of every FAQ plus a cache purge on existing sites. `fqj_run_data_migration()` processes FAQs in batches through a cron event, keeping its place in a cursor option. Version 3 (`fqj_migrate_url_associations()`) reads each FAQ's old `post` rows before reindexing and rewrites URL associations that only matched through them, recording each change in the non-autoloaded `fqj_url_migration_report` option shown on the FAQ list screen until dismissed.
+Schema and data versioning (constants in `renderbit-faq-structured-data.php`):
+- `RFSD_DB_VERSION`: bump whenever the `CREATE TABLE` SQL in `rfsd_create_table()` changes. `rfsd_maybe_upgrade_db()` reruns `dbDelta` on `plugins_loaded`. dbDelta needs a strict format (no `IF NOT EXISTS`, two spaces after `PRIMARY KEY`, `KEY` not `INDEX`, no inline comments).
+- `RFSD_DATA_VERSION`: bump to force a one-time reindex of every FAQ plus a cache purge on existing sites. `rfsd_run_data_migration()` processes FAQs in batches through a cron event, keeping its place in a cursor option. Version 3 (`rfsd_migrate_url_associations()`) reads each FAQ's old `post` rows before reindexing and rewrites URL associations that only matched through them, recording each change in the non-autoloaded `rfsd_url_migration_report` option shown on the FAQ list screen until dismissed.
 
-`uninstall.php` removes options, transients, cron events, post meta and both tables on every site. FAQ posts (`fqj_faq`, plus any left under the legacy `faq_item`) are kept unless the `fqj_uninstall_delete_faqs` filter returns true.
+`uninstall.php` removes options, transients, cron events, post meta and both tables on every site. FAQ posts (`rfsd_faq`, plus any left under the legacy `faq_item`) are kept unless the `rfsd_uninstall_delete_faqs` filter returns true.
 
-Admin JS (`assets/js/fqj-admin.js`, `fqj-health.js`) uses jQuery and a bundled Select2 (`assets/vendor/select2`, not a CDN). It talks to `wp_ajax_fqj_*` handlers protected by the `fqj_admin_nonce` nonce, and gets its strings through `wp_localize_script`.
+Admin JS (`assets/js/rfsd-admin.js`, `rfsd-health.js`) uses jQuery and a bundled Select2 (`assets/vendor/select2`, not a CDN). It talks to `wp_ajax_rfsd_*` handlers protected by the `rfsd_admin_nonce` nonce, and gets its strings through `wp_localize_script`.
 
 ## Conventions
 
 - Direct `$wpdb` queries use `%i` for table identifiers and carry targeted `phpcs:ignore`/`phpcs:disable … phpcs:enable` comments naming the specific sniffs; keep this pattern so `composer lint` stays clean.
-- Options that are rarely read (`fqj_invalidation_log`, `fqj_last_queue_run`) are written with `fqj_update_option_no_autoload()` so they stay out of autoload.
+- Options that are rarely read (`rfsd_invalidation_log`, `rfsd_last_queue_run`) are written with `rfsd_update_option_no_autoload()` so they stay out of autoload.
 - CI runs `php -l` on PHP 7.2–8.4, and PHPUnit on WP 6.5 plus the locked version.
-- Public filters: `fqj_question_text`, `fqj_answer_text` (both must return plain text), `fqj_uninstall_delete_faqs`.
+- Public filters: `rfsd_question_text`, `rfsd_answer_text` (both must return plain text), `rfsd_uninstall_delete_faqs`.
 - `.gitattributes` `export-ignore` decides what ships (`git archive` builds both the zip and the WordPress.org SVN deploy). Add new dev-only files there.
 
 ## Releasing
 
-`composer bump-*` runs `bin/bump-version.php`, which keeps four version strings in sync: `composer.json` `version`, the plugin `Version` header and `FQJ_VERSION` in `faq-jsonld.php`, and `Stable tag` in `readme.txt`. It then refreshes `composer.lock`. Add a `readme.txt` changelog entry by hand. After merging to `main`, push a `vX.Y.Z` tag: `draft-release.yml` creates a draft GitHub release, and publishing it runs `deploy-wporg.yml`, which checks that the versions match and deploys to WordPress.org SVN.
+`composer bump-*` runs `bin/bump-version.php`, which keeps four version strings in sync: `composer.json` `version`, the plugin `Version` header and `RFSD_VERSION` in `renderbit-faq-structured-data.php`, and `Stable tag` in `readme.txt`. It then refreshes `composer.lock`. Add a `readme.txt` changelog entry by hand. After merging to `main`, push a `vX.Y.Z` tag: `draft-release.yml` creates a draft GitHub release, and publishing it runs `deploy-wporg.yml`, which checks that the versions match and deploys to WordPress.org SVN.
 
 ## Agent skills
 
diff --git a/CONTEXT.md b/CONTEXT.md
index ba318c5..663c1f9 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -1,4 +1,4 @@
-# FAQ JSON-LD
+# Renderbit FAQ Structured Data
 
 Editors write FAQs once and associate them with the posts and pages they apply to. The plugin prints those FAQs as schema.org `FAQPage` structured data on each matching singular post.
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 83c9e33..4bebd49 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to FAQ JSON-LD Manager
+# Contributing to Renderbit FAQ Structured Data
 
 Thank you for your interest in contributing! We welcome pull requests, bug reports, and feature suggestions.
 
@@ -46,9 +46,9 @@ Tests live in `tests/js`.
 
 ## Releasing
 
-The plugin is published on WordPress.org as `faq-jsonld`. The shipped files are whatever `git archive` produces, so `.gitattributes` decides what reaches both the release zip and WordPress.org SVN.
+The plugin is published on WordPress.org as `renderbit-faq-structured-data`. The shipped files are whatever `git archive` produces, so `.gitattributes` decides what reaches both the release zip and WordPress.org SVN.
 
-1. Run `composer bump-patch` (or `bump-minor`, `bump-major`). It runs `bin/bump-version.php`, which sets the new version in `composer.json`, the `Version` header and `FQJ_VERSION` in `faq-jsonld.php`, and `Stable tag` in `readme.txt`, then refreshes the `composer.lock` hash. Add a `readme.txt` changelog entry and bump `Tested up to` when needed.
+1. Run `composer bump-patch` (or `bump-minor`, `bump-major`). It runs `bin/bump-version.php`, which sets the new version in `composer.json`, the `Version` header and `RFSD_VERSION` in `renderbit-faq-structured-data.php`, and `Stable tag` in `readme.txt`, then refreshes the `composer.lock` hash. Add a `readme.txt` changelog entry and bump `Tested up to` when needed.
 2. Merge to `main`, then push a `vX.Y.Z` tag. `draft-release.yml` builds the zip and creates a draft GitHub release.
 3. Publish the draft. `deploy-wporg.yml` checks that the tag and all three version numbers match, then commits trunk, the version tag and the `.wordpress-org/` directory (banners, icons, screenshots) to SVN.
 
@@ -71,4 +71,4 @@ Please be respectful and constructive in all interactions.
 - Review inline comments in each file for implementation details.
 
 ---
-Thank you for helping improve FAQ JSON-LD Manager!
+Thank you for helping improve Renderbit FAQ Structured Data!
diff --git a/README.md b/README.md
index 720cc0d..45d2562 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# FAQ JSON-LD Manager
+# Renderbit FAQ Structured Data
 
 ![WordPress Plugin](https://img.shields.io/badge/WordPress-Plugin-21759B?logo=wordpress&logoColor=fff)
 ![PHP](https://img.shields.io/badge/PHP-%E2%89%A5%207.2-777BB4?logo=php&logoColor=fff)
@@ -13,8 +13,8 @@ A WordPress plugin to manage FAQ items as a custom post type (CPT) and inject FA
 
 ## Features
 
-- **Custom Post Type:** Manage FAQ items via the `fqj_faq` CPT (named `faq_item` before 3.1.1; existing FAQs are renamed on upgrade).
-- **Mapping Table:** Fast MySQL table (`fqj_mappings`) links FAQ items to posts, post types, terms, URLs, or global context.
+- **Custom Post Type:** Manage FAQ items via the `rfsd_faq` CPT (named `faq_item` before 3.1.1; existing FAQs are renamed on upgrade).
+- **Mapping Table:** Fast MySQL table (`rfsd_mappings`) links FAQ items to posts, post types, terms, URLs, or global context.
 - **JSON-LD Output:** Injects FAQ schema on the frontend, with per-post transient caching.
 - **Cache Invalidation:** Background queue (WP-Cron or WP-CLI) for efficient cache purging.
 - **Admin UI:** Meta boxes and settings for mapping, output, and diagnostics.
@@ -34,37 +34,37 @@ A WordPress plugin to manage FAQ items as a custom post type (CPT) and inject FA
 - **Singular content only:** JSON-LD is printed on singular views (posts, pages, custom post types). Blog home, archives and search results never output FAQ markup, so URL mappings apply to singular content only (archive URLs are not matched).
 - **Output:** Markup is schema.org `FAQPage`. Question and answer text is plain text: tags stripped, entities decoded, whitespace collapsed. Answers run through blocks and shortcodes but not the `the_content` filter.
 - **Settings:** Configure cache TTL and invalidation batch size (10-5000) under the FAQ Items > Settings menu.
-- **Translations:** Strings use the `faq-jsonld` text domain (loaded just-in-time by WordPress 4.6+); admin JS strings are localized through `wp_localize_script`.
+- **Translations:** Strings use the `renderbit-faq-structured-data` text domain (loaded just-in-time by WordPress 4.6+); admin JS strings are localized through `wp_localize_script`.
 - **Requirements:** WordPress 6.5+, PHP 7.2+.
 - **Health:** Monitor queue/logs and run manual actions under FAQ Items > Health.
 - **WP-CLI:**
-  - `wp fqj purge-transients` — Purge all FAQ JSON-LD transients.
-  - `wp fqj process-queue [--limit=N]` — Process the invalidation queue.
-  - `wp fqj queue-info` — Show the number of pending queue items.
+  - `wp rfsd purge-transients` — Purge all FAQ JSON-LD transients.
+  - `wp rfsd process-queue [--limit=N]` — Process the invalidation queue.
+  - `wp rfsd queue-info` — Show the number of pending queue items.
 
 ## Developer Notes
 
 ### Filters
 
-- `fqj_question_text( $text, $faq_post )` — filter the plain-text question for a FAQ item.
-- `fqj_answer_text( $text, $faq_post )` — filter the plain-text answer. Return plain text; the JSON encoder escapes `<`, `>` and `&`. Cached output is cleared on settings changes or with `wp fqj purge-transients`.
+- `rfsd_question_text( $text, $faq_post )` — filter the plain-text question for a FAQ item.
+- `rfsd_answer_text( $text, $faq_post )` — filter the plain-text answer. Return plain text; the JSON encoder escapes `<`, `>` and `&`. Cached output is cleared on settings changes or with `wp rfsd purge-transients`.
 
 - **Key Files:**
-  - `faq-jsonld.php`: Main loader and CPT registration
+  - `renderbit-faq-structured-data.php`: Main loader and CPT registration
   - `includes/indexer.php`: Mapping table logic
   - `includes/queue.php`: Invalidation queue
   - `includes/frontend.php`: JSON-LD output/caching
   - `includes/admin.php`: Admin UI/meta boxes
   - `includes/settings.php`: Settings page
   - `includes/health.php`: Health/diagnostics UI
-  - `includes/class-fqjcli.php`: WP-CLI commands
-  - `assets/js/fqj-admin.js`, `assets/js/fqj-health.js`: Admin JS (Select2 is bundled in `assets/vendor/select2`)
+  - `includes/class-rfsd-cli.php`: WP-CLI commands
+  - `assets/js/rfsd-admin.js`, `assets/js/rfsd-health.js`: Admin JS (Select2 is bundled in `assets/vendor/select2`)
 - **Mapping Types:** All associations are stored in a single table for fast lookups.
-- **Transient Keys:** `fqj_faq_json_{generation}_{post_id}` (build with `fqj_cache_key( $post_id )`). "Purge all" bumps the `fqj_cache_gen` option, which works with persistent object caches too.
-- **Uninstall:** Deleting the plugin removes its options, transients, cron events, post meta and mapping table (on every site of a multisite network). FAQ posts are kept by default; to delete them as well, add `add_filter( 'fqj_uninstall_delete_faqs', '__return_true' );` (e.g. in a mu-plugin) before deleting the plugin.
-- **Admin JS:** Uses Select2 for post selectors, AJAX for search (`fqj_search_posts` action; all public post types except attachments and FAQs). Switching the association type keeps each type's in-progress selection until you save; only the selected type is stored.
+- **Transient Keys:** `rfsd_faq_json_{generation}_{post_id}` (build with `rfsd_cache_key( $post_id )`). "Purge all" bumps the `rfsd_cache_gen` option, which works with persistent object caches too.
+- **Uninstall:** Deleting the plugin removes its options, transients, cron events, post meta and mapping table (on every site of a multisite network). FAQ posts are kept by default; to delete them as well, add `add_filter( 'rfsd_uninstall_delete_faqs', '__return_true' );` (e.g. in a mu-plugin) before deleting the plugin.
+- **Admin JS:** Uses Select2 for post selectors, AJAX for search (`rfsd_search_posts` action; all public post types except attachments and FAQs). Switching the association type keeps each type's in-progress selection until you save; only the selected type is stored.
 - **Background Processing:** The invalidation queue lives in a database table and is processed every 5 minutes by WP-Cron (up to the batch size per run), or on demand from the Health page or WP-CLI.
-- **Asset versions:** The plugin's own JS is versioned with `FQJ_VERSION`; keep it in sync with the `Version` header when releasing.
+- **Asset versions:** The plugin's own JS is versioned with `RFSD_VERSION`; keep it in sync with the `Version` header when releasing.
 
 ## Testing
 
diff --git a/_config.yml b/_config.yml
index 666d32e..d551fc7 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,4 @@
-title: FAQ JSON-LD Manager
+title: Renderbit FAQ Structured Data
 description: A WordPress plugin to manage FAQ items as a custom post type (CPT) and inject FAQ JSON-LD into posts/pages.
 show_downloads: true
 google_analytics:
diff --git a/assets/js/fqj-admin.js b/assets/js/rfsd-admin.js
similarity index 80%
rename from assets/js/fqj-admin.js
rename to assets/js/rfsd-admin.js
index 426fe7d..0ed1c9d 100644
--- a/assets/js/fqj-admin.js
+++ b/assets/js/rfsd-admin.js
@@ -1,8 +1,8 @@
 jQuery(document).ready(function ($) {
-  var $assocType = $("#fqj_assoc_type");
-  var $container = $("#fqj_assoc_container");
+  var $assocType = $("#rfsd_assoc_type");
+  var $container = $("#rfsd_assoc_container");
 
-  // Strings come from wp_localize_script (fqjAdmin.i18n); English is the fallback.
+  // Strings come from wp_localize_script (rfsdAdmin.i18n); English is the fallback.
   var i18n = $.extend(
     {
       urlsHelp: "Enter one full URL per line (e.g. https://example.com/about/)",
@@ -13,7 +13,7 @@ jQuery(document).ready(function ($) {
       termsPlaceholder: "Search terms by name...",
       globalHelp: "This FAQ will be included site-wide."
     },
-    (window.fqjAdmin && window.fqjAdmin.i18n) || {}
+    (window.rfsdAdmin && window.rfsdAdmin.i18n) || {}
   );
 
   // Build elements from a tag name and attributes rather than HTML strings.
@@ -41,8 +41,8 @@ jQuery(document).ready(function ($) {
       $container.append(el("p").text(i18n.urlsHelp));
       $container.append(
         el("textarea", {
-          id: "fqj_assoc_urls",
-          name: "fqj_assoc_urls",
+          id: "rfsd_assoc_urls",
+          name: "rfsd_assoc_urls",
           rows: 6,
           style: "width:100%;"
         }).val(urls)
@@ -51,23 +51,23 @@ jQuery(document).ready(function ($) {
       $container.append(el("p").text(i18n.postsHelp));
       $container.append(
         el("select", {
-          id: "fqj_assoc_posts_select",
-          name: "fqj_assoc_posts_select[]",
+          id: "rfsd_assoc_posts_select",
+          name: "rfsd_assoc_posts_select[]",
           multiple: "multiple",
           style: "width:100%"
         })
       );
-      $("#fqj_assoc_posts_select").select2({
+      $("#rfsd_assoc_posts_select").select2({
         placeholder: i18n.postsPlaceholder,
         ajax: {
-          url: fqjAdmin.ajax_url,
+          url: rfsdAdmin.ajax_url,
           dataType: "json",
           delay: 250,
           data: function (params) {
             return {
               q: params.term,
-              action: "fqj_search_posts",
-              nonce: fqjAdmin.nonce
+              action: "rfsd_search_posts",
+              nonce: rfsdAdmin.nonce
             };
           },
           processResults: function (data) {
@@ -86,7 +86,7 @@ jQuery(document).ready(function ($) {
       });
 
       if (data.posts && data.posts.length) {
-        var select = $("#fqj_assoc_posts_select");
+        var select = $("#rfsd_assoc_posts_select");
         data.posts.forEach(function (p) {
           var option = new Option(p.text, p.id, true, true);
           select.append(option);
@@ -95,14 +95,14 @@ jQuery(document).ready(function ($) {
       }
     } else if (type === "post_types") {
       $container.append(el("p").text(i18n.postTypesHelp));
-      $container.append(el("div", { id: "fqj_post_types_wrap" }));
+      $container.append(el("div", { id: "rfsd_post_types_wrap" }));
       $.get(
-        fqjAdmin.ajax_url,
-        { action: "fqj_get_post_types", nonce: fqjAdmin.nonce },
+        rfsdAdmin.ajax_url,
+        { action: "rfsd_get_post_types", nonce: rfsdAdmin.nonce },
         function (resp) {
           if (seq !== renderSeq) return;
           if (!resp || !resp.length) return;
-          var wrap = $("#fqj_post_types_wrap");
+          var wrap = $("#rfsd_post_types_wrap");
           resp.forEach(function (pt) {
             var checked =
               data.post_types && data.post_types.indexOf(pt.name) !== -1
@@ -110,7 +110,7 @@ jQuery(document).ready(function ($) {
                 : "";
             var $box = el("input", {
               type: "checkbox",
-              name: "fqj_assoc_post_types[]"
+              name: "rfsd_assoc_post_types[]"
             })
               .val(pt.name)
               .prop("checked", !!checked);
@@ -128,23 +128,23 @@ jQuery(document).ready(function ($) {
       $container.append(el("p").text(i18n.termsHelp));
       $container.append(
         el("select", {
-          id: "fqj_assoc_terms_select",
-          name: "fqj_assoc_terms_select[]",
+          id: "rfsd_assoc_terms_select",
+          name: "rfsd_assoc_terms_select[]",
           multiple: "multiple",
           style: "width:100%"
         })
       );
-      $("#fqj_assoc_terms_select").select2({
+      $("#rfsd_assoc_terms_select").select2({
         placeholder: i18n.termsPlaceholder,
         ajax: {
-          url: fqjAdmin.ajax_url,
+          url: rfsdAdmin.ajax_url,
           dataType: "json",
           delay: 250,
           data: function (params) {
             return {
               q: params.term,
-              action: "fqj_search_terms",
-              nonce: fqjAdmin.nonce
+              action: "rfsd_search_terms",
+              nonce: rfsdAdmin.nonce
             };
           },
           processResults: function (data) {
@@ -161,7 +161,7 @@ jQuery(document).ready(function ($) {
         }
       });
       if (data.terms && data.terms.length) {
-        var select = $("#fqj_assoc_terms_select");
+        var select = $("#rfsd_assoc_terms_select");
         data.terms.forEach(function (t) {
           var option = new Option(t.text, t.id, true, true);
           select.append(option);
@@ -171,7 +171,7 @@ jQuery(document).ready(function ($) {
     } else if (type === "global") {
       $container.append(el("p").text(i18n.globalHelp));
       $container.append(
-        el("input", { type: "hidden", name: "fqj_assoc_global", value: "1" })
+        el("input", { type: "hidden", name: "rfsd_assoc_global", value: "1" })
       );
     }
   }
@@ -189,7 +189,7 @@ jQuery(document).ready(function ($) {
   // Read the in-progress selection out of the currently rendered field.
   function captureState(type) {
     if (type === "urls") {
-      var raw = $("#fqj_assoc_urls").val();
+      var raw = $("#rfsd_assoc_urls").val();
       return {
         urls: raw
           ? raw.split(/\r\n|\n|\r/).filter(function (l) {
@@ -199,10 +199,10 @@ jQuery(document).ready(function ($) {
       };
     }
     if (type === "posts") {
-      return { posts: selectedOptions("#fqj_assoc_posts_select") };
+      return { posts: selectedOptions("#rfsd_assoc_posts_select") };
     }
     if (type === "tax_terms") {
-      return { terms: selectedOptions("#fqj_assoc_terms_select") };
+      return { terms: selectedOptions("#rfsd_assoc_terms_select") };
     }
     if (type === "post_types") {
       // Until the checkboxes load, keep the data they would have shown.
@@ -210,7 +210,7 @@ jQuery(document).ready(function ($) {
         return { post_types: renderedData.post_types || [] };
       }
       return {
-        post_types: $('input[name="fqj_assoc_post_types[]"]:checked')
+        post_types: $('input[name="rfsd_assoc_post_types[]"]:checked')
           .map(function () {
             return this.value;
           })
@@ -223,7 +223,7 @@ jQuery(document).ready(function ($) {
   // preload data
   var initData = {};
   try {
-    var raw = $("#fqj_assoc_data").val();
+    var raw = $("#rfsd_assoc_data").val();
     if (raw) initData = JSON.parse(raw);
   } catch (e) {
     initData = {};
diff --git a/assets/js/fqj-health.js b/assets/js/rfsd-health.js
similarity index 68%
rename from assets/js/fqj-health.js
rename to assets/js/rfsd-health.js
index ec929b6..8093157 100644
--- a/assets/js/fqj-health.js
+++ b/assets/js/rfsd-health.js
@@ -1,5 +1,5 @@
 jQuery(document).ready(function ($) {
-  // Strings come from wp_localize_script (fqjHealth.i18n); English is the fallback.
+  // Strings come from wp_localize_script (rfsdHealth.i18n); English is the fallback.
   var i18n = $.extend(
     {
       processing: "Processing…",
@@ -19,22 +19,22 @@ jQuery(document).ready(function ($) {
       clearConfirm: "Clear invalidation log? This will remove recent run history.",
       notAvailable: "n/a"
     },
-    (window.fqjHealth && window.fqjHealth.i18n) || {}
+    (window.rfsdHealth && window.rfsdHealth.i18n) || {}
   );
 
-  $("#fqj-process-now").on("click", function (e) {
+  $("#rfsd-process-now").on("click", function (e) {
     e.preventDefault();
-    var $status = $("#fqj-action-status").text(i18n.processing);
+    var $status = $("#rfsd-action-status").text(i18n.processing);
     $.post(
-      fqjHealth.ajax_url,
+      rfsdHealth.ajax_url,
       {
-        action: "fqj_process_queue_now",
-        nonce: fqjHealth.nonce
+        action: "rfsd_process_queue_now",
+        nonce: rfsdHealth.nonce
       },
       function (resp) {
         if (resp.success) {
-          $("#fqj-queue-count").text(resp.data.queue_len);
-          $("#fqj-last-run").text(resp.data.last_run_human || i18n.notAvailable);
+          $("#rfsd-queue-count").text(resp.data.queue_len);
+          $("#rfsd-last-run").text(resp.data.last_run_human || i18n.notAvailable);
           $status.text(i18n.processed.replace("%d", resp.data.processed));
         } else {
           $status.text(
@@ -51,18 +51,18 @@ jQuery(document).ready(function ($) {
     });
   });
 
-  $("#fqj-purge-transients").on("click", function (e) {
+  $("#rfsd-purge-transients").on("click", function (e) {
     e.preventDefault();
     if (
       !confirm(i18n.purgeConfirm)
     )
       return;
-    var $status = $("#fqj-action-status").text(i18n.purging);
+    var $status = $("#rfsd-action-status").text(i18n.purging);
     $.post(
-      fqjHealth.ajax_url,
+      rfsdHealth.ajax_url,
       {
-        action: "fqj_purge_transients",
-        nonce: fqjHealth.nonce
+        action: "rfsd_purge_transients",
+        nonce: rfsdHealth.nonce
       },
       function (resp) {
         if (resp.success) {
@@ -76,18 +76,18 @@ jQuery(document).ready(function ($) {
     });
   });
 
-  $("#fqj-clear-log").on("click", function (e) {
+  $("#rfsd-clear-log").on("click", function (e) {
     e.preventDefault();
     if (
       !confirm(i18n.clearConfirm)
     )
       return;
-    var $status = $("#fqj-action-status").text(i18n.clearing);
+    var $status = $("#rfsd-action-status").text(i18n.clearing);
     $.post(
-      fqjHealth.ajax_url,
+      rfsdHealth.ajax_url,
       {
-        action: "fqj_clear_invalidation_log",
-        nonce: fqjHealth.nonce
+        action: "rfsd_clear_invalidation_log",
+        nonce: rfsdHealth.nonce
       },
       function (resp) {
         if (resp.success) {
diff --git a/bin/bump-version.php b/bin/bump-version.php
index a21b6c3..046a180 100644
--- a/bin/bump-version.php
+++ b/bin/bump-version.php
@@ -4,7 +4,7 @@
  *
  * Usage: php bin/bump-version.php major|minor|patch
  *
- * Updates the composer.json "version", the Version header and FQJ_VERSION in faq-jsonld.php, and the
+ * Updates the composer.json "version", the Version header and RFSD_VERSION in renderbit-faq-structured-data.php, and the
  * Stable tag in readme.txt. deploy-wporg.yml refuses to publish when these differ from the release tag.
  * Run through `composer bump-major|bump-minor|bump-patch`, which also refresh the composer.lock hash.
  *
@@ -14,65 +14,65 @@
 // phpcs:disable WordPress.WP.AlternativeFunctions -- Standalone CLI script; WordPress is not loaded.
 // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped -- Prints to the terminal, not a page.
 
-$fqj_part = isset( $argv[1] ) ? $argv[1] : '';
-if ( ! in_array( $fqj_part, array( 'major', 'minor', 'patch' ), true ) ) {
+$rfsd_part = isset( $argv[1] ) ? $argv[1] : '';
+if ( ! in_array( $rfsd_part, array( 'major', 'minor', 'patch' ), true ) ) {
 	fwrite( STDERR, "Usage: php bin/bump-version.php major|minor|patch\n" );
 	exit( 1 );
 }
 
-$fqj_root = dirname( __DIR__ );
+$rfsd_root = dirname( __DIR__ );
 
-$fqj_composer = json_decode( file_get_contents( $fqj_root . '/composer.json' ), true );
-$fqj_old      = isset( $fqj_composer['version'] ) ? $fqj_composer['version'] : '';
-if ( ! preg_match( '/^(\d+)\.(\d+)\.(\d+)$/', $fqj_old, $fqj_m ) ) {
-	fwrite( STDERR, "composer.json version \"$fqj_old\" is not MAJOR.MINOR.PATCH.\n" );
+$rfsd_composer = json_decode( file_get_contents( $rfsd_root . '/composer.json' ), true );
+$rfsd_old      = isset( $rfsd_composer['version'] ) ? $rfsd_composer['version'] : '';
+if ( ! preg_match( '/^(\d+)\.(\d+)\.(\d+)$/', $rfsd_old, $rfsd_m ) ) {
+	fwrite( STDERR, "composer.json version \"$rfsd_old\" is not MAJOR.MINOR.PATCH.\n" );
 	exit( 1 );
 }
 
-list( , $fqj_major, $fqj_minor, $fqj_patch ) = array_map( 'intval', $fqj_m );
-if ( 'major' === $fqj_part ) {
-	$fqj_new = ( $fqj_major + 1 ) . '.0.0';
-} elseif ( 'minor' === $fqj_part ) {
-	$fqj_new = $fqj_major . '.' . ( $fqj_minor + 1 ) . '.0';
+list( , $rfsd_major, $rfsd_minor, $rfsd_patch ) = array_map( 'intval', $rfsd_m );
+if ( 'major' === $rfsd_part ) {
+	$rfsd_new = ( $rfsd_major + 1 ) . '.0.0';
+} elseif ( 'minor' === $rfsd_part ) {
+	$rfsd_new = $rfsd_major . '.' . ( $rfsd_minor + 1 ) . '.0';
 } else {
-	$fqj_new = $fqj_major . '.' . $fqj_minor . '.' . ( $fqj_patch + 1 );
+	$rfsd_new = $rfsd_major . '.' . $rfsd_minor . '.' . ( $rfsd_patch + 1 );
 }
 
 // Each pattern must match exactly once, and in the form deploy-wporg.yml reads it back.
-$fqj_files = array(
-	'composer.json'  => array( '/^(\s*"version":\s*")[^"]*(")/m' ),
-	'faq-jsonld.php' => array(
+$rfsd_files = array(
+	'composer.json'                     => array( '/^(\s*"version":\s*")[^"]*(")/m' ),
+	'renderbit-faq-structured-data.php' => array(
 		'/^( \* Version: *).*$/m',
-		"/^(define\\( 'FQJ_VERSION', ').*(' \\);)$/m",
+		"/^(define\\( 'RFSD_VERSION', ').*(' \\);)$/m",
 	),
-	'readme.txt'     => array( '/^(Stable tag: *).*$/m' ),
+	'readme.txt'                        => array( '/^(Stable tag: *).*$/m' ),
 );
 
 // Check every file before writing any, so a failure leaves the versions consistent.
-$fqj_updated = array();
-foreach ( $fqj_files as $fqj_file => $fqj_patterns ) {
-	$fqj_contents = file_get_contents( $fqj_root . '/' . $fqj_file );
-	foreach ( $fqj_patterns as $fqj_pattern ) {
-		$fqj_contents = preg_replace_callback(
-			$fqj_pattern,
-			function ( $m ) use ( $fqj_new ) {
-				return $m[1] . $fqj_new . ( isset( $m[2] ) ? $m[2] : '' );
+$rfsd_updated = array();
+foreach ( $rfsd_files as $rfsd_file => $rfsd_patterns ) {
+	$rfsd_contents = file_get_contents( $rfsd_root . '/' . $rfsd_file );
+	foreach ( $rfsd_patterns as $rfsd_pattern ) {
+		$rfsd_contents = preg_replace_callback(
+			$rfsd_pattern,
+			function ( $m ) use ( $rfsd_new ) {
+				return $m[1] . $rfsd_new . ( isset( $m[2] ) ? $m[2] : '' );
 			},
-			$fqj_contents,
+			$rfsd_contents,
 			-1,
-			$fqj_count
+			$rfsd_count
 		);
-		if ( 1 !== $fqj_count ) {
-			fwrite( STDERR, "Expected one match for $fqj_pattern in $fqj_file, found $fqj_count. Nothing was changed.\n" );
+		if ( 1 !== $rfsd_count ) {
+			fwrite( STDERR, "Expected one match for $rfsd_pattern in $rfsd_file, found $rfsd_count. Nothing was changed.\n" );
 			exit( 1 );
 		}
 	}
-	$fqj_updated[ $fqj_file ] = $fqj_contents;
+	$rfsd_updated[ $rfsd_file ] = $rfsd_contents;
 }
 
-foreach ( $fqj_updated as $fqj_file => $fqj_contents ) {
-	file_put_contents( $fqj_root . '/' . $fqj_file, $fqj_contents );
+foreach ( $rfsd_updated as $rfsd_file => $rfsd_contents ) {
+	file_put_contents( $rfsd_root . '/' . $rfsd_file, $rfsd_contents );
 }
 
-echo "Bumped $fqj_old -> $fqj_new in " . implode( ', ', array_keys( $fqj_updated ) ) . ".\n";
-echo "Add a readme.txt changelog entry for $fqj_new.\n";
+echo "Bumped $rfsd_old -> $rfsd_new in " . implode( ', ', array_keys( $rfsd_updated ) ) . ".\n";
+echo "Add a readme.txt changelog entry for $rfsd_new.\n";
diff --git a/bin/check-zip.sh b/bin/check-zip.sh
index 31890ce..ec6cccf 100755
--- a/bin/check-zip.sh
+++ b/bin/check-zip.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 # Verify a release zip contains only runtime plugin files.
-# Usage: bin/check-zip.sh [faq-jsonld.zip]
+# Usage: bin/check-zip.sh [renderbit-faq-structured-data.zip]
 set -euo pipefail
 
-zip_file="${1:-faq-jsonld.zip}"
-prefix="faq-jsonld/"
+zip_file="${1:-renderbit-faq-structured-data.zip}"
+prefix="renderbit-faq-structured-data/"
 
 if [ ! -f "$zip_file" ]; then
 	echo "Zip not found: $zip_file" >&2
@@ -19,7 +19,7 @@ status=0
 # Every entry must be inside the plugin folder and match the allow-list.
 while IFS= read -r entry; do
 	case "$entry" in
-		"$prefix" | "${prefix}faq-jsonld.php" | "${prefix}uninstall.php" | "${prefix}README.md" | "${prefix}readme.txt" | "${prefix}LICENSE.md" | "${prefix}includes/"* | "${prefix}assets/"*) ;;
+		"$prefix" | "${prefix}renderbit-faq-structured-data.php" | "${prefix}uninstall.php" | "${prefix}README.md" | "${prefix}readme.txt" | "${prefix}LICENSE.md" | "${prefix}includes/"* | "${prefix}assets/"*) ;;
 		*)
 			echo "Unexpected path in zip: $entry" >&2
 			status=1
@@ -28,7 +28,7 @@ while IFS= read -r entry; do
 done <<<"$entries"
 
 # Required files must be present.
-for required in faq-jsonld.php readme.txt uninstall.php includes/admin.php assets/js/fqj-admin.js assets/vendor/select2/select2.min.js assets/vendor/select2/select2.js assets/vendor/select2/LICENSE.md LICENSE.md; do
+for required in renderbit-faq-structured-data.php readme.txt uninstall.php includes/admin.php assets/js/rfsd-admin.js assets/vendor/select2/select2.min.js assets/vendor/select2/select2.js assets/vendor/select2/LICENSE.md LICENSE.md; do
 	if ! grep -qx "${prefix}${required}" <<<"$entries"; then
 		echo "Missing from zip: ${required}" >&2
 		status=1
diff --git a/composer.json b/composer.json
index 0274c8f..13a6f58 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "renderbit/faq-jsonld",
+  "name": "renderbit/renderbit-faq-structured-data",
   "description": "WordPress plugin to manage FAQ items as CPT and inject FAQ JSON-LD with advanced caching and queueing.",
   "type": "wordpress-plugin",
   "license": "GPL-2.0-or-later",
@@ -21,11 +21,11 @@
   },
   "autoload": {
     "psr-4": {
-      "FQJ\\": "includes/"
+      "RFSD\\": "includes/"
     }
   },
   "extra": {
-    "installer-name": "faq-jsonld"
+    "installer-name": "renderbit-faq-structured-data"
   },
   "config": {
     "allow-plugins": {
@@ -37,8 +37,8 @@
     }
   },
   "scripts": {
-    "build-zip": "rm -f faq-jsonld.zip && git archive --format=zip --prefix=faq-jsonld/ -o faq-jsonld.zip HEAD",
-    "check-zip": "bash bin/check-zip.sh faq-jsonld.zip",
+    "build-zip": "rm -f renderbit-faq-structured-data.zip && git archive --format=zip --prefix=renderbit-faq-structured-data/ -o renderbit-faq-structured-data.zip HEAD",
+    "check-zip": "bash bin/check-zip.sh renderbit-faq-structured-data.zip",
     "lint": "phpcs",
     "test": "phpunit",
     "test:multisite": "phpunit -c phpunit-multisite.xml.dist",
diff --git a/composer.lock b/composer.lock
index 1b794c5..aba209e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "15e48b154a283df2dae0558d030ad27c",
+    "content-hash": "1a98d2968cfaafd77725584d0a4cd16a",
     "packages": [
         {
             "name": "composer/installers",
diff --git a/faq-jsonld.php b/faq-jsonld.php
deleted file mode 100644
index e0b29f4..0000000
--- a/faq-jsonld.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * Plugin Name: FAQ JSON-LD Manager
- * Plugin URI:  https://github.com/renderbit-technologies/faq-jsonld-wordpress-plugin
- * Description: Manage FAQ items as a custom post type and output FAQPage JSON-LD on the posts and pages they apply to.
- * Version:     3.1.1
- * Requires at least: 6.5
- * Requires PHP: 7.2
- * Author:      Renderbit Technologies
- * License:     GPLv2 or later
- * License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * Text Domain: faq-jsonld
- *
- * @package FAQ_JSON_LD
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-
-// phpcs:disable PSR1.Files.SideEffects
-
-// Keep in sync with the Version header above; used to version the plugin's own assets.
-define( 'FQJ_VERSION', '3.1.1' );
-// Upper bound for the invalidation batch size setting.
-define( 'FQJ_MAX_BATCH_SIZE', 5000 );
-define( 'FQJ_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
-define( 'FQJ_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
-define( 'FQJ_OPTION_KEY', 'fqj_settings' );
-define( 'FQJ_DB_VERSION', '3' );
-define( 'FQJ_DB_VERSION_OPTION', 'fqj_db_version' );
-
-// Data migration version: bump to run a one-time reindex and cache purge on existing sites.
-define( 'FQJ_DATA_VERSION', '3' );
-define( 'FQJ_DATA_VERSION_OPTION', 'fqj_data_version' );
-define( 'FQJ_DATA_MIGRATION_CURSOR_OPTION', 'fqj_data_migration_cursor' );
-// URL associations rewritten by data migration 3, shown on the FAQ list screen until dismissed.
-define( 'FQJ_URL_MIGRATION_REPORT_OPTION', 'fqj_url_migration_report' );
-
-// Post type of FAQ items. Older post type names in FQJ_LEGACY_POST_TYPES are renamed to it on existing sites.
-define( 'FQJ_POST_TYPE', 'fqj_faq' );
-define( 'FQJ_LEGACY_POST_TYPES', array( 'faq_item' ) );
-define( 'FQJ_POST_TYPE_OPTION', 'fqj_post_type' );
-
-/**
- * Autoload includes
- */
-require_once FQJ_PLUGIN_DIR . 'includes/settings.php';
-require_once FQJ_PLUGIN_DIR . 'includes/coverage.php';
-require_once FQJ_PLUGIN_DIR . 'includes/indexer.php';
-require_once FQJ_PLUGIN_DIR . 'includes/queue.php';
-require_once FQJ_PLUGIN_DIR . 'includes/admin.php';
-require_once FQJ_PLUGIN_DIR . 'includes/frontend.php';
-require_once FQJ_PLUGIN_DIR . 'includes/class-fqjcli.php';
-require_once FQJ_PLUGIN_DIR . 'includes/health.php';
-
-/**
- * Register CPT
- */
-function fqj_register_cpt_faq_item() {
-	$labels = array(
-		'name'          => __( 'FAQ Items', 'faq-jsonld' ),
-		'singular_name' => __( 'FAQ Item', 'faq-jsonld' ),
-		'add_new_item'  => __( 'Add FAQ Item', 'faq-jsonld' ),
-		'edit_item'     => __( 'Edit FAQ Item', 'faq-jsonld' ),
-		'new_item'      => __( 'New FAQ Item', 'faq-jsonld' ),
-		'view_item'     => __( 'View FAQ Item', 'faq-jsonld' ),
-		'search_items'  => __( 'Search FAQ Items', 'faq-jsonld' ),
-		'not_found'     => __( 'No FAQ items found', 'faq-jsonld' ),
-		'all_items'     => __( 'All FAQ Items', 'faq-jsonld' ),
-	);
-	$args   = array(
-		'labels'          => $labels,
-		'public'          => false,
-		'show_ui'         => true,
-		'show_in_menu'    => true,
-		'capability_type' => 'post',
-		'hierarchical'    => false,
-		'supports'        => array( 'title', 'editor' ),
-		'menu_position'   => 25,
-		'menu_icon'       => 'dashicons-editor-help',
-		'has_archive'     => false,
-	);
-	register_post_type( FQJ_POST_TYPE, $args );
-}
-add_action( 'init', 'fqj_register_cpt_faq_item' );
-
-/**
- * Rename FAQ items stored under a legacy post type to FQJ_POST_TYPE, once per site.
- *
- * Runs before the schema upgrade and the data migration, which only look at FQJ_POST_TYPE.
- */
-function fqj_migrate_legacy_post_types() {
-	global $wpdb;
-
-	if ( FQJ_POST_TYPE === get_option( FQJ_POST_TYPE_OPTION ) ) {
-		return;
-	}
-
-	foreach ( FQJ_LEGACY_POST_TYPES as $legacy ) {
-		// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
-		$ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s", $legacy ) );
-		if ( $ids ) {
-			$wpdb->update( $wpdb->posts, array( 'post_type' => FQJ_POST_TYPE ), array( 'post_type' => $legacy ) );
-		}
-		// phpcs:enable
-		foreach ( $ids as $id ) {
-			clean_post_cache( (int) $id );
-		}
-	}
-
-	update_option( FQJ_POST_TYPE_OPTION, FQJ_POST_TYPE );
-}
-add_action( 'plugins_loaded', 'fqj_migrate_legacy_post_types', 5 );
-
-/**
- * Run a callback for every site of the network, or once when the install is single-site.
- *
- * @param callable $callback Called with no arguments while the site is switched to.
- */
-function fqj_for_each_site( $callback ) {
-	if ( ! is_multisite() ) {
-		call_user_func( $callback );
-		return;
-	}
-
-	$site_ids = get_sites(
-		array(
-			'fields' => 'ids',
-			'number' => 0,
-		)
-	);
-	foreach ( $site_ids as $site_id ) {
-		switch_to_blog( $site_id );
-		call_user_func( $callback );
-		restore_current_blog();
-	}
-}
-
-/**
- * Activate the plugin for the current site: create DB table, defaults, schedule cron.
- */
-function fqj_activate_site() {
-	fqj_migrate_legacy_post_types();
-
-	// A site with no FAQs yet has nothing to migrate.
-	if ( false === get_option( FQJ_DATA_VERSION_OPTION ) && ! fqj_has_faq_items() ) {
-		// Cached output can outlive deleted FAQs on a reactivated site.
-		fqj_purge_all_faq_transients();
-		update_option( FQJ_DATA_VERSION_OPTION, FQJ_DATA_VERSION );
-	}
-
-	fqj_create_table();
-	// Reactivating after an upgrade skips the plugins_loaded upgrade path, so carry old data over here too.
-	fqj_migrate_legacy_queue();
-	fqj_unautoload_options();
-
-	$defaults            = array(
-		'cache_ttl'   => 12 * HOUR_IN_SECONDS,
-		'batch_size'  => 500,
-		'output_type' => 'faqpage',
-	);
-	$opts                = get_option( FQJ_OPTION_KEY, array() );
-	$opts                = wp_parse_args( $opts, $defaults );
-	$opts['output_type'] = fqj_normalize_output_type( $opts['output_type'] );
-	update_option( FQJ_OPTION_KEY, $opts );
-
-	// schedule cron if not scheduled.
-	if ( ! wp_next_scheduled( 'fqj_process_invalidation_queue' ) ) {
-		// Use a custom interval 'fqj_five_minutes' registered in queue.php.
-		wp_schedule_event( time() + 60, 'fqj_five_minutes', 'fqj_process_invalidation_queue' );
-	}
-}
-
-/**
- * Activation. On network activation every existing site is set up.
- *
- * @param bool $network_wide Whether the plugin is being activated network-wide.
- */
-function fqj_activate( $network_wide = false ) {
-	if ( $network_wide && is_multisite() ) {
-		fqj_for_each_site( 'fqj_activate_site' );
-		return;
-	}
-
-	fqj_activate_site();
-}
-register_activation_hook( __FILE__, 'fqj_activate' );
-
-/**
- * Set up a site created while the plugin is network-active.
- *
- * @param WP_Site $new_site The new site.
- */
-function fqj_on_initialize_site( $new_site ) {
-	if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
-		require_once ABSPATH . 'wp-admin/includes/plugin.php';
-	}
-	if ( ! is_plugin_active_for_network( plugin_basename( __FILE__ ) ) ) {
-		return;
-	}
-
-	switch_to_blog( (int) $new_site->blog_id );
-	fqj_activate_site();
-	restore_current_blog();
-}
-// Late priority so the new site's default options and tables exist first.
-add_action( 'wp_initialize_site', 'fqj_on_initialize_site', 900 );
-
-/**
- * Clear the plugin's scheduled events for the current site.
- */
-function fqj_clear_scheduled_events() {
-	wp_clear_scheduled_hook( 'fqj_process_invalidation_queue' );
-	wp_clear_scheduled_hook( 'fqj_data_migration' );
-}
-
-/**
- * Deactivation: clear cron events (on every site for network deactivation).
- *
- * @param bool $network_wide Whether the plugin is being deactivated network-wide.
- */
-function fqj_deactivate( $network_wide = false ) {
-	if ( $network_wide && is_multisite() ) {
-		fqj_for_each_site( 'fqj_clear_scheduled_events' );
-		return;
-	}
-
-	fqj_clear_scheduled_events();
-}
-register_deactivation_hook( __FILE__, 'fqj_deactivate' );
diff --git a/includes/admin.php b/includes/admin.php
index 0ae4bbd..75b3460 100644
--- a/includes/admin.php
+++ b/includes/admin.php
@@ -2,7 +2,7 @@
 /**
  * Admin functions.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -16,12 +16,12 @@
  *
  * @param string $hook The current admin page.
  */
-function fqj_admin_assets( $hook ) {
+function rfsd_admin_assets( $hook ) {
 	global $post;
 	if ( ! in_array( $hook, array( 'post.php', 'post-new.php' ), true ) ) {
 		return;
 	}
-	if ( ! $post || FQJ_POST_TYPE !== $post->post_type ) {
+	if ( ! $post || RFSD_POST_TYPE !== $post->post_type ) {
 		return;
 	}
 
@@ -30,7 +30,7 @@ function fqj_admin_assets( $hook ) {
 	 * selectWoo) has already registered a Select2 build, reuse it as the dependency instead of loading a second
 	 * copy that would clash on jQuery.fn.select2.
 	 */
-	$select2_handle = 'fqj-select2-js';
+	$select2_handle = 'rfsd-select2-js';
 	if ( wp_script_is( 'select2', 'registered' ) ) {
 		$select2_handle = 'select2';
 	} elseif ( wp_script_is( 'selectWoo', 'registered' ) ) {
@@ -40,16 +40,16 @@ function fqj_admin_assets( $hook ) {
 	// The unminified Select2 sources ship alongside the minified build; SCRIPT_DEBUG loads them.
 	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-	if ( 'fqj-select2-js' === $select2_handle ) {
+	if ( 'rfsd-select2-js' === $select2_handle ) {
 		wp_enqueue_style(
-			'fqj-select2-css',
-			FQJ_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.css',
+			'rfsd-select2-css',
+			RFSD_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.css',
 			array(),
 			'4.1.0'
 		);
 		wp_enqueue_script(
-			'fqj-select2-js',
-			FQJ_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.js',
+			'rfsd-select2-js',
+			RFSD_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.js',
 			array( 'jquery' ),
 			'4.1.0',
 			true
@@ -68,8 +68,8 @@ function fqj_admin_assets( $hook ) {
 			wp_enqueue_style( $style_handle );
 		} else {
 			wp_enqueue_style(
-				'fqj-select2-css',
-				FQJ_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.css',
+				'rfsd-select2-css',
+				RFSD_PLUGIN_URL . 'assets/vendor/select2/select2' . $suffix . '.css',
 				array(),
 				'4.1.0'
 			);
@@ -77,58 +77,58 @@ function fqj_admin_assets( $hook ) {
 	}
 
 	wp_enqueue_script(
-		'fqj-admin-js',
-		FQJ_PLUGIN_URL . 'assets/js/fqj-admin.js',
+		'rfsd-admin-js',
+		RFSD_PLUGIN_URL . 'assets/js/rfsd-admin.js',
 		array( 'jquery', $select2_handle ),
-		FQJ_VERSION,
+		RFSD_VERSION,
 		true
 	);
 	wp_localize_script(
-		'fqj-admin-js',
-		'fqjAdmin',
+		'rfsd-admin-js',
+		'rfsdAdmin',
 		array(
 			'ajax_url' => admin_url( 'admin-ajax.php' ),
-			'nonce'    => wp_create_nonce( 'fqj_admin_nonce' ),
+			'nonce'    => wp_create_nonce( 'rfsd_admin_nonce' ),
 			'post_id'  => get_the_ID(),
 			'i18n'     => array(
-				'urlsHelp'         => __( 'Enter one URL per line (e.g. https://example.com/about/). The FAQ appears on whichever post has that permalink.', 'faq-jsonld' ),
-				'postsHelp'        => __( 'Search posts/pages and add multiple results.', 'faq-jsonld' ),
-				'postsPlaceholder' => __( 'Search posts by title...', 'faq-jsonld' ),
-				'postTypesHelp'    => __( 'Select post type(s) to associate this FAQ with.', 'faq-jsonld' ),
-				'termsHelp'        => __( 'Search taxonomy terms and add multiple results.', 'faq-jsonld' ),
-				'termsPlaceholder' => __( 'Search terms by name...', 'faq-jsonld' ),
-				'globalHelp'       => __( 'This FAQ will be included site-wide.', 'faq-jsonld' ),
+				'urlsHelp'         => __( 'Enter one URL per line (e.g. https://example.com/about/). The FAQ appears on whichever post has that permalink.', 'renderbit-faq-structured-data' ),
+				'postsHelp'        => __( 'Search posts/pages and add multiple results.', 'renderbit-faq-structured-data' ),
+				'postsPlaceholder' => __( 'Search posts by title...', 'renderbit-faq-structured-data' ),
+				'postTypesHelp'    => __( 'Select post type(s) to associate this FAQ with.', 'renderbit-faq-structured-data' ),
+				'termsHelp'        => __( 'Search taxonomy terms and add multiple results.', 'renderbit-faq-structured-data' ),
+				'termsPlaceholder' => __( 'Search terms by name...', 'renderbit-faq-structured-data' ),
+				'globalHelp'       => __( 'This FAQ will be included site-wide.', 'renderbit-faq-structured-data' ),
 			),
 		)
 	);
 }
-add_action( 'admin_enqueue_scripts', 'fqj_admin_assets' );
+add_action( 'admin_enqueue_scripts', 'rfsd_admin_assets' );
 
 /**
  * Add association meta box
  */
-function fqj_add_meta_boxes() {
+function rfsd_add_meta_boxes() {
 	add_meta_box(
-		'fqj_assoc_rules',
-		__( 'Associations & Output', 'faq-jsonld' ),
-		'fqj_assoc_rules_meta_box_cb',
-		FQJ_POST_TYPE,
+		'rfsd_assoc_rules',
+		__( 'Associations & Output', 'renderbit-faq-structured-data' ),
+		'rfsd_assoc_rules_meta_box_cb',
+		RFSD_POST_TYPE,
 		'normal',
 		'default'
 	);
 }
-add_action( 'add_meta_boxes', 'fqj_add_meta_boxes' );
+add_action( 'add_meta_boxes', 'rfsd_add_meta_boxes' );
 
 /**
  * Render association meta box.
  *
  * @param WP_Post $post The post object.
  */
-function fqj_assoc_rules_meta_box_cb( $post ) {
-	wp_nonce_field( 'fqj_save_meta', 'fqj_meta_nonce' );
+function rfsd_assoc_rules_meta_box_cb( $post ) {
+	wp_nonce_field( 'rfsd_save_meta', 'rfsd_meta_nonce' );
 
 	// Load stored JSON payload for this FAQ.
-	$data_json = get_post_meta( $post->ID, 'fqj_assoc_data_json', true );
+	$data_json = get_post_meta( $post->ID, 'rfsd_assoc_data_json', true );
 	$data_json = $data_json ? $data_json : '{}';
 	$data      = json_decode( $data_json, true );
 	if ( ! is_array( $data ) ) {
@@ -148,7 +148,7 @@ function fqj_assoc_rules_meta_box_cb( $post ) {
 				}
 			} else {
 				/* translators: %d: post ID. */
-				$text = sprintf( __( 'Post #%d (not found)', 'faq-jsonld' ), $pid );
+				$text = sprintf( __( 'Post #%d (not found)', 'renderbit-faq-structured-data' ), $pid );
 			}
 			$hydrated_posts[] = array(
 				'id'   => $pid,
@@ -166,7 +166,7 @@ function fqj_assoc_rules_meta_box_cb( $post ) {
 				$text = $term->name . ' (' . $term->taxonomy . ')';
 			} else {
 				/* translators: %d: term ID. */
-				$text = sprintf( __( 'Term #%d (not found)', 'faq-jsonld' ), $tid );
+				$text = sprintf( __( 'Term #%d (not found)', 'renderbit-faq-structured-data' ), $tid );
 			}
 			$hydrated_terms[] = array(
 				'id'   => $tid,
@@ -179,30 +179,30 @@ function fqj_assoc_rules_meta_box_cb( $post ) {
 	// Always hand the JS an object, even when the payload is empty.
 	$data_json_hydrated = empty( $data ) ? '{}' : wp_json_encode( $data );
 
-	$assoc_type = get_post_meta( $post->ID, 'fqj_assoc_type', true );
+	$assoc_type = get_post_meta( $post->ID, 'rfsd_assoc_type', true );
 	$assoc_type = $assoc_type ? $assoc_type : 'urls';
 
 	$assoc_types = array(
-		'urls'       => __( 'By URLs (one per line)', 'faq-jsonld' ),
-		'posts'      => __( 'By Posts (search & multi-select)', 'faq-jsonld' ),
-		'post_types' => __( 'By Post Types (apply to all posts of selected types)', 'faq-jsonld' ),
-		'tax_terms'  => __( 'By Taxonomy Terms (search & multi-select)', 'faq-jsonld' ),
-		'global'     => __( 'Global (site-wide)', 'faq-jsonld' ),
+		'urls'       => __( 'By URLs (one per line)', 'renderbit-faq-structured-data' ),
+		'posts'      => __( 'By Posts (search & multi-select)', 'renderbit-faq-structured-data' ),
+		'post_types' => __( 'By Post Types (apply to all posts of selected types)', 'renderbit-faq-structured-data' ),
+		'tax_terms'  => __( 'By Taxonomy Terms (search & multi-select)', 'renderbit-faq-structured-data' ),
+		'global'     => __( 'Global (site-wide)', 'renderbit-faq-structured-data' ),
 	);
 
-	echo '<p><label for="fqj_assoc_type"><strong>' . esc_html__( 'Association Type', 'faq-jsonld' ) . '</strong></label></p>';
-	echo '<select id="fqj_assoc_type" name="fqj_assoc_type" style="width:100%;max-width:400px;">';
+	echo '<p><label for="rfsd_assoc_type"><strong>' . esc_html__( 'Association Type', 'renderbit-faq-structured-data' ) . '</strong></label></p>';
+	echo '<select id="rfsd_assoc_type" name="rfsd_assoc_type" style="width:100%;max-width:400px;">';
 	foreach ( $assoc_types as $k => $label ) {
 		echo '<option value="' . esc_attr( $k ) . '"' . selected( $assoc_type, $k, false ) . '>' . esc_html( $label ) . '</option>';
 	}
 	echo '</select>';
 
-	echo '<input type="hidden" id="fqj_assoc_data" name="fqj_assoc_data" value="' .
+	echo '<input type="hidden" id="rfsd_assoc_data" name="rfsd_assoc_data" value="' .
 		esc_attr( $data_json_hydrated ) . '">';
 
-	echo '<div id="fqj_assoc_container" style="margin-top:12px;"></div>';
+	echo '<div id="rfsd_assoc_container" style="margin-top:12px;"></div>';
 
-	echo '<p class="description">' . esc_html__( 'Enter association details. Use the "By Posts" option to search and multi-select posts. For large sites, prefer Post Types or Taxonomy Terms.', 'faq-jsonld' ) . '</p>';
+	echo '<p class="description">' . esc_html__( 'Enter association details. Use the "By Posts" option to search and multi-select posts. For large sites, prefer Post Types or Taxonomy Terms.', 'renderbit-faq-structured-data' ) . '</p>';
 }
 
 /**
@@ -211,24 +211,24 @@ function fqj_assoc_rules_meta_box_cb( $post ) {
  * @param int     $post_id The post ID.
  * @param WP_Post $post The post object.
  */
-function fqj_save_meta_handler( $post_id, $post ) {
-	if ( ! isset( $_POST['fqj_meta_nonce'] ) ) {
+function rfsd_save_meta_handler( $post_id, $post ) {
+	if ( ! isset( $_POST['rfsd_meta_nonce'] ) ) {
 		return;
 	}
-	if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['fqj_meta_nonce'] ) ), 'fqj_save_meta' ) ) {
+	if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['rfsd_meta_nonce'] ) ), 'rfsd_save_meta' ) ) {
 		return;
 	}
 	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 		return;
 	}
-	if ( FQJ_POST_TYPE !== $post->post_type ) {
+	if ( RFSD_POST_TYPE !== $post->post_type ) {
 		return;
 	}
 	if ( ! current_user_can( 'edit_post', $post_id ) ) {
 		return;
 	}
 
-	$assoc_type = isset( $_POST['fqj_assoc_type'] ) ? sanitize_text_field( wp_unslash( $_POST['fqj_assoc_type'] ) ) : 'urls';
+	$assoc_type = isset( $_POST['rfsd_assoc_type'] ) ? sanitize_text_field( wp_unslash( $_POST['rfsd_assoc_type'] ) ) : 'urls';
 	if ( ! in_array( $assoc_type, array( 'urls', 'posts', 'post_types', 'tax_terms', 'global' ), true ) ) {
 		// Unknown type: leave the stored meta and mappings untouched.
 		return;
@@ -236,12 +236,12 @@ function fqj_save_meta_handler( $post_id, $post ) {
 	$payload = array();
 
 	// Drop any notices left over from an earlier save.
-	delete_transient( 'fqj_rejected_urls_' . get_current_user_id() . '_' . $post_id );
-	delete_transient( 'fqj_unmatched_urls_' . get_current_user_id() . '_' . $post_id );
+	delete_transient( 'rfsd_rejected_urls_' . get_current_user_id() . '_' . $post_id );
+	delete_transient( 'rfsd_unmatched_urls_' . get_current_user_id() . '_' . $post_id );
 
 	if ( 'urls' === $assoc_type ) {
 		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-		$raw   = isset( $_POST['fqj_assoc_urls'] ) ? trim( wp_unslash( $_POST['fqj_assoc_urls'] ) ) : '';
+		$raw   = isset( $_POST['rfsd_assoc_urls'] ) ? trim( wp_unslash( $_POST['rfsd_assoc_urls'] ) ) : '';
 		$lines = preg_split( "/\r\n|\n|\r/", $raw );
 		$urls  = array();
 		$bad   = array();
@@ -260,47 +260,47 @@ function fqj_save_meta_handler( $post_id, $post ) {
 		}
 		$payload['urls'] = array_values( array_unique( $urls ) );
 		if ( $bad ) {
-			set_transient( 'fqj_rejected_urls_' . get_current_user_id() . '_' . $post_id, $bad, MINUTE_IN_SECONDS );
+			set_transient( 'rfsd_rejected_urls_' . get_current_user_id() . '_' . $post_id, $bad, MINUTE_IN_SECONDS );
 		}
 
 		// Warn, never reject: a URL that is no post's permalink covers nothing until a post takes it.
 		$unmatched = array();
 		foreach ( $payload['urls'] as $url ) {
-			if ( fqj_post_for_url( $url ) ) {
+			if ( rfsd_post_for_url( $url ) ) {
 				continue;
 			}
-			$routed      = fqj_post_routed_from_url( $url );
+			$routed      = rfsd_post_routed_from_url( $url );
 			$unmatched[] = array(
 				'url'        => $url,
 				'suggestion' => $routed ? (string) get_permalink( $routed ) : '',
 			);
 		}
 		if ( $unmatched ) {
-			set_transient( 'fqj_unmatched_urls_' . get_current_user_id() . '_' . $post_id, $unmatched, MINUTE_IN_SECONDS );
+			set_transient( 'rfsd_unmatched_urls_' . get_current_user_id() . '_' . $post_id, $unmatched, MINUTE_IN_SECONDS );
 		}
 	} elseif ( 'posts' === $assoc_type ) {
 		$post_ids = array();
-		if ( isset( $_POST['fqj_assoc_posts_select'] ) && is_array( $_POST['fqj_assoc_posts_select'] ) ) {
+		if ( isset( $_POST['rfsd_assoc_posts_select'] ) && is_array( $_POST['rfsd_assoc_posts_select'] ) ) {
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			foreach ( wp_unslash( $_POST['fqj_assoc_posts_select'] ) as $pid ) {
+			foreach ( wp_unslash( $_POST['rfsd_assoc_posts_select'] ) as $pid ) {
 				$post_ids[] = intval( $pid );
 			}
 		}
 		$payload['posts'] = array_values( array_unique( $post_ids ) );
 	} elseif ( 'post_types' === $assoc_type ) {
 		$ptypes = array();
-		if ( isset( $_POST['fqj_assoc_post_types'] ) && is_array( $_POST['fqj_assoc_post_types'] ) ) {
+		if ( isset( $_POST['rfsd_assoc_post_types'] ) && is_array( $_POST['rfsd_assoc_post_types'] ) ) {
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			foreach ( wp_unslash( $_POST['fqj_assoc_post_types'] ) as $pt ) {
+			foreach ( wp_unslash( $_POST['rfsd_assoc_post_types'] ) as $pt ) {
 				$ptypes[] = sanitize_text_field( $pt );
 			}
 		}
 		$payload['post_types'] = array_values( array_unique( $ptypes ) );
 	} elseif ( 'tax_terms' === $assoc_type ) {
 		$terms = array();
-		if ( isset( $_POST['fqj_assoc_terms_select'] ) && is_array( $_POST['fqj_assoc_terms_select'] ) ) {
+		if ( isset( $_POST['rfsd_assoc_terms_select'] ) && is_array( $_POST['rfsd_assoc_terms_select'] ) ) {
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			foreach ( wp_unslash( $_POST['fqj_assoc_terms_select'] ) as $t ) {
+			foreach ( wp_unslash( $_POST['rfsd_assoc_terms_select'] ) as $t ) {
 				$terms[] = intval( $t );
 			}
 		}
@@ -309,23 +309,23 @@ function fqj_save_meta_handler( $post_id, $post ) {
 		$payload['global'] = true;
 	}
 
-	update_post_meta( $post_id, 'fqj_assoc_type', $assoc_type );
-	update_post_meta( $post_id, 'fqj_assoc_data_json', wp_json_encode( $payload ) );
+	update_post_meta( $post_id, 'rfsd_assoc_type', $assoc_type );
+	update_post_meta( $post_id, 'rfsd_assoc_data_json', wp_json_encode( $payload ) );
 
 	// Rebuild index (indexer will delete and reinsert mappings, then invalidate transients).
-	fqj_rebuild_index_for_faq( $post_id );
+	rfsd_rebuild_index_for_faq( $post_id );
 }
-add_action( 'save_post', 'fqj_save_meta_handler', 10, 2 );
+add_action( 'save_post', 'rfsd_save_meta_handler', 10, 2 );
 
 /**
  * Admin notice listing URLs rejected on the last save of this FAQ.
  */
-function fqj_rejected_urls_notice() {
+function rfsd_rejected_urls_notice() {
 	$post_id = isset( $_GET['post'] ) ? absint( $_GET['post'] ) : 0; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 	if ( ! $post_id ) {
 		return;
 	}
-	$key = 'fqj_rejected_urls_' . get_current_user_id() . '_' . $post_id;
+	$key = 'rfsd_rejected_urls_' . get_current_user_id() . '_' . $post_id;
 	$bad = get_transient( $key );
 	if ( empty( $bad ) || ! is_array( $bad ) ) {
 		return;
@@ -333,21 +333,21 @@ function fqj_rejected_urls_notice() {
 	delete_transient( $key );
 	printf(
 		'<div class="notice notice-warning is-dismissible"><p>%s</p><ul>%s</ul></div>',
-		esc_html__( 'These URLs were not valid and were not saved:', 'faq-jsonld' ),
+		esc_html__( 'These URLs were not valid and were not saved:', 'renderbit-faq-structured-data' ),
 		'<li><code>' . implode( '</code></li><li><code>', array_map( 'esc_html', $bad ) ) . '</code></li>' // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	);
 }
-add_action( 'admin_notices', 'fqj_rejected_urls_notice' );
+add_action( 'admin_notices', 'rfsd_rejected_urls_notice' );
 
 /**
  * Admin notice listing saved URLs of this FAQ that are not the permalink of any post on this site.
  */
-function fqj_unmatched_urls_notice() {
+function rfsd_unmatched_urls_notice() {
 	$post_id = isset( $_GET['post'] ) ? absint( $_GET['post'] ) : 0; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 	if ( ! $post_id ) {
 		return;
 	}
-	$key       = 'fqj_unmatched_urls_' . get_current_user_id() . '_' . $post_id;
+	$key       = 'rfsd_unmatched_urls_' . get_current_user_id() . '_' . $post_id;
 	$unmatched = get_transient( $key );
 	if ( empty( $unmatched ) || ! is_array( $unmatched ) ) {
 		return;
@@ -359,27 +359,27 @@ function fqj_unmatched_urls_notice() {
 		$items .= '<li><code>' . esc_html( $entry['url'] ) . '</code>';
 		if ( '' !== $entry['suggestion'] ) {
 			/* translators: %s: permalink of the post the URL leads to. */
-			$items .= ' ' . sprintf( esc_html__( '(did you mean %s?)', 'faq-jsonld' ), '<code>' . esc_html( $entry['suggestion'] ) . '</code>' );
+			$items .= ' ' . sprintf( esc_html__( '(did you mean %s?)', 'renderbit-faq-structured-data' ), '<code>' . esc_html( $entry['suggestion'] ) . '</code>' );
 		}
 		$items .= '</li>';
 	}
 	printf(
 		'<div class="notice notice-warning is-dismissible"><p>%s</p><ul>%s</ul></div>',
-		esc_html__( 'These URLs were saved, but they are not the permalink of any post on this site, so the FAQ will not appear there:', 'faq-jsonld' ),
+		esc_html__( 'These URLs were saved, but they are not the permalink of any post on this site, so the FAQ will not appear there:', 'renderbit-faq-structured-data' ),
 		$items // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	);
 }
-add_action( 'admin_notices', 'fqj_unmatched_urls_notice' );
+add_action( 'admin_notices', 'rfsd_unmatched_urls_notice' );
 
 /**
  * Admin notice on the FAQ list screen listing URL associations rewritten by data migration 3.
  */
-function fqj_url_migration_report_notice() {
+function rfsd_url_migration_report_notice() {
 	$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : null;
-	if ( ! $screen || 'edit-' . FQJ_POST_TYPE !== $screen->id || ! current_user_can( 'edit_others_posts' ) ) {
+	if ( ! $screen || 'edit-' . RFSD_POST_TYPE !== $screen->id || ! current_user_can( 'edit_others_posts' ) ) {
 		return;
 	}
-	$report = get_option( FQJ_URL_MIGRATION_REPORT_OPTION );
+	$report = get_option( RFSD_URL_MIGRATION_REPORT_OPTION );
 	if ( empty( $report ) || ! is_array( $report ) ) {
 		return;
 	}
@@ -390,51 +390,51 @@ function fqj_url_migration_report_notice() {
 		$new  = '<code>' . esc_html( $entry['new'] ) . '</code>';
 		$line = '' === $entry['old']
 			/* translators: 1: FAQ title, 2: added URL. */
-			? sprintf( esc_html__( '%1$s: added %2$s', 'faq-jsonld' ), $faq, $new )
+			? sprintf( esc_html__( '%1$s: added %2$s', 'renderbit-faq-structured-data' ), $faq, $new )
 			/* translators: 1: FAQ title, 2: old URL, 3: new URL. */
-			: sprintf( esc_html__( '%1$s: %2$s became %3$s', 'faq-jsonld' ), $faq, '<code>' . esc_html( $entry['old'] ) . '</code>', $new );
+			: sprintf( esc_html__( '%1$s: %2$s became %3$s', 'renderbit-faq-structured-data' ), $faq, '<code>' . esc_html( $entry['old'] ) . '</code>', $new );
 		$items .= '<li>' . $line . '</li>';
 	}
-	$dismiss = wp_nonce_url( admin_url( 'admin-post.php?action=fqj_dismiss_url_migration_report' ), 'fqj_dismiss_url_migration_report' );
+	$dismiss = wp_nonce_url( admin_url( 'admin-post.php?action=rfsd_dismiss_url_migration_report' ), 'rfsd_dismiss_url_migration_report' );
 
 	printf(
 		'<div class="notice notice-info"><p>%s</p><ul>%s</ul><p><a class="button" href="%s">%s</a></p></div>',
-		esc_html__( 'FAQ JSON-LD now matches URL associations by the URL itself. To keep each FAQ on the posts it appeared on before, these URLs were updated:', 'faq-jsonld' ),
+		esc_html__( 'Renderbit FAQ Structured Data now matches URL associations by the URL itself. To keep each FAQ on the posts it appeared on before, these URLs were updated:', 'renderbit-faq-structured-data' ),
 		$items, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		esc_url( $dismiss ),
-		esc_html__( 'Dismiss', 'faq-jsonld' )
+		esc_html__( 'Dismiss', 'renderbit-faq-structured-data' )
 	);
 }
-add_action( 'admin_notices', 'fqj_url_migration_report_notice' );
+add_action( 'admin_notices', 'rfsd_url_migration_report_notice' );
 
 /**
  * Dismiss the URL migration report for everyone.
  */
-function fqj_dismiss_url_migration_report() {
-	check_admin_referer( 'fqj_dismiss_url_migration_report' );
+function rfsd_dismiss_url_migration_report() {
+	check_admin_referer( 'rfsd_dismiss_url_migration_report' );
 	if ( ! current_user_can( 'edit_others_posts' ) ) {
-		wp_die( esc_html__( 'Permission denied', 'faq-jsonld' ), 403 );
+		wp_die( esc_html__( 'Permission denied', 'renderbit-faq-structured-data' ), 403 );
 	}
-	delete_option( FQJ_URL_MIGRATION_REPORT_OPTION );
+	delete_option( RFSD_URL_MIGRATION_REPORT_OPTION );
 }
 
 /**
  * Handle the dismiss link, then return to the FAQ list.
  */
-function fqj_admin_post_dismiss_url_migration_report() {
-	fqj_dismiss_url_migration_report();
-	wp_safe_redirect( admin_url( 'edit.php?post_type=' . FQJ_POST_TYPE ) );
+function rfsd_admin_post_dismiss_url_migration_report() {
+	rfsd_dismiss_url_migration_report();
+	wp_safe_redirect( admin_url( 'edit.php?post_type=' . RFSD_POST_TYPE ) );
 	exit;
 }
-add_action( 'admin_post_fqj_dismiss_url_migration_report', 'fqj_admin_post_dismiss_url_migration_report' );
+add_action( 'admin_post_rfsd_dismiss_url_migration_report', 'rfsd_admin_post_dismiss_url_migration_report' );
 
 /**
  * AJAX: search posts for Select2
  */
-function fqj_ajax_search_posts() {
-	check_ajax_referer( 'fqj_admin_nonce', 'nonce' );
+function rfsd_ajax_search_posts() {
+	check_ajax_referer( 'rfsd_admin_nonce', 'nonce' );
 	if ( ! current_user_can( 'edit_posts' ) ) {
-		wp_send_json_error( array( 'message' => __( 'Permission denied', 'faq-jsonld' ) ), 403 );
+		wp_send_json_error( array( 'message' => __( 'Permission denied', 'renderbit-faq-structured-data' ) ), 403 );
 	}
 	$q       = isset( $_REQUEST['q'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['q'] ) ) : '';
 	$results = array();
@@ -444,7 +444,7 @@ function fqj_ajax_search_posts() {
 
 	$args  = array(
 		's'              => $q,
-		'post_type'      => array_values( array_diff( get_post_types( array( 'public' => true ) ), array( 'attachment', FQJ_POST_TYPE ) ) ),
+		'post_type'      => array_values( array_diff( get_post_types( array( 'public' => true ) ), array( 'attachment', RFSD_POST_TYPE ) ) ),
 		'posts_per_page' => 20,
 		'post_status'    => 'publish',
 	);
@@ -457,15 +457,15 @@ function fqj_ajax_search_posts() {
 	}
 	wp_send_json( $results );
 }
-add_action( 'wp_ajax_fqj_search_posts', 'fqj_ajax_search_posts' );
+add_action( 'wp_ajax_rfsd_search_posts', 'rfsd_ajax_search_posts' );
 
 /**
  * AJAX: search terms
  */
-function fqj_ajax_search_terms() {
-	check_ajax_referer( 'fqj_admin_nonce', 'nonce' );
+function rfsd_ajax_search_terms() {
+	check_ajax_referer( 'rfsd_admin_nonce', 'nonce' );
 	if ( ! current_user_can( 'edit_posts' ) ) {
-		wp_send_json_error( array( 'message' => __( 'Permission denied', 'faq-jsonld' ) ), 403 );
+		wp_send_json_error( array( 'message' => __( 'Permission denied', 'renderbit-faq-structured-data' ) ), 403 );
 	}
 	$q       = isset( $_REQUEST['q'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['q'] ) ) : '';
 	$results = array();
@@ -495,15 +495,15 @@ function fqj_ajax_search_terms() {
 	}
 	wp_send_json( $results );
 }
-add_action( 'wp_ajax_fqj_search_terms', 'fqj_ajax_search_terms' );
+add_action( 'wp_ajax_rfsd_search_terms', 'rfsd_ajax_search_terms' );
 
 /**
  * AJAX: get public post types
  */
-function fqj_ajax_get_post_types() {
-	check_ajax_referer( 'fqj_admin_nonce', 'nonce' );
+function rfsd_ajax_get_post_types() {
+	check_ajax_referer( 'rfsd_admin_nonce', 'nonce' );
 	if ( ! current_user_can( 'edit_posts' ) ) {
-		wp_send_json_error( array( 'message' => __( 'Permission denied', 'faq-jsonld' ) ), 403 );
+		wp_send_json_error( array( 'message' => __( 'Permission denied', 'renderbit-faq-structured-data' ) ), 403 );
 	}
 	$pts = get_post_types( array( 'public' => true ), 'objects' );
 	$out = array();
@@ -515,4 +515,4 @@ function fqj_ajax_get_post_types() {
 	}
 	wp_send_json( $out );
 }
-add_action( 'wp_ajax_fqj_get_post_types', 'fqj_ajax_get_post_types' );
+add_action( 'wp_ajax_rfsd_get_post_types', 'rfsd_ajax_get_post_types' );
diff --git a/includes/class-fqjcli.php b/includes/class-rfsd-cli.php
similarity index 80%
rename from includes/class-fqjcli.php
rename to includes/class-rfsd-cli.php
index fa61f1d..0335f51 100644
--- a/includes/class-fqjcli.php
+++ b/includes/class-rfsd-cli.php
@@ -2,10 +2,10 @@
 /**
  * WP-CLI commands.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
-namespace FQJ;
+namespace RFSD;
 
 use WP_CLI;
 
@@ -19,7 +19,7 @@
 	/**
 	 * WP-CLI commands for FAQ plugin
 	 */
-	class FqjCli {
+	class Rfsd_Cli {
 
 		/**
 		 * Purge all cached FAQ output.
@@ -28,13 +28,13 @@ class FqjCli {
 		 * @param array $assoc_args Associative arguments.
 		 */
 		public function purge_transients( $args, $assoc_args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter
-			$generation = fqj_purge_all_faq_transients();
+			$generation = rfsd_purge_all_faq_transients();
 			WP_CLI::success( "Purged FAQ cache (generation {$generation})." );
 		}
 
 		/**
 		 * Process invalidation queue via CLI.
-		 * Usage: wp fqj process-queue --limit=1000
+		 * Usage: wp rfsd process-queue --limit=1000
 		 *
 		 * @param array $args       Positional arguments.
 		 * @param array $assoc_args Associative arguments.
@@ -42,7 +42,7 @@ public function purge_transients( $args, $assoc_args ) { // phpcs:ignore Generic
 		public function process_queue( $args, $assoc_args ) {
 			$limit = isset( $assoc_args['limit'] ) ? intval( $assoc_args['limit'] ) : null;
 			WP_CLI::log( 'Processing invalidate queue...' );
-			$processed = fqj_process_invalidation_queue_now( $limit );
+			$processed = rfsd_process_invalidation_queue_now( $limit );
 			WP_CLI::success( "Processed {$processed} invalidation items." );
 		}
 
@@ -53,10 +53,10 @@ public function process_queue( $args, $assoc_args ) {
 		 * @param array $assoc_args Associative arguments.
 		 */
 		public function queue_info( $args, $assoc_args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter
-			$len = fqj_queue_length();
+			$len = rfsd_queue_length();
 			WP_CLI::success( "Queue length: {$len}" );
 		}
 	}
 
-	WP_CLI::add_command( 'fqj', 'FQJ\FqjCli' );
+	WP_CLI::add_command( 'rfsd', 'RFSD\Rfsd_Cli' );
 }
diff --git a/includes/coverage.php b/includes/coverage.php
index cecfd66..24c6bc9 100644
--- a/includes/coverage.php
+++ b/includes/coverage.php
@@ -5,7 +5,7 @@
  * The forward direction (lookup candidates and FAQ IDs for a post) and the inverse direction (posts covered
  * by a mapping) live together so they stay in agreement. See CONTEXT.md for the terms used here.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -19,7 +19,7 @@
  *
  * @return string[]
  */
-function fqj_identifying_query_args() {
+function rfsd_identifying_query_args() {
 	$args = array( 'p', 'page_id', 'attachment_id' );
 	foreach ( get_post_types( array( 'publicly_queryable' => true ), 'objects' ) as $type ) {
 		if ( is_string( $type->query_var ) && '' !== $type->query_var ) {
@@ -37,9 +37,9 @@ function fqj_identifying_query_args() {
  *
  * @return string[] Host, then path.
  */
-function fqj_site_root() {
+function rfsd_site_root() {
 	$home = wp_parse_url( home_url() );
-	$host = isset( $home['host'] ) ? fqj_bare_host( $home['host'], isset( $home['port'] ) ? $home['port'] : null ) : '';
+	$host = isset( $home['host'] ) ? rfsd_bare_host( $home['host'], isset( $home['port'] ) ? $home['port'] : null ) : '';
 	$path = isset( $home['path'] ) ? rtrim( $home['path'], '/' ) : '';
 
 	return array( $host, $path );
@@ -52,7 +52,7 @@ function fqj_site_root() {
  * @param int|null $port Port.
  * @return string
  */
-function fqj_bare_host( $host, $port = null ) {
+function rfsd_bare_host( $host, $port = null ) {
 	$host = preg_replace( '/^www\./', '', strtolower( (string) $host ) );
 
 	return null === $port ? $host : $host . ':' . (int) $port;
@@ -71,7 +71,7 @@ function fqj_bare_host( $host, $port = null ) {
  * @param string $url The URL.
  * @return string
  */
-function fqj_normalize_url( $url ) {
+function rfsd_normalize_url( $url ) {
 	$url   = trim( (string) $url );
 	$parts = explode( '?', (string) strtok( $url, '#' ), 2 );
 	$base  = $parts[0];
@@ -79,7 +79,7 @@ function fqj_normalize_url( $url ) {
 
 	if ( isset( $parts[1] ) && '' !== $parts[1] ) {
 		parse_str( $parts[1], $args );
-		$keep = array_intersect_key( $args, array_flip( fqj_identifying_query_args() ) );
+		$keep = array_intersect_key( $args, array_flip( rfsd_identifying_query_args() ) );
 		$keep = array_filter( $keep, 'is_scalar' );
 		if ( $keep ) {
 			ksort( $keep );
@@ -87,7 +87,7 @@ function fqj_normalize_url( $url ) {
 		}
 	}
 
-	$relative = fqj_site_relative_path( $base );
+	$relative = rfsd_site_relative_path( $base );
 	if ( null !== $relative ) {
 		$path = rtrim( $relative, '/' );
 		if ( '' !== $query ) {
@@ -110,7 +110,7 @@ function fqj_normalize_url( $url ) {
  * @param string $base URL without query string or fragment.
  * @return string|null Path starting with `/`, or null.
  */
-function fqj_site_relative_path( $base ) {
+function rfsd_site_relative_path( $base ) {
 	if ( '' !== $base && '/' === $base[0] && ( ! isset( $base[1] ) || '/' !== $base[1] ) ) {
 		return $base;
 	}
@@ -120,8 +120,8 @@ function fqj_site_relative_path( $base ) {
 		return null;
 	}
 
-	list( $site_host, $site_path ) = fqj_site_root();
-	if ( fqj_bare_host( $parts['host'], isset( $parts['port'] ) ? $parts['port'] : null ) !== $site_host ) {
+	list( $site_host, $site_path ) = rfsd_site_root();
+	if ( rfsd_bare_host( $parts['host'], isset( $parts['port'] ) ? $parts['port'] : null ) !== $site_host ) {
 		return null;
 	}
 
@@ -145,7 +145,7 @@ function fqj_site_relative_path( $base ) {
  * @param int $post_id Post ID.
  * @return array List of array( 'type' => ..., 'value' => ... ) with string values.
  */
-function fqj_lookup_candidates( $post_id ) {
+function rfsd_lookup_candidates( $post_id ) {
 	$post_id    = (int) $post_id;
 	$candidates = array();
 
@@ -179,7 +179,7 @@ function fqj_lookup_candidates( $post_id ) {
 	// URL mapping - the permalink, normalized the same way as the indexer.
 	$permalink = get_permalink( $post_id );
 	if ( $permalink ) {
-		$url = fqj_normalize_url( $permalink );
+		$url = rfsd_normalize_url( $permalink );
 
 		$candidates[] = array(
 			'type'  => 'url',
@@ -188,7 +188,7 @@ function fqj_lookup_candidates( $post_id ) {
 
 		// Until the data migration to version 3 has reindexed every FAQ, rows may still hold the absolute
 		// URL, with or without a trailing slash.
-		if ( version_compare( (string) get_option( FQJ_DATA_VERSION_OPTION, '0' ), '3', '<' ) ) {
+		if ( version_compare( (string) get_option( RFSD_DATA_VERSION_OPTION, '0' ), '3', '<' ) ) {
 			$legacy = untrailingslashit( home_url() ) . ( '/' === $url ? '' : $url );
 			foreach ( array( $url . '/', $legacy, $legacy . '/' ) as $value ) {
 				$candidates[] = array(
@@ -214,16 +214,16 @@ function fqj_lookup_candidates( $post_id ) {
  * @param int $post_id Post ID.
  * @return int[] Unique IDs in ascending order.
  */
-function fqj_faq_ids_for_post( $post_id ) {
+function rfsd_faq_ids_for_post( $post_id ) {
 	global $wpdb;
 
-	$candidates = fqj_lookup_candidates( $post_id );
+	$candidates = rfsd_lookup_candidates( $post_id );
 	if ( empty( $candidates ) ) {
 		return array();
 	}
 
 	// Exact matches only, so post ID 1 never matches 10, 11, etc.
-	$params = array( fqj_table_name() );
+	$params = array( rfsd_table_name() );
 	foreach ( $candidates as $c ) {
 		$params[] = $c['type'];
 		$params[] = (string) $c['value'];
@@ -240,13 +240,13 @@ function fqj_faq_ids_for_post( $post_id ) {
 /**
  * The post WordPress would route a URL to, without checking that the URL is that post's permalink.
  *
- * Covers shortlinks and old slugs too. Use fqj_post_for_url() to decide what a URL association covers.
+ * Covers shortlinks and old slugs too. Use rfsd_post_for_url() to decide what a URL association covers.
  *
  * @param string $url URL, absolute or relative to the site root.
  * @return int Post ID, or 0.
  */
-function fqj_post_routed_from_url( $url ) {
-	$normalized = fqj_normalize_url( $url );
+function rfsd_post_routed_from_url( $url ) {
+	$normalized = rfsd_normalize_url( $url );
 	if ( '' === $normalized || '/' !== $normalized[0] ) {
 		return 0;
 	}
@@ -282,15 +282,15 @@ function fqj_post_routed_from_url( $url ) {
  * @param string $url URL, absolute or relative to the site root.
  * @return int Post ID, or 0.
  */
-function fqj_post_for_url( $url ) {
-	$post_id = fqj_post_routed_from_url( $url );
+function rfsd_post_for_url( $url ) {
+	$post_id = rfsd_post_routed_from_url( $url );
 	if ( ! $post_id ) {
 		return 0;
 	}
 
 	$permalink = get_permalink( $post_id );
 
-	return $permalink && fqj_normalize_url( $permalink ) === fqj_normalize_url( $url ) ? $post_id : 0;
+	return $permalink && rfsd_normalize_url( $permalink ) === rfsd_normalize_url( $url ) ? $post_id : 0;
 }
 
 /**
@@ -299,7 +299,7 @@ function fqj_post_for_url( $url ) {
  * @param array $mapping Mapping with 'type' and 'value'.
  * @return bool
  */
-function fqj_mapping_covers_everything( $mapping ) {
+function rfsd_mapping_covers_everything( $mapping ) {
 	return isset( $mapping['type'] ) && 'global' === $mapping['type'];
 }
 
@@ -309,21 +309,21 @@ function fqj_mapping_covers_everything( $mapping ) {
  * @param int $post_id Post ID.
  * @return bool
  */
-function fqj_post_is_coverable( $post_id ) {
+function rfsd_post_is_coverable( $post_id ) {
 	return (int) $post_id > 0 && 'publish' === get_post_status( (int) $post_id );
 }
 
 /**
  * Coverable posts covered by a mapping, above a cursor.
  *
- * Not for mappings that cover everything (see fqj_mapping_covers_everything()).
+ * Not for mappings that cover everything (see rfsd_mapping_covers_everything()).
  *
  * @param array $mapping  Mapping with 'type' and 'value'.
  * @param int   $after_id Return IDs greater than this.
  * @param int   $limit    Maximum number of IDs.
  * @return int[] Published post IDs in ascending order.
  */
-function fqj_posts_covered_by_mapping( $mapping, $after_id = 0, $limit = 100 ) {
+function rfsd_posts_covered_by_mapping( $mapping, $after_id = 0, $limit = 100 ) {
 	global $wpdb;
 
 	$after_id = (int) $after_id;
@@ -334,7 +334,7 @@ function fqj_posts_covered_by_mapping( $mapping, $after_id = 0, $limit = 100 ) {
 		return array();
 	}
 
-	if ( fqj_mapping_covers_everything( $mapping ) ) {
+	if ( rfsd_mapping_covers_everything( $mapping ) ) {
 		_doing_it_wrong( __FUNCTION__, 'Mappings that cover everything have no post list; purge all cached output instead.', '3.0.2' );
 		return array();
 	}
@@ -343,8 +343,8 @@ function fqj_posts_covered_by_mapping( $mapping, $after_id = 0, $limit = 100 ) {
 	switch ( $type ) {
 		case 'post':
 		case 'url':
-			$pid = 'post' === $type ? (int) $value : fqj_post_for_url( $value );
-			if ( $pid > $after_id && fqj_post_is_coverable( $pid ) ) {
+			$pid = 'post' === $type ? (int) $value : rfsd_post_for_url( $value );
+			if ( $pid > $after_id && rfsd_post_is_coverable( $pid ) ) {
 				$ids = array( $pid );
 			}
 			break;
@@ -391,9 +391,9 @@ function fqj_posts_covered_by_mapping( $mapping, $after_id = 0, $limit = 100 ) {
  * @param bool   $append     Whether terms were appended.
  * @param array  $old_tt_ids Previous term taxonomy IDs.
  */
-function fqj_on_object_terms_set( $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids ) {
+function rfsd_on_object_terms_set( $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids ) {
 	$type = get_post_type( $object_id );
-	if ( ! $type || FQJ_POST_TYPE === $type || wp_is_post_revision( $object_id ) ) {
+	if ( ! $type || RFSD_POST_TYPE === $type || wp_is_post_revision( $object_id ) ) {
 		return;
 	}
 	if ( ! $append ) {
@@ -405,9 +405,9 @@ function fqj_on_object_terms_set( $object_id, $terms, $tt_ids, $taxonomy, $appen
 			return;
 		}
 	}
-	delete_transient( fqj_cache_key( $object_id ) );
+	delete_transient( rfsd_cache_key( $object_id ) );
 }
-add_action( 'set_object_terms', 'fqj_on_object_terms_set', 10, 6 );
+add_action( 'set_object_terms', 'rfsd_on_object_terms_set', 10, 6 );
 
 /**
  * Drop a post's cached output when its permalink or visibility changes.
@@ -416,8 +416,8 @@ function fqj_on_object_terms_set( $object_id, $terms, $tt_ids, $taxonomy, $appen
  * @param WP_Post $post_after  Post after the update.
  * @param WP_Post $post_before Post before the update.
  */
-function fqj_on_post_permalink_change( $post_id, $post_after, $post_before ) {
-	if ( FQJ_POST_TYPE === $post_after->post_type || wp_is_post_revision( $post_id ) ) {
+function rfsd_on_post_permalink_change( $post_id, $post_after, $post_before ) {
+	if ( RFSD_POST_TYPE === $post_after->post_type || wp_is_post_revision( $post_id ) ) {
 		return;
 	}
 	if ( $post_after->post_name === $post_before->post_name
@@ -425,14 +425,14 @@ function fqj_on_post_permalink_change( $post_id, $post_after, $post_before ) {
 		&& $post_after->post_status === $post_before->post_status ) {
 		return;
 	}
-	delete_transient( fqj_cache_key( $post_id ) );
+	delete_transient( rfsd_cache_key( $post_id ) );
 
 	// Child pages and attachments carry the post's slug in their permalinks.
 	if ( $post_after->post_name !== $post_before->post_name || (int) $post_after->post_parent !== (int) $post_before->post_parent ) {
-		fqj_queue_add_posts( fqj_descendant_post_ids( $post_id ) );
+		rfsd_queue_add_posts( rfsd_descendant_post_ids( $post_id ) );
 	}
 }
-add_action( 'post_updated', 'fqj_on_post_permalink_change', 10, 3 );
+add_action( 'post_updated', 'rfsd_on_post_permalink_change', 10, 3 );
 
 /**
  * IDs of every post below a post in the post_parent tree, revisions excluded.
@@ -440,7 +440,7 @@ function fqj_on_post_permalink_change( $post_id, $post_after, $post_before ) {
  * @param int $post_id Post ID.
  * @return int[]
  */
-function fqj_descendant_post_ids( $post_id ) {
+function rfsd_descendant_post_ids( $post_id ) {
 	global $wpdb;
 
 	$found   = array();
@@ -465,12 +465,12 @@ function fqj_descendant_post_ids( $post_id ) {
 /**
  * Purge all cached output when a setting that changes every post's URL, or which page sits at `/`, changes.
  */
-function fqj_purge_on_url_settings_change() {
-	fqj_purge_all_faq_transients();
+function rfsd_purge_on_url_settings_change() {
+	rfsd_purge_all_faq_transients();
 }
-add_action( 'update_option_permalink_structure', 'fqj_purge_on_url_settings_change', 10, 0 );
-add_action( 'update_option_category_base', 'fqj_purge_on_url_settings_change', 10, 0 );
-add_action( 'update_option_tag_base', 'fqj_purge_on_url_settings_change', 10, 0 );
-add_action( 'update_option_home', 'fqj_purge_on_url_settings_change', 10, 0 );
-add_action( 'update_option_show_on_front', 'fqj_purge_on_url_settings_change', 10, 0 );
-add_action( 'update_option_page_on_front', 'fqj_purge_on_url_settings_change', 10, 0 );
+add_action( 'update_option_permalink_structure', 'rfsd_purge_on_url_settings_change', 10, 0 );
+add_action( 'update_option_category_base', 'rfsd_purge_on_url_settings_change', 10, 0 );
+add_action( 'update_option_tag_base', 'rfsd_purge_on_url_settings_change', 10, 0 );
+add_action( 'update_option_home', 'rfsd_purge_on_url_settings_change', 10, 0 );
+add_action( 'update_option_show_on_front', 'rfsd_purge_on_url_settings_change', 10, 0 );
+add_action( 'update_option_page_on_front', 'rfsd_purge_on_url_settings_change', 10, 0 );
diff --git a/includes/frontend.php b/includes/frontend.php
index beff415..48ea374 100644
--- a/includes/frontend.php
+++ b/includes/frontend.php
@@ -2,7 +2,7 @@
 /**
  * Frontend output functions.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -20,7 +20,7 @@
  * @param string $html Text that may contain markup and entities.
  * @return string
  */
-function fqj_plain_text( $html ) {
+function rfsd_plain_text( $html ) {
 	// Keep block boundaries as spaces so adjacent paragraphs do not run together once tags are gone.
 	$html = preg_replace( '#<br\s*/?>|</(?:p|div|li|h[1-6]|tr|blockquote)>#i', '$0 ', (string) $html );
 	$text = wp_strip_all_tags( $html );
@@ -35,8 +35,8 @@ function fqj_plain_text( $html ) {
  * @param WP_Post $faq FAQ post.
  * @return string
  */
-function fqj_question_text( $faq ) {
-	$text = fqj_plain_text( get_the_title( $faq ) );
+function rfsd_question_text( $faq ) {
+	$text = rfsd_plain_text( get_the_title( $faq ) );
 
 	/**
 	 * Filters the question text output in JSON-LD.
@@ -44,7 +44,7 @@ function fqj_question_text( $faq ) {
 	 * @param string  $text Plain-text question.
 	 * @param WP_Post $faq  FAQ post.
 	 */
-	return (string) apply_filters( 'fqj_question_text', $text, $faq );
+	return (string) apply_filters( 'rfsd_question_text', $text, $faq );
 }
 
 /**
@@ -56,12 +56,12 @@ function fqj_question_text( $faq ) {
  * @param WP_Post $faq FAQ post.
  * @return string
  */
-function fqj_answer_text( $faq ) {
+function rfsd_answer_text( $faq ) {
 	$content = $faq->post_content;
 	if ( function_exists( 'do_blocks' ) ) {
 		$content = do_blocks( $content );
 	}
-	$text = fqj_plain_text( do_shortcode( $content ) );
+	$text = rfsd_plain_text( do_shortcode( $content ) );
 
 	/**
 	 * Filters the answer text output in JSON-LD.
@@ -69,13 +69,13 @@ function fqj_answer_text( $faq ) {
 	 * @param string  $text Plain-text answer.
 	 * @param WP_Post $faq  FAQ post.
 	 */
-	return (string) apply_filters( 'fqj_answer_text', $text, $faq );
+	return (string) apply_filters( 'rfsd_answer_text', $text, $faq );
 }
 
 /**
  * Build and print JSON-LD for current post (FAQ IDs come from the coverage module)
  */
-function fqj_maybe_print_faq_jsonld() {
+function rfsd_maybe_print_faq_jsonld() {
 	if ( is_admin() ) {
 		return;
 	}
@@ -92,8 +92,8 @@ function fqj_maybe_print_faq_jsonld() {
 
 	// Only coverable posts get cached output, so invalidation can always reach it. Private posts and
 	// previews render fresh every time.
-	if ( ! fqj_post_is_coverable( $current_id ) || is_preview() ) {
-		$output = fqj_render_faq_jsonld( $current_id );
+	if ( ! rfsd_post_is_coverable( $current_id ) || is_preview() ) {
+		$output = rfsd_render_faq_jsonld( $current_id );
 		echo "\n<!-- FAQ JSON-LD (uncached" . ( '' === $output ? ', no output' : '' ) . ") -->\n";
 		if ( '' !== $output ) {
 			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -103,13 +103,13 @@ function fqj_maybe_print_faq_jsonld() {
 		return;
 	}
 
-	$opts      = get_option( FQJ_OPTION_KEY );
+	$opts      = get_option( RFSD_OPTION_KEY );
 	$cache_ttl = isset( $opts['cache_ttl'] ) ? intval( $opts['cache_ttl'] ) : 12 * HOUR_IN_SECONDS;
 
-	$transient_key = fqj_cache_key( $current_id );
+	$transient_key = rfsd_cache_key( $current_id );
 	$cached        = get_transient( $transient_key );
 	if ( false !== $cached ) {
-		if ( '__FQJ_EMPTY__' === $cached ) {
+		if ( '__RFSD_EMPTY__' === $cached ) {
 			echo "\n<!-- FAQ JSON-LD (cached, no output) -->\n";
 		} elseif ( '' !== trim( $cached ) ) {
 			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -122,22 +122,22 @@ function fqj_maybe_print_faq_jsonld() {
 		return;
 	}
 
-	$script = fqj_render_faq_jsonld( $current_id );
+	$script = rfsd_render_faq_jsonld( $current_id );
 	if ( '' === $script ) {
 		// cache negative result to avoid repeated queries.
-		set_transient( $transient_key, '__FQJ_EMPTY__', $cache_ttl );
+		set_transient( $transient_key, '__RFSD_EMPTY__', $cache_ttl );
 		echo "\n<!-- FAQ JSON-LD (generated, no output) -->\n";
 
 		return;
 	}
 
-	echo "\n<!-- FAQ JSON-LD injected by FAQ JSON-LD Manager plugin (generated) -->\n";
+	echo "\n<!-- FAQ JSON-LD injected by Renderbit FAQ Structured Data plugin (generated) -->\n";
 	// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	echo $script . "\n";
 
 	set_transient( $transient_key, $script, $cache_ttl );
 }
-add_action( 'wp_head', 'fqj_maybe_print_faq_jsonld', 1 );
+add_action( 'wp_head', 'rfsd_maybe_print_faq_jsonld', 1 );
 
 /**
  * Build the JSON-LD script element for a post from its published FAQs.
@@ -145,15 +145,15 @@ function fqj_maybe_print_faq_jsonld() {
  * @param int $post_id Post ID.
  * @return string The script element, or '' when no FAQ applies.
  */
-function fqj_render_faq_jsonld( $post_id ) {
-	$faq_ids = fqj_faq_ids_for_post( $post_id );
+function rfsd_render_faq_jsonld( $post_id ) {
+	$faq_ids = rfsd_faq_ids_for_post( $post_id );
 	if ( empty( $faq_ids ) ) {
 		return '';
 	}
 
 	$faqs = get_posts(
 		array(
-			'post_type'      => FQJ_POST_TYPE,
+			'post_type'      => RFSD_POST_TYPE,
 			'post_status'    => 'publish',
 			'posts_per_page' => -1,
 			'post__in'       => $faq_ids,
@@ -163,8 +163,8 @@ function fqj_render_faq_jsonld( $post_id ) {
 
 	$main_entities = array();
 	foreach ( $faqs as $f ) {
-		$q = fqj_question_text( $f );
-		$a = fqj_answer_text( $f );
+		$q = rfsd_question_text( $f );
+		$a = rfsd_answer_text( $f );
 		if ( empty( $q ) || empty( $a ) ) {
 			continue;
 		}
diff --git a/includes/health.php b/includes/health.php
index 8ff9e8c..fb42555 100644
--- a/includes/health.php
+++ b/includes/health.php
@@ -2,7 +2,7 @@
 /**
  * Health page.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -12,7 +12,7 @@
 // phpcs:disable PSR1.Files.SideEffects
 
 /**
- * Health & Diagnostics admin page for FAQ JSON-LD plugin.
+ * Health & Diagnostics admin page for the Renderbit FAQ Structured Data plugin.
  * Shows:
  *  - Queue length
  *  - Last run timestamp
@@ -23,65 +23,65 @@
 /**
  * Register submenu under FAQ Items
  */
-function fqj_register_health_page() {
+function rfsd_register_health_page() {
 	add_submenu_page(
-		'edit.php?post_type=' . FQJ_POST_TYPE,
-		__( 'FAQ JSON-LD Health', 'faq-jsonld' ),
-		__( 'Health', 'faq-jsonld' ),
+		'edit.php?post_type=' . RFSD_POST_TYPE,
+		__( 'FAQ Structured Data Health', 'renderbit-faq-structured-data' ),
+		__( 'Health', 'renderbit-faq-structured-data' ),
 		'manage_options',
-		'fqj-health',
-		'fqj_render_health_page'
+		'rfsd-health',
+		'rfsd_render_health_page'
 	);
 }
-add_action( 'admin_menu', 'fqj_register_health_page' );
+add_action( 'admin_menu', 'rfsd_register_health_page' );
 
 /**
  * Enqueue health JS only on our page
  *
  * @param string $hook The current admin page.
  */
-function fqj_health_admin_assets( $hook ) {
-	// check page hook: load only on fqj-health page.
-	if ( FQJ_POST_TYPE . '_page_fqj-health' !== $hook ) {
+function rfsd_health_admin_assets( $hook ) {
+	// check page hook: load only on rfsd-health page.
+	if ( RFSD_POST_TYPE . '_page_rfsd-health' !== $hook ) {
 		return;
 	}
 
 	wp_enqueue_script(
-		'fqj-health-js',
-		FQJ_PLUGIN_URL . 'assets/js/fqj-health.js',
+		'rfsd-health-js',
+		RFSD_PLUGIN_URL . 'assets/js/rfsd-health.js',
 		array( 'jquery' ),
-		FQJ_VERSION,
+		RFSD_VERSION,
 		true
 	);
 	wp_localize_script(
-		'fqj-health-js',
-		'fqjHealth',
+		'rfsd-health-js',
+		'rfsdHealth',
 		array(
 			'ajax_url' => admin_url( 'admin-ajax.php' ),
-			'nonce'    => wp_create_nonce( 'fqj_health_nonce' ),
+			'nonce'    => wp_create_nonce( 'rfsd_health_nonce' ),
 			'i18n'     => array(
-				'processing'         => __( 'Processing…', 'faq-jsonld' ),
+				'processing'         => __( 'Processing…', 'renderbit-faq-structured-data' ),
 				/* translators: %d: number of processed items. */
-				'processed'          => __( 'Processed %d items.', 'faq-jsonld' ),
+				'processed'          => __( 'Processed %d items.', 'renderbit-faq-structured-data' ),
 				/* translators: %s: error message. */
-				'error'              => __( 'Error: %s', 'faq-jsonld' ),
-				'unknown'            => __( 'unknown', 'faq-jsonld' ),
-				'requestFailed'      => __( 'Request failed. See console.', 'faq-jsonld' ),
-				'requestFailedShort' => __( 'Request failed.', 'faq-jsonld' ),
-				'purging'            => __( 'Purging…', 'faq-jsonld' ),
-				'purged'             => __( 'Purged transients.', 'faq-jsonld' ),
-				'purgeError'         => __( 'Error purging.', 'faq-jsonld' ),
-				'purgeConfirm'       => __( 'Purge all FAQ transients? This will force pages to rebuild the JSON-LD on next view.', 'faq-jsonld' ),
-				'clearing'           => __( 'Clearing…', 'faq-jsonld' ),
-				'cleared'            => __( 'Cleared log. Reload to refresh the table.', 'faq-jsonld' ),
-				'clearError'         => __( 'Error clearing log.', 'faq-jsonld' ),
-				'clearConfirm'       => __( 'Clear invalidation log? This will remove recent run history.', 'faq-jsonld' ),
-				'notAvailable'       => __( 'n/a', 'faq-jsonld' ),
+				'error'              => __( 'Error: %s', 'renderbit-faq-structured-data' ),
+				'unknown'            => __( 'unknown', 'renderbit-faq-structured-data' ),
+				'requestFailed'      => __( 'Request failed. See console.', 'renderbit-faq-structured-data' ),
+				'requestFailedShort' => __( 'Request failed.', 'renderbit-faq-structured-data' ),
+				'purging'            => __( 'Purging…', 'renderbit-faq-structured-data' ),
+				'purged'             => __( 'Purged transients.', 'renderbit-faq-structured-data' ),
+				'purgeError'         => __( 'Error purging.', 'renderbit-faq-structured-data' ),
+				'purgeConfirm'       => __( 'Purge all FAQ transients? This will force pages to rebuild the JSON-LD on next view.', 'renderbit-faq-structured-data' ),
+				'clearing'           => __( 'Clearing…', 'renderbit-faq-structured-data' ),
+				'cleared'            => __( 'Cleared log. Reload to refresh the table.', 'renderbit-faq-structured-data' ),
+				'clearError'         => __( 'Error clearing log.', 'renderbit-faq-structured-data' ),
+				'clearConfirm'       => __( 'Clear invalidation log? This will remove recent run history.', 'renderbit-faq-structured-data' ),
+				'notAvailable'       => __( 'n/a', 'renderbit-faq-structured-data' ),
 			),
 		)
 	);
 }
-add_action( 'admin_enqueue_scripts', 'fqj_health_admin_assets' );
+add_action( 'admin_enqueue_scripts', 'rfsd_health_admin_assets' );
 
 /**
  * Format a timestamp as "Y-m-d H:i:s (5 mins ago)" in the site's timezone.
@@ -89,9 +89,9 @@ function fqj_health_admin_assets( $hook ) {
  * @param int $timestamp Unix timestamp.
  * @return string
  */
-function fqj_format_time_ago( $timestamp ) {
+function rfsd_format_time_ago( $timestamp ) {
 	/* translators: %s: human-readable time difference, e.g. "5 mins". */
-	$ago = sprintf( __( '%s ago', 'faq-jsonld' ), human_time_diff( $timestamp, time() ) );
+	$ago = sprintf( __( '%s ago', 'renderbit-faq-structured-data' ), human_time_diff( $timestamp, time() ) );
 
 	return wp_date( 'Y-m-d H:i:s', $timestamp ) . ' (' . $ago . ')';
 }
@@ -99,67 +99,67 @@ function fqj_format_time_ago( $timestamp ) {
 /**
  * Render health page
  */
-function fqj_render_health_page() {
+function rfsd_render_health_page() {
 	if ( ! current_user_can( 'manage_options' ) ) {
 		return;
 	}
-	$queue_len   = fqj_queue_length();
-	$last_run_ts = get_option( 'fqj_last_queue_run', 0 );
-	$log         = get_option( 'fqj_invalidation_log', array() );
+	$queue_len   = rfsd_queue_length();
+	$last_run_ts = get_option( 'rfsd_last_queue_run', 0 );
+	$log         = get_option( 'rfsd_invalidation_log', array() );
 	if ( ! is_array( $log ) ) {
 		$log = array();
 	}
 
 	?>
 	<div class="wrap">
-		<h1><?php echo esc_html__( 'FAQ JSON-LD — Health & Diagnostics', 'faq-jsonld' ); ?></h1>
+		<h1><?php echo esc_html__( 'Renderbit FAQ Structured Data — Health & Diagnostics', 'renderbit-faq-structured-data' ); ?></h1>
 
-		<h2><?php echo esc_html__( 'Queue', 'faq-jsonld' ); ?></h2>
-		<p><?php echo esc_html__( 'Pending invalidation items in queue:', 'faq-jsonld' ); ?>
-			<strong id="fqj-queue-count"><?php echo intval( $queue_len ); ?></strong>
+		<h2><?php echo esc_html__( 'Queue', 'renderbit-faq-structured-data' ); ?></h2>
+		<p><?php echo esc_html__( 'Pending invalidation items in queue:', 'renderbit-faq-structured-data' ); ?>
+			<strong id="rfsd-queue-count"><?php echo intval( $queue_len ); ?></strong>
 		</p>
-		<p><?php echo esc_html__( 'Last queue run:', 'faq-jsonld' ); ?> <strong id="fqj-last-run">
+		<p><?php echo esc_html__( 'Last queue run:', 'renderbit-faq-structured-data' ); ?> <strong id="rfsd-last-run">
 		<?php
 		echo $last_run_ts
-			? esc_html( fqj_format_time_ago( (int) $last_run_ts ) )
-			: esc_html__( 'Never', 'faq-jsonld' );
+			? esc_html( rfsd_format_time_ago( (int) $last_run_ts ) )
+			: esc_html__( 'Never', 'renderbit-faq-structured-data' );
 		?>
 		</strong></p>
 
 		<p>
-			<button id="fqj-process-now" class="button button-primary"><?php echo esc_html__( 'Process queue now', 'faq-jsonld' ); ?></button>
-			<button id="fqj-purge-transients" class="button"><?php echo esc_html__( 'Purge all FAQ transients', 'faq-jsonld' ); ?></button>
-			<button id="fqj-clear-log" class="button"><?php echo esc_html__( 'Clear invalidation log', 'faq-jsonld' ); ?></button>
-			<span id="fqj-action-status" style="margin-left:12px;"></span>
+			<button id="rfsd-process-now" class="button button-primary"><?php echo esc_html__( 'Process queue now', 'renderbit-faq-structured-data' ); ?></button>
+			<button id="rfsd-purge-transients" class="button"><?php echo esc_html__( 'Purge all FAQ transients', 'renderbit-faq-structured-data' ); ?></button>
+			<button id="rfsd-clear-log" class="button"><?php echo esc_html__( 'Clear invalidation log', 'renderbit-faq-structured-data' ); ?></button>
+			<span id="rfsd-action-status" style="margin-left:12px;"></span>
 		</p>
 
-		<h2><?php echo esc_html__( 'Recent invalidation history', 'faq-jsonld' ); ?></h2>
+		<h2><?php echo esc_html__( 'Recent invalidation history', 'renderbit-faq-structured-data' ); ?></h2>
 		<p>
 			<?php
 			/* translators: %d: number of logged runs. */
-			echo esc_html( sprintf( __( 'Shows up to the last %d runs (newest first).', 'faq-jsonld' ), count( $log ) ) );
+			echo esc_html( sprintf( __( 'Shows up to the last %d runs (newest first).', 'renderbit-faq-structured-data' ), count( $log ) ) );
 			?>
 		</p>
 
 		<table class="widefat striped">
 			<thead>
 				<tr>
-					<th width="170"><?php echo esc_html__( 'Timestamp', 'faq-jsonld' ); ?></th>
-					<th><?php echo esc_html__( 'Processed', 'faq-jsonld' ); ?></th>
-					<th><?php echo esc_html__( 'Sample post IDs', 'faq-jsonld' ); ?></th>
+					<th width="170"><?php echo esc_html__( 'Timestamp', 'renderbit-faq-structured-data' ); ?></th>
+					<th><?php echo esc_html__( 'Processed', 'renderbit-faq-structured-data' ); ?></th>
+					<th><?php echo esc_html__( 'Sample post IDs', 'renderbit-faq-structured-data' ); ?></th>
 				</tr>
 			</thead>
-			<tbody id="fqj-log-body">
+			<tbody id="rfsd-log-body">
 				<?php
 				if ( empty( $log ) ) {
-					echo '<tr><td colspan="3">' . esc_html__( 'No invalidation runs logged yet.', 'faq-jsonld' ) . '</td></tr>';
+					echo '<tr><td colspan="3">' . esc_html__( 'No invalidation runs logged yet.', 'renderbit-faq-structured-data' ) . '</td></tr>';
 				} else {
 					foreach ( $log as $entry ) {
 						$ts        = isset( $entry['ts'] ) ? intval( $entry['ts'] ) : 0;
 						$processed = isset( $entry['processed'] ) ? intval( $entry['processed'] ) : 0;
 						$sample    = isset( $entry['sample'] ) && is_array( $entry['sample'] ) ? $entry['sample'] : array();
 						echo '<tr>';
-						echo '<td>' . esc_html( $ts ? fqj_format_time_ago( $ts ) : __( 'n/a', 'faq-jsonld' ) ) . '</td>';
+						echo '<td>' . esc_html( $ts ? rfsd_format_time_ago( $ts ) : __( 'n/a', 'renderbit-faq-structured-data' ) ) . '</td>';
 						echo '<td>' . esc_html( $processed ) . '</td>';
 						echo '<td>' . esc_html( implode( ', ', $sample ) ) . '</td>';
 						echo '</tr>';
@@ -169,13 +169,13 @@ function fqj_render_health_page() {
 			</tbody>
 		</table>
 
-		<h2><?php echo esc_html__( 'Notes', 'faq-jsonld' ); ?></h2>
+		<h2><?php echo esc_html__( 'Notes', 'renderbit-faq-structured-data' ); ?></h2>
 		<ul>
 			<li>
-				<?php echo esc_html__( 'The queue is stored in a database table, so pending items survive cache flushes and restarts. Post type and term mappings are expanded into posts gradually by the worker.', 'faq-jsonld' ); ?>
+				<?php echo esc_html__( 'The queue is stored in a database table, so pending items survive cache flushes and restarts. Post type and term mappings are expanded into posts gradually by the worker.', 'renderbit-faq-structured-data' ); ?>
 			</li>
 			<li>
-				<?php echo esc_html__( 'If WP-Cron is disabled on your host, ensure real cron triggers wp-cron.php or use WP-CLI to process the queue manually.', 'faq-jsonld' ); ?>
+				<?php echo esc_html__( 'If WP-Cron is disabled on your host, ensure real cron triggers wp-cron.php or use WP-CLI to process the queue manually.', 'renderbit-faq-structured-data' ); ?>
 			</li>
 		</ul>
 	</div>
@@ -185,17 +185,17 @@ function fqj_render_health_page() {
 /**
  * AJAX: process queue now (admin)
  */
-function fqj_ajax_process_queue_now() {
-	check_ajax_referer( 'fqj_health_nonce', 'nonce' );
+function rfsd_ajax_process_queue_now() {
+	check_ajax_referer( 'rfsd_health_nonce', 'nonce' );
 	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_send_json_error( array( 'message' => __( 'Permission denied', 'faq-jsonld' ) ), 403 );
+		wp_send_json_error( array( 'message' => __( 'Permission denied', 'renderbit-faq-structured-data' ) ), 403 );
 	}
 
 	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 	$limit     = isset( $_POST['limit'] ) ? intval( $_POST['limit'] ) : null;
-	$processed = fqj_process_invalidation_queue_now( $limit );
-	$queue_len = fqj_queue_length();
-	$last_run  = (int) get_option( 'fqj_last_queue_run', 0 );
+	$processed = rfsd_process_invalidation_queue_now( $limit );
+	$queue_len = rfsd_queue_length();
+	$last_run  = (int) get_option( 'rfsd_last_queue_run', 0 );
 
 	wp_send_json_success(
 		array(
@@ -203,34 +203,34 @@ function fqj_ajax_process_queue_now() {
 			'queue_len'      => $queue_len,
 			'last_run'       => $last_run,
 			// Formatted on the server so the site's timezone and date settings apply.
-			'last_run_human' => $last_run ? fqj_format_time_ago( $last_run ) : '',
+			'last_run_human' => $last_run ? rfsd_format_time_ago( $last_run ) : '',
 		)
 	);
 }
-add_action( 'wp_ajax_fqj_process_queue_now', 'fqj_ajax_process_queue_now' );
+add_action( 'wp_ajax_rfsd_process_queue_now', 'rfsd_ajax_process_queue_now' );
 
 /**
  * AJAX: purge all FAQ transients (admin)
  */
-function fqj_ajax_purge_transients() {
-	check_ajax_referer( 'fqj_health_nonce', 'nonce' );
+function rfsd_ajax_purge_transients() {
+	check_ajax_referer( 'rfsd_health_nonce', 'nonce' );
 	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_send_json_error( array( 'message' => __( 'Permission denied', 'faq-jsonld' ) ), 403 );
+		wp_send_json_error( array( 'message' => __( 'Permission denied', 'renderbit-faq-structured-data' ) ), 403 );
 	}
-	fqj_purge_all_faq_transients();
-	wp_send_json_success( array( 'message' => __( 'Purged', 'faq-jsonld' ) ) );
+	rfsd_purge_all_faq_transients();
+	wp_send_json_success( array( 'message' => __( 'Purged', 'renderbit-faq-structured-data' ) ) );
 }
-add_action( 'wp_ajax_fqj_purge_transients', 'fqj_ajax_purge_transients' );
+add_action( 'wp_ajax_rfsd_purge_transients', 'rfsd_ajax_purge_transients' );
 
 /**
  * AJAX: clear invalidation log
  */
-function fqj_ajax_clear_invalidation_log() {
-	check_ajax_referer( 'fqj_health_nonce', 'nonce' );
+function rfsd_ajax_clear_invalidation_log() {
+	check_ajax_referer( 'rfsd_health_nonce', 'nonce' );
 	if ( ! current_user_can( 'manage_options' ) ) {
-		wp_send_json_error( array( 'message' => __( 'Permission denied', 'faq-jsonld' ) ), 403 );
+		wp_send_json_error( array( 'message' => __( 'Permission denied', 'renderbit-faq-structured-data' ) ), 403 );
 	}
-	fqj_update_option_no_autoload( 'fqj_invalidation_log', array() );
-	wp_send_json_success( array( 'message' => __( 'Cleared', 'faq-jsonld' ) ) );
+	rfsd_update_option_no_autoload( 'rfsd_invalidation_log', array() );
+	wp_send_json_success( array( 'message' => __( 'Cleared', 'renderbit-faq-structured-data' ) ) );
 }
-add_action( 'wp_ajax_fqj_clear_invalidation_log', 'fqj_ajax_clear_invalidation_log' );
+add_action( 'wp_ajax_rfsd_clear_invalidation_log', 'rfsd_ajax_clear_invalidation_log' );
diff --git a/includes/indexer.php b/includes/indexer.php
index 19cab1a..064b600 100644
--- a/includes/indexer.php
+++ b/includes/indexer.php
@@ -2,7 +2,7 @@
 /**
  * Indexer functions.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -18,22 +18,22 @@
  *
  * @return string
  */
-function fqj_table_name() {
+function rfsd_table_name() {
 	global $wpdb;
 
-	return $wpdb->prefix . 'fqj_mappings';
+	return $wpdb->prefix . 'rfsd_mappings';
 }
 
 /**
  * Create or update the mapping table.
  *
  * The dbDelta() function needs a strict format: no IF NOT EXISTS, two spaces after PRIMARY KEY, KEY (not INDEX),
- * and no inline comments. Bump FQJ_DB_VERSION in faq-jsonld.php whenever this statement changes.
+ * and no inline comments. Bump RFSD_DB_VERSION in renderbit-faq-structured-data.php whenever this statement changes.
  * mapping_type holds one of: post, post_type, term, url, global.
  */
-function fqj_create_table() {
+function rfsd_create_table() {
 	global $wpdb;
-	$table_name      = fqj_table_name();
+	$table_name      = rfsd_table_name();
 	$charset_collate = $wpdb->get_charset_collate();
 
 	$sql = "CREATE TABLE {$table_name} (
@@ -49,7 +49,7 @@ function fqj_create_table() {
 
 	// Invalidation queue: single posts plus post_type/term jobs that the worker expands from job_cursor.
 	// Values are IDs or post type names (max 20 chars); the unique key stays under the 767-byte InnoDB limit.
-	$queue_table = fqj_queue_table_name();
+	$queue_table = rfsd_queue_table_name();
 	$queue_sql   = "CREATE TABLE {$queue_table} (
       id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
       item_type VARCHAR(32) NOT NULL,
@@ -66,7 +66,7 @@ function fqj_create_table() {
 	// Record the version only if the table exists, so a failed run retries on the next request.
 	// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 	if ( $wpdb->get_results( $wpdb->prepare( 'DESCRIBE %i', $table_name ) ) && $wpdb->get_results( $wpdb->prepare( 'DESCRIBE %i', $queue_table ) ) ) {
-		update_option( FQJ_DB_VERSION_OPTION, FQJ_DB_VERSION );
+		update_option( RFSD_DB_VERSION_OPTION, RFSD_DB_VERSION );
 	}
 }
 
@@ -75,25 +75,25 @@ function fqj_create_table() {
  *
  * Activation hooks do not run on plugin updates, so this covers existing sites.
  */
-function fqj_maybe_upgrade_db() {
-	if ( version_compare( (string) get_option( FQJ_DB_VERSION_OPTION, '0' ), FQJ_DB_VERSION, '<' ) ) {
-		fqj_create_table();
+function rfsd_maybe_upgrade_db() {
+	if ( version_compare( (string) get_option( RFSD_DB_VERSION_OPTION, '0' ), RFSD_DB_VERSION, '<' ) ) {
+		rfsd_create_table();
 		// Carry over data from older versions (no-ops on fresh installs).
-		if ( version_compare( (string) get_option( FQJ_DB_VERSION_OPTION, '0' ), FQJ_DB_VERSION, '>=' ) ) {
-			fqj_migrate_legacy_queue();
-			fqj_unautoload_options();
+		if ( version_compare( (string) get_option( RFSD_DB_VERSION_OPTION, '0' ), RFSD_DB_VERSION, '>=' ) ) {
+			rfsd_migrate_legacy_queue();
+			rfsd_unautoload_options();
 		}
 	}
 }
-add_action( 'plugins_loaded', 'fqj_maybe_upgrade_db' );
+add_action( 'plugins_loaded', 'rfsd_maybe_upgrade_db' );
 
 /**
  * Check whether any FAQ item exists, in any status except auto-draft (trashed FAQs can be restored later).
  *
  * @return bool
  */
-function fqj_has_faq_items() {
-	return ! empty( fqj_get_faq_ids_after( 0, 1 ) );
+function rfsd_has_faq_items() {
+	return ! empty( rfsd_get_faq_ids_after( 0, 1 ) );
 }
 
 /**
@@ -103,13 +103,13 @@ function fqj_has_faq_items() {
  * @param int $limit    Maximum number of IDs.
  * @return int[]
  */
-function fqj_get_faq_ids_after( $after_id, $limit ) {
+function rfsd_get_faq_ids_after( $after_id, $limit ) {
 	global $wpdb;
 	// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 	$ids = $wpdb->get_col(
 		$wpdb->prepare(
 			"SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_status <> 'auto-draft' AND ID > %d ORDER BY ID ASC LIMIT %d",
-			FQJ_POST_TYPE,
+			RFSD_POST_TYPE,
 			(int) $after_id,
 			(int) $limit
 		)
@@ -124,53 +124,53 @@ function fqj_get_faq_ids_after( $after_id, $limit ) {
  * Reschedules itself until all FAQs are done. Sites hit by plain permalinks (#9) can hold wrong url rows
  * and stale transients that new saves do not fix.
  */
-function fqj_run_data_migration() {
-	if ( version_compare( (string) get_option( FQJ_DATA_VERSION_OPTION, '0' ), FQJ_DATA_VERSION, '>=' ) ) {
+function rfsd_run_data_migration() {
+	if ( version_compare( (string) get_option( RFSD_DATA_VERSION_OPTION, '0' ), RFSD_DATA_VERSION, '>=' ) ) {
 		return;
 	}
 
 	// FAQSection was never a schema.org type; store the normalized value (the purge below fixes cached output).
-	$opts = get_option( FQJ_OPTION_KEY );
-	if ( is_array( $opts ) && isset( $opts['output_type'] ) && fqj_normalize_output_type( $opts['output_type'] ) !== $opts['output_type'] ) {
-		$opts['output_type'] = fqj_normalize_output_type( $opts['output_type'] );
-		update_option( FQJ_OPTION_KEY, $opts );
+	$opts = get_option( RFSD_OPTION_KEY );
+	if ( is_array( $opts ) && isset( $opts['output_type'] ) && rfsd_normalize_output_type( $opts['output_type'] ) !== $opts['output_type'] ) {
+		$opts['output_type'] = rfsd_normalize_output_type( $opts['output_type'] );
+		update_option( RFSD_OPTION_KEY, $opts );
 	}
 
-	$batch_size = max( 1, (int) apply_filters( 'fqj_data_migration_batch_size', 25 ) );
+	$batch_size = max( 1, (int) apply_filters( 'rfsd_data_migration_batch_size', 25 ) );
 	// The cursor belongs to one target version; a cursor left by an older migration restarts from the top.
-	$saved  = get_option( FQJ_DATA_MIGRATION_CURSOR_OPTION );
-	$cursor = is_array( $saved ) && isset( $saved['version'], $saved['cursor'] ) && FQJ_DATA_VERSION === $saved['version'] ? (int) $saved['cursor'] : 0;
-	$ids    = fqj_get_faq_ids_after( $cursor, $batch_size );
+	$saved  = get_option( RFSD_DATA_MIGRATION_CURSOR_OPTION );
+	$cursor = is_array( $saved ) && isset( $saved['version'], $saved['cursor'] ) && RFSD_DATA_VERSION === $saved['version'] ? (int) $saved['cursor'] : 0;
+	$ids    = rfsd_get_faq_ids_after( $cursor, $batch_size );
 
 	// The final purge bumps the cache generation, which invalidates all cached output on every backend,
 	// so there is no need to enqueue per-post invalidation here.
-	$from_version = (string) get_option( FQJ_DATA_VERSION_OPTION, '0' );
+	$from_version = (string) get_option( RFSD_DATA_VERSION_OPTION, '0' );
 	foreach ( $ids as $faq_id ) {
 		if ( version_compare( $from_version, '3', '<' ) ) {
-			fqj_migrate_url_associations( $faq_id );
+			rfsd_migrate_url_associations( $faq_id );
 		}
-		fqj_rebuild_index_for_faq( $faq_id, false );
+		rfsd_rebuild_index_for_faq( $faq_id, false );
 		$cursor = $faq_id;
 	}
 
 	if ( count( $ids ) >= $batch_size ) {
 		update_option(
-			FQJ_DATA_MIGRATION_CURSOR_OPTION,
+			RFSD_DATA_MIGRATION_CURSOR_OPTION,
 			array(
-				'version' => FQJ_DATA_VERSION,
+				'version' => RFSD_DATA_VERSION,
 				'cursor'  => $cursor,
 			),
 			false
 		);
-		wp_schedule_single_event( time() + 10, 'fqj_data_migration' );
+		wp_schedule_single_event( time() + 10, 'rfsd_data_migration' );
 		return;
 	}
 
-	fqj_purge_all_faq_transients();
-	delete_option( FQJ_DATA_MIGRATION_CURSOR_OPTION );
-	update_option( FQJ_DATA_VERSION_OPTION, FQJ_DATA_VERSION );
+	rfsd_purge_all_faq_transients();
+	delete_option( RFSD_DATA_MIGRATION_CURSOR_OPTION );
+	update_option( RFSD_DATA_VERSION_OPTION, RFSD_DATA_VERSION );
 }
-add_action( 'fqj_data_migration', 'fqj_run_data_migration' );
+add_action( 'rfsd_data_migration', 'rfsd_run_data_migration' );
 
 /**
  * Data migration 3: keep URL associations that only matched through the `post` row indexing used to add.
@@ -180,8 +180,8 @@ function fqj_run_data_migration() {
  *
  * @param int $faq_id The FAQ ID.
  */
-function fqj_migrate_url_associations( $faq_id ) {
-	$payload = json_decode( (string) get_post_meta( $faq_id, 'fqj_assoc_data_json', true ), true );
+function rfsd_migrate_url_associations( $faq_id ) {
+	$payload = json_decode( (string) get_post_meta( $faq_id, 'rfsd_assoc_data_json', true ), true );
 	if ( ! is_array( $payload ) || empty( $payload['urls'] ) || ! is_array( $payload['urls'] ) ) {
 		return;
 	}
@@ -189,7 +189,7 @@ function fqj_migrate_url_associations( $faq_id ) {
 	// Posts the old index covered through a URL rather than through the FAQ's own post associations.
 	$explicit = isset( $payload['posts'] ) && is_array( $payload['posts'] ) ? array_map( 'intval', $payload['posts'] ) : array();
 	$old_ids  = array();
-	foreach ( fqj_get_mappings_for_faq( $faq_id ) as $m ) {
+	foreach ( rfsd_get_mappings_for_faq( $faq_id ) as $m ) {
 		$pid = (int) $m['value'];
 		if ( 'post' === $m['type'] && $pid > 0 && ! in_array( $pid, $explicit, true ) ) {
 			$old_ids[ $pid ] = $pid;
@@ -200,14 +200,14 @@ function fqj_migrate_url_associations( $faq_id ) {
 	$dead     = array();
 	$rewrites = array();
 	foreach ( $urls as $i => $url ) {
-		$pid = fqj_post_for_url( $url );
+		$pid = rfsd_post_for_url( $url );
 		if ( $pid ) {
 			unset( $old_ids[ $pid ] );
 			continue;
 		}
 
 		// A shortlink, the front page's slug URL or an old slug still routes to the post it used to cover.
-		$pid = fqj_post_routed_from_url( $url );
+		$pid = rfsd_post_routed_from_url( $url );
 		if ( $pid && isset( $old_ids[ $pid ] ) ) {
 			$urls[ $i ] = get_permalink( $pid );
 			$rewrites[] = array( $url, $urls[ $i ] );
@@ -243,9 +243,9 @@ function fqj_migrate_url_associations( $faq_id ) {
 	}
 
 	$payload['urls'] = array_values( array_unique( $urls ) );
-	update_post_meta( $faq_id, 'fqj_assoc_data_json', wp_slash( wp_json_encode( $payload ) ) );
+	update_post_meta( $faq_id, 'rfsd_assoc_data_json', wp_slash( wp_json_encode( $payload ) ) );
 
-	$report = get_option( FQJ_URL_MIGRATION_REPORT_OPTION, array() );
+	$report = get_option( RFSD_URL_MIGRATION_REPORT_OPTION, array() );
 	$report = is_array( $report ) ? $report : array();
 	foreach ( $rewrites as $rewrite ) {
 		$report[] = array(
@@ -254,19 +254,19 @@ function fqj_migrate_url_associations( $faq_id ) {
 			'new'    => $rewrite[1],
 		);
 	}
-	fqj_update_option_no_autoload( FQJ_URL_MIGRATION_REPORT_OPTION, $report );
+	rfsd_update_option_no_autoload( RFSD_URL_MIGRATION_REPORT_OPTION, $report );
 }
 
 /**
  * Schedule the data migration when the stored data version is older than the code.
  */
-function fqj_maybe_schedule_data_migration() {
-	if ( version_compare( (string) get_option( FQJ_DATA_VERSION_OPTION, '0' ), FQJ_DATA_VERSION, '<' )
-		&& ! wp_next_scheduled( 'fqj_data_migration' ) ) {
-		wp_schedule_single_event( time(), 'fqj_data_migration' );
+function rfsd_maybe_schedule_data_migration() {
+	if ( version_compare( (string) get_option( RFSD_DATA_VERSION_OPTION, '0' ), RFSD_DATA_VERSION, '<' )
+		&& ! wp_next_scheduled( 'rfsd_data_migration' ) ) {
+		wp_schedule_single_event( time(), 'rfsd_data_migration' );
 	}
 }
-add_action( 'plugins_loaded', 'fqj_maybe_schedule_data_migration', 20 );
+add_action( 'plugins_loaded', 'rfsd_maybe_schedule_data_migration', 20 );
 
 /**
  * Insert mapping rows for a given faq_id: accepts $mappings array with structure:
@@ -275,9 +275,9 @@ function fqj_maybe_schedule_data_migration() {
  * @param int   $faq_id The FAQ ID.
  * @param array $mappings The mappings array.
  */
-function fqj_insert_mappings( $faq_id, $mappings ) {
+function rfsd_insert_mappings( $faq_id, $mappings ) {
 	global $wpdb;
-	$table = fqj_table_name();
+	$table = rfsd_table_name();
 	foreach ( $mappings as $m ) {
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
 		$wpdb->insert(
@@ -297,22 +297,22 @@ function fqj_insert_mappings( $faq_id, $mappings ) {
  *
  * @param int $faq_id The FAQ ID.
  */
-function fqj_delete_mappings_for_faq( $faq_id ) {
+function rfsd_delete_mappings_for_faq( $faq_id ) {
 	global $wpdb;
-	$table = fqj_table_name();
+	$table = rfsd_table_name();
 	// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 	$wpdb->delete( $table, array( 'faq_id' => intval( $faq_id ) ), array( '%d' ) );
 }
 
 /**
- * Read the stored mapping rows of a FAQ in the same type/value shape that fqj_insert_mappings() takes.
+ * Read the stored mapping rows of a FAQ in the same type/value shape that rfsd_insert_mappings() takes.
  *
  * @param int $faq_id The FAQ ID.
  * @return array
  */
-function fqj_get_mappings_for_faq( $faq_id ) {
+function rfsd_get_mappings_for_faq( $faq_id ) {
 	global $wpdb;
-	$table = fqj_table_name();
+	$table = rfsd_table_name();
 	// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 	$rows = $wpdb->get_results( $wpdb->prepare( 'SELECT mapping_type, mapping_value FROM %i WHERE faq_id = %d', $table, intval( $faq_id ) ), ARRAY_A );
 
@@ -334,14 +334,14 @@ function fqj_get_mappings_for_faq( $faq_id ) {
  * @param int  $faq_id  The FAQ ID.
  * @param bool $enqueue Whether to enqueue affected posts for invalidation.
  */
-function fqj_rebuild_index_for_faq( $faq_id, $enqueue = true ) {
+function rfsd_rebuild_index_for_faq( $faq_id, $enqueue = true ) {
 	// Remember the old mappings: posts that lost an association need invalidating too.
-	$old_mappings = $enqueue ? fqj_get_mappings_for_faq( $faq_id ) : array();
+	$old_mappings = $enqueue ? rfsd_get_mappings_for_faq( $faq_id ) : array();
 
 	// delete old.
-	fqj_delete_mappings_for_faq( $faq_id );
+	rfsd_delete_mappings_for_faq( $faq_id );
 
-	$payload_json = get_post_meta( $faq_id, 'fqj_assoc_data_json', true );
+	$payload_json = get_post_meta( $faq_id, 'rfsd_assoc_data_json', true );
 	$payload      = $payload_json ? json_decode( $payload_json, true ) : array();
 	if ( ! is_array( $payload ) ) {
 		$payload = array();
@@ -354,7 +354,7 @@ function fqj_rebuild_index_for_faq( $faq_id, $enqueue = true ) {
 			// A URL association covers whichever post is at the URL now, so no post row (ADR-0001).
 			$mappings[] = array(
 				'type'  => 'url',
-				'value' => fqj_normalize_url( $u ),
+				'value' => rfsd_normalize_url( $u ),
 			);
 		}
 	}
@@ -394,12 +394,12 @@ function fqj_rebuild_index_for_faq( $faq_id, $enqueue = true ) {
 	}
 
 	if ( ! empty( $mappings ) ) {
-		fqj_insert_mappings( $faq_id, $mappings );
+		rfsd_insert_mappings( $faq_id, $mappings );
 	}
 
 	// Enqueue affected posts for background invalidation.
 	if ( $enqueue ) {
-		fqj_enqueue_invalidation_for_mappings( array_merge( $old_mappings, $mappings ) );
+		rfsd_enqueue_invalidation_for_mappings( array_merge( $old_mappings, $mappings ) );
 	}
 }
 
@@ -410,7 +410,7 @@ function fqj_rebuild_index_for_faq( $faq_id, $enqueue = true ) {
  *
  * @param array $mappings The mappings array.
  */
-function fqj_enqueue_invalidation_for_mappings( $mappings ) {
+function rfsd_enqueue_invalidation_for_mappings( $mappings ) {
 	if ( empty( $mappings ) ) {
 		return;
 	}
@@ -427,7 +427,7 @@ function fqj_enqueue_invalidation_for_mappings( $mappings ) {
 				break;
 			case 'url':
 				// item_value is VARCHAR(64), so URLs are resolved to a post now rather than queued.
-				$pid = fqj_post_for_url( $m['value'] );
+				$pid = rfsd_post_for_url( $m['value'] );
 				if ( $pid ) {
 					$post_ids_to_enqueue[] = intval( $pid );
 				}
@@ -446,13 +446,13 @@ function fqj_enqueue_invalidation_for_mappings( $mappings ) {
 
 	// Direct post IDs go straight in; post type and term mappings become jobs that the queue worker
 	// expands incrementally, so saving never enumerates every matching post.
-	fqj_queue_add_posts( $post_ids_to_enqueue );
-	fqj_queue_add_items( 'post_type', $post_types_to_process );
-	fqj_queue_add_items( 'term', $terms_to_process );
+	rfsd_queue_add_posts( $post_ids_to_enqueue );
+	rfsd_queue_add_items( 'post_type', $post_types_to_process );
+	rfsd_queue_add_items( 'term', $terms_to_process );
 
 	// For global, do a full purge (we can't reasonably enqueue all posts efficiently here).
 	if ( $must_purge_all ) {
-		fqj_purge_all_faq_transients();
+		rfsd_purge_all_faq_transients();
 	}
 }
 
@@ -461,8 +461,8 @@ function fqj_enqueue_invalidation_for_mappings( $mappings ) {
  *
  * @param int $faq_id The FAQ ID.
  */
-function fqj_invalidate_faq_mappings( $faq_id ) {
-	fqj_enqueue_invalidation_for_mappings( fqj_get_mappings_for_faq( $faq_id ) );
+function rfsd_invalidate_faq_mappings( $faq_id ) {
+	rfsd_enqueue_invalidation_for_mappings( rfsd_get_mappings_for_faq( $faq_id ) );
 }
 
 /**
@@ -472,13 +472,13 @@ function fqj_invalidate_faq_mappings( $faq_id ) {
  * @param string  $old_status Old status.
  * @param WP_Post $post       Post object.
  */
-function fqj_on_faq_transition_status( $new_status, $old_status, $post ) {
-	if ( FQJ_POST_TYPE !== $post->post_type || $new_status === $old_status ) {
+function rfsd_on_faq_transition_status( $new_status, $old_status, $post ) {
+	if ( RFSD_POST_TYPE !== $post->post_type || $new_status === $old_status ) {
 		return;
 	}
-	fqj_invalidate_faq_mappings( $post->ID );
+	rfsd_invalidate_faq_mappings( $post->ID );
 }
-add_action( 'transition_post_status', 'fqj_on_faq_transition_status', 10, 3 );
+add_action( 'transition_post_status', 'rfsd_on_faq_transition_status', 10, 3 );
 
 /**
  * Invalidate when a FAQ's question or answer changes outside the meta box (Quick Edit, REST, code).
@@ -487,20 +487,20 @@ function fqj_on_faq_transition_status( $new_status, $old_status, $post ) {
  * @param WP_Post $post_after  Post after the update.
  * @param WP_Post $post_before Post before the update.
  */
-function fqj_on_faq_updated( $post_id, $post_after, $post_before ) {
-	if ( FQJ_POST_TYPE !== $post_after->post_type ) {
+function rfsd_on_faq_updated( $post_id, $post_after, $post_before ) {
+	if ( RFSD_POST_TYPE !== $post_after->post_type ) {
 		return;
 	}
 	if ( $post_after->post_title === $post_before->post_title && $post_after->post_content === $post_before->post_content ) {
 		return;
 	}
 	// The meta box save rebuilds the index and invalidates the union itself.
-	if ( isset( $_POST['fqj_meta_nonce'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+	if ( isset( $_POST['rfsd_meta_nonce'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 		return;
 	}
-	fqj_invalidate_faq_mappings( $post_id );
+	rfsd_invalidate_faq_mappings( $post_id );
 }
-add_action( 'post_updated', 'fqj_on_faq_updated', 10, 3 );
+add_action( 'post_updated', 'rfsd_on_faq_updated', 10, 3 );
 
 /**
  * Invalidate and drop mapping rows when a FAQ is permanently deleted.
@@ -508,12 +508,12 @@ function fqj_on_faq_updated( $post_id, $post_after, $post_before ) {
  * @param int     $post_id Post ID.
  * @param WP_Post $post    Post object.
  */
-function fqj_on_faq_before_delete( $post_id, $post = null ) {
+function rfsd_on_faq_before_delete( $post_id, $post = null ) {
 	$post = $post ? $post : get_post( $post_id );
-	if ( ! $post || FQJ_POST_TYPE !== $post->post_type ) {
+	if ( ! $post || RFSD_POST_TYPE !== $post->post_type ) {
 		return;
 	}
-	fqj_invalidate_faq_mappings( $post_id );
-	fqj_delete_mappings_for_faq( $post_id );
+	rfsd_invalidate_faq_mappings( $post_id );
+	rfsd_delete_mappings_for_faq( $post_id );
 }
-add_action( 'before_delete_post', 'fqj_on_faq_before_delete', 10, 2 );
+add_action( 'before_delete_post', 'rfsd_on_faq_before_delete', 10, 2 );
diff --git a/includes/queue.php b/includes/queue.php
index 277dbac..4d94e58 100644
--- a/includes/queue.php
+++ b/includes/queue.php
@@ -2,7 +2,7 @@
 /**
  * Queue management functions.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -22,9 +22,9 @@
  * @param array $schedules Current cron schedules.
  * @return array Modified schedules.
  */
-function fqj_add_cron_interval( $schedules ) {
-	if ( ! isset( $schedules['fqj_five_minutes'] ) ) {
-		$schedules['fqj_five_minutes'] = array(
+function rfsd_add_cron_interval( $schedules ) {
+	if ( ! isset( $schedules['rfsd_five_minutes'] ) ) {
+		$schedules['rfsd_five_minutes'] = array(
 			'interval' => 5 * MINUTE_IN_SECONDS,
 			'display'  => 'Every 5 Minutes',
 		);
@@ -33,17 +33,17 @@ function fqj_add_cron_interval( $schedules ) {
 	return $schedules;
 }
 // phpcs:ignore WordPress.WP.CronInterval.CronSchedulesInterval -- the queue is meant to drain every 5 minutes.
-add_filter( 'cron_schedules', 'fqj_add_cron_interval' );
+add_filter( 'cron_schedules', 'rfsd_add_cron_interval' );
 
 /**
  * Queue table name, resolved at call time so it follows the current blog on multisite.
  *
  * @return string
  */
-function fqj_queue_table_name() {
+function rfsd_queue_table_name() {
 	global $wpdb;
 
-	return $wpdb->prefix . 'fqj_queue';
+	return $wpdb->prefix . 'rfsd_queue';
 }
 
 /**
@@ -52,7 +52,7 @@ function fqj_queue_table_name() {
  *
  * @return string[]
  */
-function fqj_queue_job_types() {
+function rfsd_queue_job_types() {
 	return array( 'post_type', 'term' );
 }
 
@@ -64,10 +64,10 @@ function fqj_queue_job_types() {
  * @param array  $values Item values (post IDs, post type names or term IDs).
  * @return bool True when at least one valid value was submitted.
  */
-function fqj_queue_add_items( $type, $values ) {
+function rfsd_queue_add_items( $type, $values ) {
 	global $wpdb;
 
-	$is_job = in_array( $type, fqj_queue_job_types(), true );
+	$is_job = in_array( $type, rfsd_queue_job_types(), true );
 	if ( ! $is_job && 'post' !== $type ) {
 		return false;
 	}
@@ -87,7 +87,7 @@ function fqj_queue_add_items( $type, $values ) {
 		return false;
 	}
 
-	$table = fqj_queue_table_name();
+	$table = rfsd_queue_table_name();
 	foreach ( array_chunk( array_values( $clean ), 200 ) as $chunk ) {
 		$placeholders = implode( ',', array_fill( 0, count( $chunk ), '(%s,%s)' ) );
 		$args         = array( $table );
@@ -115,8 +115,8 @@ function fqj_queue_add_items( $type, $values ) {
  * @param array $post_ids Array of post IDs.
  * @return bool True on success.
  */
-function fqj_queue_add_posts( $post_ids ) {
-	return fqj_queue_add_items( 'post', (array) $post_ids );
+function rfsd_queue_add_posts( $post_ids ) {
+	return rfsd_queue_add_items( 'post', (array) $post_ids );
 }
 
 /**
@@ -127,7 +127,7 @@ function fqj_queue_add_posts( $post_ids ) {
  * @param int $limit Max items to pop.
  * @return array
  */
-function fqj_queue_pop_posts( $limit = 100 ) {
+function rfsd_queue_pop_posts( $limit = 100 ) {
 	global $wpdb;
 
 	$limit = (int) $limit;
@@ -135,7 +135,7 @@ function fqj_queue_pop_posts( $limit = 100 ) {
 		return array();
 	}
 
-	$table = fqj_queue_table_name();
+	$table = rfsd_queue_table_name();
 	// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 	$rows = $wpdb->get_results(
 		$wpdb->prepare( "SELECT id, item_value FROM %i WHERE item_type = 'post' ORDER BY id ASC LIMIT %d", $table, $limit ),
@@ -159,10 +159,10 @@ function fqj_queue_pop_posts( $limit = 100 ) {
  *
  * @return int
  */
-function fqj_queue_length() {
+function rfsd_queue_length() {
 	global $wpdb;
 
-	$table = fqj_queue_table_name();
+	$table = rfsd_queue_table_name();
 	// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 	return (int) $wpdb->get_var( $wpdb->prepare( 'SELECT COUNT(*) FROM %i', $table ) );
 }
@@ -170,29 +170,29 @@ function fqj_queue_length() {
 /**
  * Move a leftover pre-table queue (transient) into the queue table, then delete the transient.
  */
-function fqj_migrate_legacy_queue() {
-	$existing = get_transient( 'fqj_invalidate_queue' );
+function rfsd_migrate_legacy_queue() {
+	$existing = get_transient( 'rfsd_invalidate_queue' );
 	if ( false === $existing ) {
 		return;
 	}
 
 	$queue = maybe_unserialize( $existing );
 	if ( is_array( $queue ) && ! empty( $queue ) ) {
-		fqj_queue_add_posts( $queue );
+		rfsd_queue_add_posts( $queue );
 	}
-	delete_transient( 'fqj_invalidate_queue' );
+	delete_transient( 'rfsd_invalidate_queue' );
 }
 
 /**
  * Save an option without autoload (the log and last-run timestamp are only read on the Health page).
  *
  * Note that update_option() only applies the autoload argument to existing rows from WP 6.4, so an already
- * autoloaded row is switched explicitly (see fqj_unautoload_options()).
+ * autoloaded row is switched explicitly (see rfsd_unautoload_options()).
  *
  * @param string $name  Option name.
  * @param mixed  $value Value.
  */
-function fqj_update_option_no_autoload( $name, $value ) {
+function rfsd_update_option_no_autoload( $name, $value ) {
 	if ( false === get_option( $name ) ) {
 		add_option( $name, $value, '', false );
 		return;
@@ -203,10 +203,10 @@ function fqj_update_option_no_autoload( $name, $value ) {
 /**
  * Turn autoload off for the plugin's rarely read options, whatever the WP version.
  */
-function fqj_unautoload_options() {
+function rfsd_unautoload_options() {
 	global $wpdb;
 
-	foreach ( array( 'fqj_invalidation_log', 'fqj_last_queue_run' ) as $name ) {
+	foreach ( array( 'rfsd_invalidation_log', 'rfsd_last_queue_run' ) as $name ) {
 		if ( false === get_option( $name ) ) {
 			continue;
 		}
@@ -224,30 +224,30 @@ function fqj_unautoload_options() {
 /**
  * Make sure the queue worker is scheduled. Cron events can be lost (cron option rewrites, migrations).
  */
-function fqj_ensure_cron_scheduled() {
-	if ( ! wp_next_scheduled( 'fqj_process_invalidation_queue' ) ) {
-		wp_schedule_event( time() + 60, 'fqj_five_minutes', 'fqj_process_invalidation_queue' );
+function rfsd_ensure_cron_scheduled() {
+	if ( ! wp_next_scheduled( 'rfsd_process_invalidation_queue' ) ) {
+		wp_schedule_event( time() + 60, 'rfsd_five_minutes', 'rfsd_process_invalidation_queue' );
 	}
 }
-add_action( 'init', 'fqj_ensure_cron_scheduled' );
+add_action( 'init', 'rfsd_ensure_cron_scheduled' );
 
 /**
  * Log an invalidation worker run.
- * Stores an entry into option 'fqj_invalidation_log' as array of entries:
+ * Stores an entry into option 'rfsd_invalidation_log' as array of entries:
  * [ [ 'ts' => 12345, 'processed' => n, 'sample' => [ids] ], ... ]
  * Keeps only last 200 entries (configurable later). A run that processed nothing only updates the last-run time.
  *
  * @param int   $processed_count Number processed.
  * @param array $sample_ids Sample IDs.
  */
-function fqj_log_invalidation_run( $processed_count, $sample_ids = array() ) {
+function rfsd_log_invalidation_run( $processed_count, $sample_ids = array() ) {
 	$processed_count = intval( $processed_count );
-	fqj_update_option_no_autoload( 'fqj_last_queue_run', time() );
+	rfsd_update_option_no_autoload( 'rfsd_last_queue_run', time() );
 	if ( $processed_count <= 0 ) {
 		return;
 	}
 
-	$opt_name = 'fqj_invalidation_log';
+	$opt_name = 'rfsd_invalidation_log';
 	$log      = get_option( $opt_name, array() );
 	if ( ! is_array( $log ) ) {
 		$log = array();
@@ -267,23 +267,23 @@ function fqj_log_invalidation_run( $processed_count, $sample_ids = array() ) {
 		$log = array_slice( $log, 0, $max );
 	}
 
-	fqj_update_option_no_autoload( $opt_name, $log );
+	rfsd_update_option_no_autoload( $opt_name, $log );
 }
 
 /**
  * Expand queued post_type/term jobs into per-post cache deletions, within a post budget.
  *
- * Each job walks the posts its mapping covers (fqj_posts_covered_by_mapping()) in ascending order from its
+ * Each job walks the posts its mapping covers (rfsd_posts_covered_by_mapping()) in ascending order from its
  * stored cursor and is deleted once exhausted.
  *
  * @param int $budget Maximum number of posts to process.
  * @return int[] IDs processed.
  */
-function fqj_queue_process_jobs( $budget ) {
+function rfsd_queue_process_jobs( $budget ) {
 	global $wpdb;
 
 	$done  = array();
-	$table = fqj_queue_table_name();
+	$table = rfsd_queue_table_name();
 
 	$done_count = 0;
 	while ( $done_count < $budget ) {
@@ -299,7 +299,7 @@ function fqj_queue_process_jobs( $budget ) {
 
 		$remaining = $budget - $done_count;
 		$cursor    = (int) $job['job_cursor'];
-		$ids       = fqj_posts_covered_by_mapping(
+		$ids       = rfsd_posts_covered_by_mapping(
 			array(
 				'type'  => $job['item_type'],
 				'value' => $job['item_value'],
@@ -309,7 +309,7 @@ function fqj_queue_process_jobs( $budget ) {
 		);
 
 		foreach ( $ids as $pid ) {
-			delete_transient( fqj_cache_key( $pid ) );
+			delete_transient( rfsd_cache_key( $pid ) );
 		}
 		$done       = array_merge( $done, $ids );
 		$done_count = count( $done );
@@ -349,14 +349,14 @@ function fqj_queue_process_jobs( $budget ) {
  * @param int $limit Maximum posts to process.
  * @return int[] Post IDs processed.
  */
-function fqj_queue_process_batch( $limit ) {
+function rfsd_queue_process_batch( $limit ) {
 	$limit = max( 1, (int) $limit );
-	$ids   = fqj_queue_pop_posts( $limit );
+	$ids   = rfsd_queue_pop_posts( $limit );
 	foreach ( $ids as $pid ) {
-		delete_transient( fqj_cache_key( $pid ) );
+		delete_transient( rfsd_cache_key( $pid ) );
 	}
 	if ( count( $ids ) < $limit ) {
-		$ids = array_merge( $ids, fqj_queue_process_jobs( $limit - count( $ids ) ) );
+		$ids = array_merge( $ids, rfsd_queue_process_jobs( $limit - count( $ids ) ) );
 	}
 
 	return $ids;
@@ -365,14 +365,14 @@ function fqj_queue_process_batch( $limit ) {
 /**
  * Cron worker: processes up to batch_size posts from the queue
  */
-function fqj_process_invalidation_queue_cron() {
-	$opts       = get_option( FQJ_OPTION_KEY );
+function rfsd_process_invalidation_queue_cron() {
+	$opts       = get_option( RFSD_OPTION_KEY );
 	$batch_size = isset( $opts['batch_size'] ) ? intval( $opts['batch_size'] ) : 500;
 
-	$processed = fqj_queue_process_batch( $batch_size );
-	fqj_log_invalidation_run( count( $processed ), array_slice( $processed, 0, 20 ) );
+	$processed = rfsd_queue_process_batch( $batch_size );
+	rfsd_log_invalidation_run( count( $processed ), array_slice( $processed, 0, 20 ) );
 }
-add_action( 'fqj_process_invalidation_queue', 'fqj_process_invalidation_queue_cron' );
+add_action( 'rfsd_process_invalidation_queue', 'rfsd_process_invalidation_queue_cron' );
 
 /**
  * Immediate queue processor (used by WP-CLI, admin AJAX or ad-hoc)
@@ -381,13 +381,13 @@ function fqj_process_invalidation_queue_cron() {
  * @param int $limit Max items.
  * @return int
  */
-function fqj_process_invalidation_queue_now( $limit = null ) {
-	$opts       = get_option( FQJ_OPTION_KEY );
+function rfsd_process_invalidation_queue_now( $limit = null ) {
+	$opts       = get_option( RFSD_OPTION_KEY );
 	$batch_size = isset( $opts['batch_size'] ) ? intval( $opts['batch_size'] ) : 500;
 	$limit      = $limit ? intval( $limit ) : $batch_size;
 
-	$processed = fqj_queue_process_batch( $limit );
-	fqj_log_invalidation_run( count( $processed ), array_slice( $processed, 0, 20 ) );
+	$processed = rfsd_queue_process_batch( $limit );
+	rfsd_log_invalidation_run( count( $processed ), array_slice( $processed, 0, 20 ) );
 
 	return count( $processed );
 }
@@ -395,25 +395,25 @@ function fqj_process_invalidation_queue_now( $limit = null ) {
 /**
  * Admin notice on the plugin's own screens (FAQ list and editor, Health, Settings): show the queue length to admins.
  */
-function fqj_admin_queue_notice() {
+function rfsd_admin_queue_notice() {
 	if ( ! current_user_can( 'manage_options' ) ) {
 		return;
 	}
 	$screen    = function_exists( 'get_current_screen' ) ? get_current_screen() : null;
-	$own_pages = array( FQJ_POST_TYPE . '_page_fqj-health', FQJ_POST_TYPE . '_page_fqj-settings' );
-	if ( ! $screen || ( FQJ_POST_TYPE !== $screen->post_type && ! in_array( $screen->id, $own_pages, true ) ) ) {
+	$own_pages = array( RFSD_POST_TYPE . '_page_rfsd-health', RFSD_POST_TYPE . '_page_rfsd-settings' );
+	if ( ! $screen || ( RFSD_POST_TYPE !== $screen->post_type && ! in_array( $screen->id, $own_pages, true ) ) ) {
 		return;
 	}
-	$len = fqj_queue_length();
+	$len = rfsd_queue_length();
 	if ( $len > 0 ) {
 		printf(
 			'<div class="notice notice-info"><p>%s</p></div>',
 			sprintf(
 				/* translators: %s: number of queued items. */
-				esc_html( _n( 'FAQ JSON-LD queue: %s item pending invalidation. The background worker (WP-Cron) will process it in batches.', 'FAQ JSON-LD queue: %s items pending invalidation. The background worker (WP-Cron) will process them in batches.', $len, 'faq-jsonld' ) ),
+				esc_html( _n( 'FAQ Structured Data queue: %s item pending invalidation. The background worker (WP-Cron) will process it in batches.', 'FAQ Structured Data queue: %s items pending invalidation. The background worker (WP-Cron) will process them in batches.', $len, 'renderbit-faq-structured-data' ) ),
 				'<strong>' . intval( $len ) . '</strong>'
 			)
 		);
 	}
 }
-add_action( 'admin_notices', 'fqj_admin_queue_notice' );
+add_action( 'admin_notices', 'rfsd_admin_queue_notice' );
diff --git a/includes/settings.php b/includes/settings.php
index 26250d2..a808cc9 100644
--- a/includes/settings.php
+++ b/includes/settings.php
@@ -2,7 +2,7 @@
 /**
  * Settings page.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -14,89 +14,89 @@
 /**
  * Settings page: TTL, batch size, output_type
  */
-function fqj_register_settings_page() {
+function rfsd_register_settings_page() {
 	add_submenu_page(
-		'edit.php?post_type=' . FQJ_POST_TYPE,
-		__( 'FAQ JSON-LD Settings', 'faq-jsonld' ),
-		__( 'Settings', 'faq-jsonld' ),
+		'edit.php?post_type=' . RFSD_POST_TYPE,
+		__( 'FAQ Structured Data Settings', 'renderbit-faq-structured-data' ),
+		__( 'Settings', 'renderbit-faq-structured-data' ),
 		'manage_options',
-		'fqj-settings',
-		'fqj_render_settings_page'
+		'rfsd-settings',
+		'rfsd_render_settings_page'
 	);
 }
-add_action( 'admin_menu', 'fqj_register_settings_page' );
+add_action( 'admin_menu', 'rfsd_register_settings_page' );
 
 /**
  * Render the settings page.
  */
-function fqj_render_settings_page() {
+function rfsd_render_settings_page() {
 	if ( ! current_user_can( 'manage_options' ) ) {
 		return;
 	}
 
-	$options = get_option( FQJ_OPTION_KEY );
+	$options = get_option( RFSD_OPTION_KEY );
 	if ( ! $options ) {
 		$options = array();
 	}
 
 	// Handle save.
 	if (
-		isset( $_POST['fqj_settings_nonce'] )
-		&& wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['fqj_settings_nonce'] ) ), 'fqj_save_settings' )
+		isset( $_POST['rfsd_settings_nonce'] )
+		&& wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['rfsd_settings_nonce'] ) ), 'rfsd_save_settings' )
 	) {
 		$cache_ttl   = isset( $_POST['cache_ttl'] ) ? intval( $_POST['cache_ttl'] ) : 0;
 		$batch_size  = isset( $_POST['batch_size'] ) ? intval( $_POST['batch_size'] ) : 0;
 		$posted_type = isset( $_POST['output_type'] ) ? sanitize_text_field( wp_unslash( $_POST['output_type'] ) ) : '';
 
-		$output_type = fqj_normalize_output_type( $posted_type );
+		$output_type = rfsd_normalize_output_type( $posted_type );
 
 		$options['cache_ttl']   = max( 60, $cache_ttl );
-		$options['batch_size']  = min( FQJ_MAX_BATCH_SIZE, max( 10, $batch_size ) );
+		$options['batch_size']  = min( RFSD_MAX_BATCH_SIZE, max( 10, $batch_size ) );
 		$options['output_type'] = $output_type;
-		update_option( FQJ_OPTION_KEY, $options );
+		update_option( RFSD_OPTION_KEY, $options );
 
-		echo '<div class="updated"><p>' . esc_html__( 'Settings saved.', 'faq-jsonld' ) . '</p></div>';
+		echo '<div class="updated"><p>' . esc_html__( 'Settings saved.', 'renderbit-faq-structured-data' ) . '</p></div>';
 	}
 
 	$cache_ttl   = isset( $options['cache_ttl'] ) ? intval( $options['cache_ttl'] ) : 12 * HOUR_IN_SECONDS;
 	$batch_size  = isset( $options['batch_size'] ) ? intval( $options['batch_size'] ) : 500;
-	$output_type = fqj_normalize_output_type( isset( $options['output_type'] ) ? $options['output_type'] : '' );
+	$output_type = rfsd_normalize_output_type( isset( $options['output_type'] ) ? $options['output_type'] : '' );
 	?>
 	<div class="wrap">
-		<h1><?php echo esc_html__( 'FAQ JSON-LD Settings', 'faq-jsonld' ); ?></h1>
+		<h1><?php echo esc_html__( 'FAQ Structured Data Settings', 'renderbit-faq-structured-data' ); ?></h1>
 		<form method="post">
-			<?php wp_nonce_field( 'fqj_save_settings', 'fqj_settings_nonce' ); ?>
+			<?php wp_nonce_field( 'rfsd_save_settings', 'rfsd_settings_nonce' ); ?>
 
 			<table class="form-table">
 				<tr>
-					<th scope="row"><label for="cache_ttl"><?php echo esc_html__( 'Cache TTL (seconds)', 'faq-jsonld' ); ?></label></th>
+					<th scope="row"><label for="cache_ttl"><?php echo esc_html__( 'Cache TTL (seconds)', 'renderbit-faq-structured-data' ); ?></label></th>
 					<td><input name="cache_ttl" id="cache_ttl" type="number"
 						value="<?php echo esc_attr( $cache_ttl ); ?>" class="regular-text" />
 						<p class="description">
-						<?php echo esc_html__( 'Number of seconds to cache per-post JSON-LD. Default is 43200 (12 hours).', 'faq-jsonld' ); ?>
+						<?php echo esc_html__( 'Number of seconds to cache per-post JSON-LD. Default is 43200 (12 hours).', 'renderbit-faq-structured-data' ); ?>
 						</p></td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="batch_size"><?php echo esc_html__( 'Invalidation batch size', 'faq-jsonld' ); ?></label></th>
+					<th scope="row"><label for="batch_size"><?php echo esc_html__( 'Invalidation batch size', 'renderbit-faq-structured-data' ); ?></label></th>
 					<td><input name="batch_size" id="batch_size" type="number" min="10"
-						max="<?php echo esc_attr( FQJ_MAX_BATCH_SIZE ); ?>" value="<?php echo esc_attr( $batch_size ); ?>" class="regular-text" />
+						max="<?php echo esc_attr( RFSD_MAX_BATCH_SIZE ); ?>" value="<?php echo esc_attr( $batch_size ); ?>" class="regular-text" />
 						<p class="description">
 						<?php
 						/* translators: %d: maximum batch size. */
-						echo esc_html( sprintf( __( 'When invalidating many posts (e.g., post-type mapping), process posts in batches of this size to avoid timeouts. Between 10 and %d.', 'faq-jsonld' ), FQJ_MAX_BATCH_SIZE ) );
+						echo esc_html( sprintf( __( 'When invalidating many posts (e.g., post-type mapping), process posts in batches of this size to avoid timeouts. Between 10 and %d.', 'renderbit-faq-structured-data' ), RFSD_MAX_BATCH_SIZE ) );
 						?>
 						</p></td>
 				</tr>
 				<tr>
-					<th scope="row"><label for="output_type"><?php echo esc_html__( 'Default output type', 'faq-jsonld' ); ?></label></th>
+					<th scope="row"><label for="output_type"><?php echo esc_html__( 'Default output type', 'renderbit-faq-structured-data' ); ?></label></th>
 					<td>
 						<select name="output_type" id="output_type">
 							<option value="faqpage" <?php selected( $output_type, 'faqpage' ); ?>>
-								<?php echo esc_html__( 'FAQPage (recommended)', 'faq-jsonld' ); ?>
+								<?php echo esc_html__( 'FAQPage (recommended)', 'renderbit-faq-structured-data' ); ?>
 							</option>
 						</select>
 						<p class="description">
-						<?php echo esc_html__( 'The plugin outputs schema.org FAQPage markup. Individual FAQs control associations.', 'faq-jsonld' ); ?>
+						<?php echo esc_html__( 'The plugin outputs schema.org FAQPage markup. Individual FAQs control associations.', 'renderbit-faq-structured-data' ); ?>
 						</p>
 					</td>
 				</tr>
@@ -105,26 +105,26 @@ function fqj_render_settings_page() {
 			<?php submit_button(); ?>
 		</form>
 
-		<h2><?php echo esc_html__( 'Tools', 'faq-jsonld' ); ?></h2>
+		<h2><?php echo esc_html__( 'Tools', 'renderbit-faq-structured-data' ); ?></h2>
 		<p>
-			<strong><?php echo esc_html__( 'Purge all FAQ transients:', 'faq-jsonld' ); ?></strong>
+			<strong><?php echo esc_html__( 'Purge all FAQ transients:', 'renderbit-faq-structured-data' ); ?></strong>
 		</p>
 			<form method="post" style="display:inline;">
-				<?php wp_nonce_field( 'fqj_purge_all_nonce', 'fqj_purge_all_nonce_field' ); ?>
-				<input type="hidden" name="fqj_action" value="purge_all" />
-				<?php submit_button( __( 'Purge transients', 'faq-jsonld' ), 'secondary', 'submit', false ); ?>
+				<?php wp_nonce_field( 'rfsd_purge_all_nonce', 'rfsd_purge_all_nonce_field' ); ?>
+				<input type="hidden" name="rfsd_action" value="purge_all" />
+				<?php submit_button( __( 'Purge transients', 'renderbit-faq-structured-data' ), 'secondary', 'submit', false ); ?>
 			</form>
 
 
 		<?php
 		if (
-			isset( $_POST['fqj_action'] )
-			&& 'purge_all' === $_POST['fqj_action']
-			&& isset( $_POST['fqj_purge_all_nonce_field'] )
-			&& wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['fqj_purge_all_nonce_field'] ) ), 'fqj_purge_all_nonce' )
+			isset( $_POST['rfsd_action'] )
+			&& 'purge_all' === $_POST['rfsd_action']
+			&& isset( $_POST['rfsd_purge_all_nonce_field'] )
+			&& wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['rfsd_purge_all_nonce_field'] ) ), 'rfsd_purge_all_nonce' )
 		) {
-			fqj_purge_all_faq_transients();
-			echo '<div class="updated"><p>' . esc_html__( 'All FAQ transients purged.', 'faq-jsonld' ) . '</p></div>';
+			rfsd_purge_all_faq_transients();
+			echo '<div class="updated"><p>' . esc_html__( 'All FAQ transients purged.', 'renderbit-faq-structured-data' ) . '</p></div>';
 		}
 		?>
 
@@ -140,11 +140,11 @@ function fqj_render_settings_page() {
  *
  * @return int
  */
-function fqj_cache_generation() {
-	$generation = (int) get_option( 'fqj_cache_gen', 0 );
+function rfsd_cache_generation() {
+	$generation = (int) get_option( 'rfsd_cache_gen', 0 );
 	if ( $generation < 1 ) {
 		$generation = time();
-		add_option( 'fqj_cache_gen', $generation, '', true );
+		add_option( 'rfsd_cache_gen', $generation, '', true );
 	}
 
 	return $generation;
@@ -156,8 +156,8 @@ function fqj_cache_generation() {
  * @param int $post_id Post ID.
  * @return string
  */
-function fqj_cache_key( $post_id ) {
-	return 'fqj_faq_json_' . fqj_cache_generation() . '_' . intval( $post_id );
+function rfsd_cache_key( $post_id ) {
+	return 'rfsd_faq_json_' . rfsd_cache_generation() . '_' . intval( $post_id );
 }
 
 /**
@@ -169,19 +169,19 @@ function fqj_cache_key( $post_id ) {
  *
  * @return int The new cache generation.
  */
-function fqj_purge_all_faq_transients() {
+function rfsd_purge_all_faq_transients() {
 	global $wpdb;
 
-	$generation = fqj_cache_generation() + 1;
-	update_option( 'fqj_cache_gen', $generation, true );
+	$generation = rfsd_cache_generation() + 1;
+	update_option( 'rfsd_cache_gen', $generation, true );
 
 	if ( ! wp_using_ext_object_cache() ) {
 		// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 		$rows = $wpdb->get_col(
 			$wpdb->prepare(
 				"SELECT option_name FROM {$wpdb->options} WHERE option_name LIKE %s OR option_name LIKE %s",
-				$wpdb->esc_like( '_transient_fqj_faq_json_' ) . '%',
-				$wpdb->esc_like( '_transient_timeout_fqj_faq_json_' ) . '%'
+				$wpdb->esc_like( '_transient_rfsd_faq_json_' ) . '%',
+				$wpdb->esc_like( '_transient_timeout_rfsd_faq_json_' ) . '%'
 			)
 		);
 		// phpcs:enable
@@ -199,7 +199,7 @@ function fqj_purge_all_faq_transients() {
  * @param mixed $type Stored or posted value.
  * @return string
  */
-function fqj_normalize_output_type( $type ) {
+function rfsd_normalize_output_type( $type ) {
 	unset( $type );
 
 	return 'faqpage';
@@ -211,11 +211,11 @@ function fqj_normalize_output_type( $type ) {
  * @param mixed $old_value Previous settings.
  * @param mixed $value     New settings.
  */
-function fqj_maybe_purge_on_settings_change( $old_value, $value ) {
-	$old_type = is_array( $old_value ) && isset( $old_value['output_type'] ) ? fqj_normalize_output_type( $old_value['output_type'] ) : 'faqpage';
-	$new_type = is_array( $value ) && isset( $value['output_type'] ) ? fqj_normalize_output_type( $value['output_type'] ) : 'faqpage';
+function rfsd_maybe_purge_on_settings_change( $old_value, $value ) {
+	$old_type = is_array( $old_value ) && isset( $old_value['output_type'] ) ? rfsd_normalize_output_type( $old_value['output_type'] ) : 'faqpage';
+	$new_type = is_array( $value ) && isset( $value['output_type'] ) ? rfsd_normalize_output_type( $value['output_type'] ) : 'faqpage';
 	if ( $old_type !== $new_type ) {
-		fqj_purge_all_faq_transients();
+		rfsd_purge_all_faq_transients();
 	}
 }
-add_action( 'update_option_' . FQJ_OPTION_KEY, 'fqj_maybe_purge_on_settings_change', 10, 2 );
+add_action( 'update_option_' . RFSD_OPTION_KEY, 'rfsd_maybe_purge_on_settings_change', 10, 2 );
diff --git a/package-lock.json b/package-lock.json
index b2c15c9..f153876 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,10 +1,10 @@
 {
-  "name": "faq-jsonld",
+  "name": "renderbit-faq-structured-data",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "faq-jsonld",
+      "name": "renderbit-faq-structured-data",
       "license": "GPL-2.0-or-later",
       "devDependencies": {
         "jest": "^30.5.2",
diff --git a/package.json b/package.json
index 4e24e62..f87de97 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "faq-jsonld",
+  "name": "renderbit-faq-structured-data",
   "private": true,
-  "description": "Tests for the FAQ JSON-LD admin scripts.",
+  "description": "Tests for the Renderbit FAQ Structured Data admin scripts.",
   "license": "GPL-2.0-or-later",
   "scripts": {
     "test": "jest"
diff --git a/phpcs.xml b/phpcs.xml
index fea3ea1..b7a94cd 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<ruleset name="FAQ JSON-LD">
-	<description>Coding standard for the FAQ JSON-LD WordPress plugin: WordPress Coding Standards.</description>
+<ruleset name="Renderbit FAQ Structured Data">
+	<description>Coding standard for the Renderbit FAQ Structured Data WordPress plugin: WordPress Coding Standards.</description>
 
-	<file>faq-jsonld.php</file>
+	<file>renderbit-faq-structured-data.php</file>
 	<file>uninstall.php</file>
 	<file>includes</file>
 	<file>bin</file>
@@ -17,7 +17,7 @@
 	<rule ref="WordPress.WP.I18n">
 		<properties>
 			<property name="text_domain" type="array">
-				<element value="faq-jsonld"/>
+				<element value="renderbit-faq-structured-data"/>
 			</property>
 		</properties>
 	</rule>
diff --git a/phpunit-multisite.xml.dist b/phpunit-multisite.xml.dist
index be49165..e24f4fc 100644
--- a/phpunit-multisite.xml.dist
+++ b/phpunit-multisite.xml.dist
@@ -16,7 +16,7 @@
 		<const name="WP_TESTS_MULTISITE" value="1"/>
 	</php>
 	<testsuites>
-		<testsuite name="faq-jsonld">
+		<testsuite name="renderbit-faq-structured-data">
 			<directory prefix="test-" suffix=".php">tests/php</directory>
 		</testsuite>
 	</testsuites>
@@ -27,7 +27,7 @@
 	</groups>
 	<coverage includeUncoveredFiles="true">
 		<include>
-			<file>faq-jsonld.php</file>
+			<file>renderbit-faq-structured-data.php</file>
 			<file>uninstall.php</file>
 			<directory suffix=".php">includes</directory>
 		</include>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8e701e1..05e70a4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
 	convertDeprecationsToExceptions="true"
 >
 	<testsuites>
-		<testsuite name="faq-jsonld">
+		<testsuite name="renderbit-faq-structured-data">
 			<directory prefix="test-" suffix=".php">tests/php</directory>
 		</testsuite>
 	</testsuites>
@@ -23,7 +23,7 @@
 	</groups>
 	<coverage includeUncoveredFiles="true">
 		<include>
-			<file>faq-jsonld.php</file>
+			<file>renderbit-faq-structured-data.php</file>
 			<file>uninstall.php</file>
 			<directory suffix=".php">includes</directory>
 		</include>
diff --git a/readme.txt b/readme.txt
index bb7bdec..a175692 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-=== FAQ JSON-LD Manager ===
+=== Renderbit FAQ Structured Data ===
 Contributors: renderbit
 Tags: faq, schema, json-ld, structured data, seo
 Requires at least: 6.5
@@ -12,7 +12,7 @@ Manage FAQ items as a custom post type and output FAQPage JSON-LD on the posts a
 
 == Description ==
 
-FAQ JSON-LD Manager keeps your FAQs in one place and adds schema.org `FAQPage` structured data to the content they belong to. Write each question and answer once as an FAQ item, then attach it to the posts, post types, taxonomy terms or URLs where it should appear, or make it global.
+Renderbit FAQ Structured Data keeps your FAQs in one place and adds schema.org `FAQPage` structured data to the content they belong to. Write each question and answer once as an FAQ item, then attach it to the posts, post types, taxonomy terms or URLs where it should appear, or make it global.
 
 Built for large sites:
 
@@ -30,21 +30,21 @@ Built for large sites:
 
 = WP-CLI commands =
 
-* `wp fqj purge-transients` purges all cached FAQ JSON-LD.
-* `wp fqj process-queue [--limit=N]` processes the invalidation queue.
-* `wp fqj queue-info` shows the number of pending queue items.
+* `wp rfsd purge-transients` purges all cached FAQ JSON-LD.
+* `wp rfsd process-queue [--limit=N]` processes the invalidation queue.
+* `wp rfsd queue-info` shows the number of pending queue items.
 
 = Developer filters =
 
-* `fqj_question_text( $text, $faq_post )` filters the plain-text question.
-* `fqj_answer_text( $text, $faq_post )` filters the plain-text answer.
-* `fqj_uninstall_delete_faqs` (default `false`): return `true` to delete FAQ posts when the plugin is deleted.
+* `rfsd_question_text( $text, $faq_post )` filters the plain-text question.
+* `rfsd_answer_text( $text, $faq_post )` filters the plain-text answer.
+* `rfsd_uninstall_delete_faqs` (default `false`): return `true` to delete FAQ posts when the plugin is deleted.
 
 Development happens on [GitHub](https://github.com/renderbit-technologies/faq-jsonld-wordpress-plugin).
 
 == Installation ==
 
-1. Install the plugin from Plugins > Add New, or upload the `faq-jsonld` folder to `wp-content/plugins/`.
+1. Install the plugin from Plugins > Add New, or upload the `renderbit-faq-structured-data` folder to `wp-content/plugins/`.
 2. Activate it. The mapping table is created automatically.
 3. Add questions under FAQ Items and use the association box on each item to choose where it appears.
 4. Adjust cache lifetime and batch size under FAQ Items > Settings.
@@ -65,12 +65,12 @@ Yes. "Purge all" bumps a cache generation number instead of deleting transients
 
 = What happens when I delete the plugin? =
 
-Its options, transients, scheduled events, post meta and mapping table are removed. FAQ item posts are kept unless you enable the `fqj_uninstall_delete_faqs` filter.
+Its options, transients, scheduled events, post meta and mapping table are removed. FAQ item posts are kept unless you enable the `rfsd_uninstall_delete_faqs` filter.
 
 == Changelog ==
 
 = 3.1.1 =
-* FAQ items now use the prefixed post type `fqj_faq` instead of `faq_item`, so they cannot collide with another plugin's FAQ post type. Existing FAQs are moved over automatically on upgrade; links or code that use `post_type=faq_item` need updating.
+* FAQ items now use the prefixed post type `rfsd_faq` instead of `faq_item`, so they cannot collide with another plugin's FAQ post type. Existing FAQs are moved over automatically on upgrade; links or code that use `post_type=faq_item` need updating.
 * The invalidation queue notice only appears on the plugin's own screens (FAQ list and editor, Health, Settings) instead of on every admin page, and can be translated.
 * Updated the bundled Select2 to 4.1.0.
 
@@ -98,7 +98,7 @@ Its options, transients, scheduled events, post meta and mapping table are remov
 == Upgrade Notice ==
 
 = 3.1.1 =
-FAQ items move to the prefixed post type `fqj_faq` automatically. Update any bookmarks or custom code that use `post_type=faq_item`.
+FAQ items move to the prefixed post type `rfsd_faq` automatically. Update any bookmarks or custom code that use `post_type=faq_item`.
 
 = 3.1.0 =
 URL associations now match the URL itself. The upgrade rewrites URLs that only matched the old way and lists every change on the FAQ list screen.
diff --git a/renderbit-faq-structured-data.php b/renderbit-faq-structured-data.php
new file mode 100644
index 0000000..504520b
--- /dev/null
+++ b/renderbit-faq-structured-data.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Plugin Name: Renderbit FAQ Structured Data
+ * Plugin URI:  https://github.com/renderbit-technologies/faq-jsonld-wordpress-plugin
+ * Description: Manage FAQ items as a custom post type and output FAQPage JSON-LD on the posts and pages they apply to.
+ * Version:     3.1.1
+ * Requires at least: 6.5
+ * Requires PHP: 7.2
+ * Author:      Renderbit Technologies
+ * License:     GPLv2 or later
+ * License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * Text Domain: renderbit-faq-structured-data
+ *
+ * @package Renderbit_FAQ_Structured_Data
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+// phpcs:disable PSR1.Files.SideEffects
+
+// Keep in sync with the Version header above; used to version the plugin's own assets.
+define( 'RFSD_VERSION', '3.1.1' );
+// Upper bound for the invalidation batch size setting.
+define( 'RFSD_MAX_BATCH_SIZE', 5000 );
+define( 'RFSD_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+define( 'RFSD_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+define( 'RFSD_OPTION_KEY', 'rfsd_settings' );
+define( 'RFSD_DB_VERSION', '3' );
+define( 'RFSD_DB_VERSION_OPTION', 'rfsd_db_version' );
+
+// Data migration version: bump to run a one-time reindex and cache purge on existing sites.
+define( 'RFSD_DATA_VERSION', '3' );
+define( 'RFSD_DATA_VERSION_OPTION', 'rfsd_data_version' );
+define( 'RFSD_DATA_MIGRATION_CURSOR_OPTION', 'rfsd_data_migration_cursor' );
+// URL associations rewritten by data migration 3, shown on the FAQ list screen until dismissed.
+define( 'RFSD_URL_MIGRATION_REPORT_OPTION', 'rfsd_url_migration_report' );
+
+// Post type of FAQ items. Older post type names in RFSD_LEGACY_POST_TYPES are renamed to it on existing sites.
+define( 'RFSD_POST_TYPE', 'rfsd_faq' );
+define( 'RFSD_LEGACY_POST_TYPES', array( 'faq_item' ) );
+define( 'RFSD_POST_TYPE_OPTION', 'rfsd_post_type' );
+
+/**
+ * Autoload includes
+ */
+require_once RFSD_PLUGIN_DIR . 'includes/settings.php';
+require_once RFSD_PLUGIN_DIR . 'includes/coverage.php';
+require_once RFSD_PLUGIN_DIR . 'includes/indexer.php';
+require_once RFSD_PLUGIN_DIR . 'includes/queue.php';
+require_once RFSD_PLUGIN_DIR . 'includes/admin.php';
+require_once RFSD_PLUGIN_DIR . 'includes/frontend.php';
+require_once RFSD_PLUGIN_DIR . 'includes/class-rfsd-cli.php';
+require_once RFSD_PLUGIN_DIR . 'includes/health.php';
+
+/**
+ * Register CPT
+ */
+function rfsd_register_cpt_faq_item() {
+	$labels = array(
+		'name'          => __( 'FAQ Items', 'renderbit-faq-structured-data' ),
+		'singular_name' => __( 'FAQ Item', 'renderbit-faq-structured-data' ),
+		'add_new_item'  => __( 'Add FAQ Item', 'renderbit-faq-structured-data' ),
+		'edit_item'     => __( 'Edit FAQ Item', 'renderbit-faq-structured-data' ),
+		'new_item'      => __( 'New FAQ Item', 'renderbit-faq-structured-data' ),
+		'view_item'     => __( 'View FAQ Item', 'renderbit-faq-structured-data' ),
+		'search_items'  => __( 'Search FAQ Items', 'renderbit-faq-structured-data' ),
+		'not_found'     => __( 'No FAQ items found', 'renderbit-faq-structured-data' ),
+		'all_items'     => __( 'All FAQ Items', 'renderbit-faq-structured-data' ),
+	);
+	$args   = array(
+		'labels'          => $labels,
+		'public'          => false,
+		'show_ui'         => true,
+		'show_in_menu'    => true,
+		'capability_type' => 'post',
+		'hierarchical'    => false,
+		'supports'        => array( 'title', 'editor' ),
+		'menu_position'   => 25,
+		'menu_icon'       => 'dashicons-editor-help',
+		'has_archive'     => false,
+	);
+	register_post_type( RFSD_POST_TYPE, $args );
+}
+add_action( 'init', 'rfsd_register_cpt_faq_item' );
+
+/**
+ * Rename FAQ items stored under a legacy post type to RFSD_POST_TYPE, once per site.
+ *
+ * Runs before the schema upgrade and the data migration, which only look at RFSD_POST_TYPE.
+ */
+function rfsd_migrate_legacy_post_types() {
+	global $wpdb;
+
+	if ( RFSD_POST_TYPE === get_option( RFSD_POST_TYPE_OPTION ) ) {
+		return;
+	}
+
+	foreach ( RFSD_LEGACY_POST_TYPES as $legacy ) {
+		// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+		$ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s", $legacy ) );
+		if ( $ids ) {
+			$wpdb->update( $wpdb->posts, array( 'post_type' => RFSD_POST_TYPE ), array( 'post_type' => $legacy ) );
+		}
+		// phpcs:enable
+		foreach ( $ids as $id ) {
+			clean_post_cache( (int) $id );
+		}
+	}
+
+	update_option( RFSD_POST_TYPE_OPTION, RFSD_POST_TYPE );
+}
+add_action( 'plugins_loaded', 'rfsd_migrate_legacy_post_types', 5 );
+
+/**
+ * Run a callback for every site of the network, or once when the install is single-site.
+ *
+ * @param callable $callback Called with no arguments while the site is switched to.
+ */
+function rfsd_for_each_site( $callback ) {
+	if ( ! is_multisite() ) {
+		call_user_func( $callback );
+		return;
+	}
+
+	$site_ids = get_sites(
+		array(
+			'fields' => 'ids',
+			'number' => 0,
+		)
+	);
+	foreach ( $site_ids as $site_id ) {
+		switch_to_blog( $site_id );
+		call_user_func( $callback );
+		restore_current_blog();
+	}
+}
+
+/**
+ * Activate the plugin for the current site: create DB table, defaults, schedule cron.
+ */
+function rfsd_activate_site() {
+	rfsd_migrate_legacy_post_types();
+
+	// A site with no FAQs yet has nothing to migrate.
+	if ( false === get_option( RFSD_DATA_VERSION_OPTION ) && ! rfsd_has_faq_items() ) {
+		// Cached output can outlive deleted FAQs on a reactivated site.
+		rfsd_purge_all_faq_transients();
+		update_option( RFSD_DATA_VERSION_OPTION, RFSD_DATA_VERSION );
+	}
+
+	rfsd_create_table();
+	// Reactivating after an upgrade skips the plugins_loaded upgrade path, so carry old data over here too.
+	rfsd_migrate_legacy_queue();
+	rfsd_unautoload_options();
+
+	$defaults            = array(
+		'cache_ttl'   => 12 * HOUR_IN_SECONDS,
+		'batch_size'  => 500,
+		'output_type' => 'faqpage',
+	);
+	$opts                = get_option( RFSD_OPTION_KEY, array() );
+	$opts                = wp_parse_args( $opts, $defaults );
+	$opts['output_type'] = rfsd_normalize_output_type( $opts['output_type'] );
+	update_option( RFSD_OPTION_KEY, $opts );
+
+	// schedule cron if not scheduled.
+	if ( ! wp_next_scheduled( 'rfsd_process_invalidation_queue' ) ) {
+		// Use a custom interval 'rfsd_five_minutes' registered in queue.php.
+		wp_schedule_event( time() + 60, 'rfsd_five_minutes', 'rfsd_process_invalidation_queue' );
+	}
+}
+
+/**
+ * Activation. On network activation every existing site is set up.
+ *
+ * @param bool $network_wide Whether the plugin is being activated network-wide.
+ */
+function rfsd_activate( $network_wide = false ) {
+	if ( $network_wide && is_multisite() ) {
+		rfsd_for_each_site( 'rfsd_activate_site' );
+		return;
+	}
+
+	rfsd_activate_site();
+}
+register_activation_hook( __FILE__, 'rfsd_activate' );
+
+/**
+ * Set up a site created while the plugin is network-active.
+ *
+ * @param WP_Site $new_site The new site.
+ */
+function rfsd_on_initialize_site( $new_site ) {
+	if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
+		require_once ABSPATH . 'wp-admin/includes/plugin.php';
+	}
+	if ( ! is_plugin_active_for_network( plugin_basename( __FILE__ ) ) ) {
+		return;
+	}
+
+	switch_to_blog( (int) $new_site->blog_id );
+	rfsd_activate_site();
+	restore_current_blog();
+}
+// Late priority so the new site's default options and tables exist first.
+add_action( 'wp_initialize_site', 'rfsd_on_initialize_site', 900 );
+
+/**
+ * Clear the plugin's scheduled events for the current site.
+ */
+function rfsd_clear_scheduled_events() {
+	wp_clear_scheduled_hook( 'rfsd_process_invalidation_queue' );
+	wp_clear_scheduled_hook( 'rfsd_data_migration' );
+}
+
+/**
+ * Deactivation: clear cron events (on every site for network deactivation).
+ *
+ * @param bool $network_wide Whether the plugin is being deactivated network-wide.
+ */
+function rfsd_deactivate( $network_wide = false ) {
+	if ( $network_wide && is_multisite() ) {
+		rfsd_for_each_site( 'rfsd_clear_scheduled_events' );
+		return;
+	}
+
+	rfsd_clear_scheduled_events();
+}
+register_deactivation_hook( __FILE__, 'rfsd_deactivate' );
diff --git a/tests/js/fqj-admin.test.js b/tests/js/rfsd-admin.test.js
similarity index 73%
rename from tests/js/fqj-admin.test.js
rename to tests/js/rfsd-admin.test.js
index 0e9aed4..a2270d9 100644
--- a/tests/js/fqj-admin.test.js
+++ b/tests/js/rfsd-admin.test.js
@@ -1,22 +1,22 @@
 const { loadScript, fakeRequest } = require("./helpers");
 
-const loadAdmin = () => require("../../assets/js/fqj-admin.js");
+const loadAdmin = () => require("../../assets/js/rfsd-admin.js");
 
 function renderMetaBox(type, data) {
   const types = ["urls", "posts", "post_types", "tax_terms", "global", "other"];
   document.body.replaceChildren();
 
   const select = document.createElement("select");
-  select.id = "fqj_assoc_type";
+  select.id = "rfsd_assoc_type";
   types.forEach((t) => select.append(new Option(t, t, false, t === type)));
 
   const hidden = document.createElement("input");
   hidden.type = "hidden";
-  hidden.id = "fqj_assoc_data";
+  hidden.id = "rfsd_assoc_data";
   hidden.value = typeof data === "string" ? data : JSON.stringify(data || {});
 
   const container = document.createElement("div");
-  container.id = "fqj_assoc_container";
+  container.id = "rfsd_assoc_container";
 
   document.body.append(select, hidden, container);
 }
@@ -24,7 +24,7 @@ function renderMetaBox(type, data) {
 /** Load the script with select2 and $.get stubbed. */
 async function boot(type, data, getResponse) {
   renderMetaBox(type, data);
-  window.fqjAdmin = {
+  window.rfsdAdmin = {
     ajax_url: "/wp-admin/admin-ajax.php",
     nonce: "abc123",
     post_id: 42,
@@ -42,27 +42,27 @@ async function boot(type, data, getResponse) {
   return { $, select2, get };
 }
 
-const container = () => document.getElementById("fqj_assoc_container");
+const container = () => document.getElementById("rfsd_assoc_container");
 
 afterEach(() => {
   delete window.jQuery;
   delete window.$;
-  delete window.fqjAdmin;
+  delete window.rfsdAdmin;
 });
 
 describe("URL associations", () => {
   test("renders saved URLs one per line", async () => {
     await boot("urls", { urls: ["https://a.test/", "https://b.test/x"] });
 
-    const textarea = document.getElementById("fqj_assoc_urls");
+    const textarea = document.getElementById("rfsd_assoc_urls");
     expect(textarea).not.toBeNull();
-    expect(textarea.name).toBe("fqj_assoc_urls");
+    expect(textarea.name).toBe("rfsd_assoc_urls");
     expect(textarea.value).toBe("https://a.test/\nhttps://b.test/x");
   });
 
   test("renders an empty textarea without saved data", async () => {
     await boot("urls", {});
-    expect(document.getElementById("fqj_assoc_urls").value).toBe("");
+    expect(document.getElementById("rfsd_assoc_urls").value).toBe("");
   });
 });
 
@@ -76,7 +76,7 @@ describe("post associations", () => {
     expect(opts.ajax.url).toBe("/wp-admin/admin-ajax.php");
     expect(opts.ajax.data({ term: "ship" })).toEqual({
       q: "ship",
-      action: "fqj_search_posts",
+      action: "rfsd_search_posts",
       nonce: "abc123",
     });
     const results = [{ id: 1, text: "One" }];
@@ -85,8 +85,8 @@ describe("post associations", () => {
     expect(opts.templateResult({ text: "Searching…" })).toBe("Searching…");
     expect(opts.templateSelection({ id: 1, text: "One" })).toBe("One");
 
-    const select = document.getElementById("fqj_assoc_posts_select");
-    expect(select.name).toBe("fqj_assoc_posts_select[]");
+    const select = document.getElementById("rfsd_assoc_posts_select");
+    expect(select.name).toBe("rfsd_assoc_posts_select[]");
     expect(select.multiple).toBe(true);
   });
 
@@ -99,7 +99,7 @@ describe("post associations", () => {
     });
 
     const options = Array.from(
-      document.querySelectorAll("#fqj_assoc_posts_select option")
+      document.querySelectorAll("#rfsd_assoc_posts_select option")
     );
     expect(options.map((o) => [o.value, o.text, o.selected])).toEqual([
       ["5", "Five – http://x/five/", true],
@@ -117,13 +117,13 @@ describe("post type associations", () => {
 
     expect(get).toHaveBeenCalledWith(
       "/wp-admin/admin-ajax.php",
-      { action: "fqj_get_post_types", nonce: "abc123" },
+      { action: "rfsd_get_post_types", nonce: "abc123" },
       expect.any(Function),
       "json"
     );
 
     const boxes = Array.from(
-      document.querySelectorAll('input[name="fqj_assoc_post_types[]"]')
+      document.querySelectorAll('input[name="rfsd_assoc_post_types[]"]')
     );
     expect(boxes.map((b) => [b.value, b.checked])).toEqual([
       ["post", false],
@@ -135,13 +135,13 @@ describe("post type associations", () => {
   test("renders no checkboxes for an empty response", async () => {
     await boot("post_types", {}, []);
     expect(
-      document.querySelectorAll('input[name="fqj_assoc_post_types[]"]')
+      document.querySelectorAll('input[name="rfsd_assoc_post_types[]"]')
     ).toHaveLength(0);
   });
 
   test("tolerates a null response", async () => {
     await boot("post_types", {}, null);
-    expect(document.getElementById("fqj_post_types_wrap").children).toHaveLength(0);
+    expect(document.getElementById("rfsd_post_types_wrap").children).toHaveLength(0);
   });
 });
 
@@ -154,14 +154,14 @@ describe("taxonomy term associations", () => {
     const opts = select2.mock.calls[0][0];
     expect(opts.ajax.data({ term: "ne" })).toEqual({
       q: "ne",
-      action: "fqj_search_terms",
+      action: "rfsd_search_terms",
       nonce: "abc123",
     });
     expect(opts.ajax.processResults([])).toEqual({ results: [] });
     expect(opts.templateResult({ text: "T" })).toBe("T");
     expect(opts.templateSelection({ text: "T" })).toBe("T");
 
-    const option = document.querySelector("#fqj_assoc_terms_select option");
+    const option = document.querySelector("#rfsd_assoc_terms_select option");
     expect([option.value, option.text, option.selected]).toEqual([
       "3",
       "News (category)",
@@ -173,7 +173,7 @@ describe("taxonomy term associations", () => {
 describe("global association", () => {
   test("renders a hidden flag", async () => {
     await boot("global", {});
-    const flag = document.querySelector('input[name="fqj_assoc_global"]');
+    const flag = document.querySelector('input[name="rfsd_assoc_global"]');
     expect(flag.type).toBe("hidden");
     expect(flag.value).toBe("1");
   });
@@ -182,7 +182,7 @@ describe("global association", () => {
 describe("initial data and switching", () => {
   test("falls back to empty data on invalid JSON", async () => {
     await boot("urls", "{not json");
-    expect(document.getElementById("fqj_assoc_urls").value).toBe("");
+    expect(document.getElementById("rfsd_assoc_urls").value).toBe("");
   });
 
   test("renders nothing for an unknown type", async () => {
@@ -193,13 +193,13 @@ describe("initial data and switching", () => {
   test("changing the type renders the new type and restores the old one", async () => {
     const { $, select2 } = await boot("urls", { urls: ["https://a.test/"] });
 
-    $("#fqj_assoc_type").val("posts").trigger("change");
-    expect(document.getElementById("fqj_assoc_urls")).toBeNull();
-    expect(document.getElementById("fqj_assoc_posts_select")).not.toBeNull();
+    $("#rfsd_assoc_type").val("posts").trigger("change");
+    expect(document.getElementById("rfsd_assoc_urls")).toBeNull();
+    expect(document.getElementById("rfsd_assoc_posts_select")).not.toBeNull();
     expect(select2).toHaveBeenCalledTimes(1);
 
-    $("#fqj_assoc_type").val("urls").trigger("change");
-    expect(document.getElementById("fqj_assoc_urls").value).toBe("https://a.test/");
+    $("#rfsd_assoc_type").val("urls").trigger("change");
+    expect(document.getElementById("rfsd_assoc_urls").value).toBe("https://a.test/");
     expect(container().querySelectorAll("textarea")).toHaveLength(1);
   });
 
@@ -207,19 +207,19 @@ describe("initial data and switching", () => {
     const { $ } = await boot("urls", { urls: ["https://a.test/"] });
 
     // Edit the initial type, then switch away and back.
-    $("#fqj_assoc_urls").val("https://a.test/\nhttps://edited.test/");
-    $("#fqj_assoc_type").val("posts").trigger("change");
+    $("#rfsd_assoc_urls").val("https://a.test/\nhttps://edited.test/");
+    $("#rfsd_assoc_type").val("posts").trigger("change");
 
     // Start a selection on the new type.
-    $("#fqj_assoc_posts_select").append(new Option("Five", "5", true, true));
-    $("#fqj_assoc_type").val("urls").trigger("change");
-    expect(document.getElementById("fqj_assoc_urls").value).toBe(
+    $("#rfsd_assoc_posts_select").append(new Option("Five", "5", true, true));
+    $("#rfsd_assoc_type").val("urls").trigger("change");
+    expect(document.getElementById("rfsd_assoc_urls").value).toBe(
       "https://a.test/\nhttps://edited.test/"
     );
 
-    $("#fqj_assoc_type").val("posts").trigger("change");
+    $("#rfsd_assoc_type").val("posts").trigger("change");
     const options = Array.from(
-      document.querySelectorAll("#fqj_assoc_posts_select option")
+      document.querySelectorAll("#rfsd_assoc_posts_select option")
     );
     expect(options.map((o) => [o.value, o.text, o.selected])).toEqual([
       ["5", "Five", true],
@@ -228,13 +228,13 @@ describe("initial data and switching", () => {
 
   test("the saved data only belongs to the initially selected type", async () => {
     const { $ } = await boot("urls", { urls: ["https://a.test/"] });
-    $("#fqj_assoc_type").val("tax_terms").trigger("change");
-    expect(document.querySelectorAll("#fqj_assoc_terms_select option")).toHaveLength(0);
+    $("#rfsd_assoc_type").val("tax_terms").trigger("change");
+    expect(document.querySelectorAll("#rfsd_assoc_terms_select option")).toHaveLength(0);
   });
 
   test("keeps saved post types while their request is pending and ignores stale responses", async () => {
     renderMetaBox("post_types", { post_types: ["page"] });
-    window.fqjAdmin = { ajax_url: "/wp-admin/admin-ajax.php", nonce: "abc123" };
+    window.rfsdAdmin = { ajax_url: "/wp-admin/admin-ajax.php", nonce: "abc123" };
     const pending = [];
     const get = jest.fn((url, data, success) => {
       pending.push(success);
@@ -256,13 +256,13 @@ describe("initial data and switching", () => {
     ];
 
     // Switch away and back before the first request answers.
-    $("#fqj_assoc_type").val("global").trigger("change");
-    $("#fqj_assoc_type").val("post_types").trigger("change");
+    $("#rfsd_assoc_type").val("global").trigger("change");
+    $("#rfsd_assoc_type").val("post_types").trigger("change");
     pending[0](types);
     pending[1](types);
 
     const boxes = Array.from(
-      document.querySelectorAll('input[name="fqj_assoc_post_types[]"]')
+      document.querySelectorAll('input[name="rfsd_assoc_post_types[]"]')
     );
     expect(boxes.map((b) => [b.value, b.checked])).toEqual([
       ["post", false],
@@ -276,10 +276,10 @@ describe("initial data and switching", () => {
       { name: "page", label: "Page" },
     ]);
     $('input[value="post"]').prop("checked", true);
-    $("#fqj_assoc_type").val("global").trigger("change");
-    $("#fqj_assoc_type").val("post_types").trigger("change");
+    $("#rfsd_assoc_type").val("global").trigger("change");
+    $("#rfsd_assoc_type").val("post_types").trigger("change");
     const boxes = Array.from(
-      document.querySelectorAll('input[name="fqj_assoc_post_types[]"]')
+      document.querySelectorAll('input[name="rfsd_assoc_post_types[]"]')
     );
     expect(boxes.map((b) => [b.value, b.checked])).toEqual([
       ["post", true],
@@ -289,7 +289,7 @@ describe("initial data and switching", () => {
 
   test("uses localized strings when provided", async () => {
     renderMetaBox("global", {});
-    window.fqjAdmin = {
+    window.rfsdAdmin = {
       ajax_url: "/x",
       nonce: "n",
       i18n: { globalHelp: "Sitewide FAQ" },
diff --git a/tests/js/fqj-health.test.js b/tests/js/rfsd-health.test.js
similarity index 68%
rename from tests/js/fqj-health.test.js
rename to tests/js/rfsd-health.test.js
index 1c526d9..6c999c2 100644
--- a/tests/js/fqj-health.test.js
+++ b/tests/js/rfsd-health.test.js
@@ -1,24 +1,24 @@
 const { loadScript, fakeRequest } = require("./helpers");
 
-const loadHealth = () => require("../../assets/js/fqj-health.js");
+const loadHealth = () => require("../../assets/js/rfsd-health.js");
 
 // 2023-11-14 22:13:20 UTC, in seconds like the PHP side sends.
 const LAST_RUN = Date.UTC(2023, 10, 14, 22, 13, 20) / 1000;
 
 function renderPage() {
   document.body.innerHTML = `
-    <strong id="fqj-queue-count">7</strong>
-    <strong id="fqj-last-run">Never</strong>
-    <button id="fqj-process-now">Process</button>
-    <button id="fqj-purge-transients">Purge</button>
-    <button id="fqj-clear-log">Clear</button>
-    <span id="fqj-action-status"></span>`;
+    <strong id="rfsd-queue-count">7</strong>
+    <strong id="rfsd-last-run">Never</strong>
+    <button id="rfsd-process-now">Process</button>
+    <button id="rfsd-purge-transients">Purge</button>
+    <button id="rfsd-clear-log">Clear</button>
+    <span id="rfsd-action-status"></span>`;
 }
 
 /** Load the script with $.post answering per the given options. */
 async function boot(requestOptions) {
   renderPage();
-  window.fqjHealth = { ajax_url: "/wp-admin/admin-ajax.php", nonce: "n0nce" };
+  window.rfsdHealth = { ajax_url: "/wp-admin/admin-ajax.php", nonce: "n0nce" };
   const post = fakeRequest(requestOptions);
   const $ = await loadScript(loadHealth, (jq) => {
     jq.post = post;
@@ -41,7 +41,7 @@ beforeEach(() => {
 afterEach(() => {
   delete window.jQuery;
   delete window.$;
-  delete window.fqjHealth;
+  delete window.rfsdHealth;
   jest.restoreAllMocks();
 });
 
@@ -59,17 +59,17 @@ describe("process queue now", () => {
       },
     });
 
-    const event = click("fqj-process-now");
+    const event = click("rfsd-process-now");
 
     expect(event.defaultPrevented).toBe(true);
     expect(post).toHaveBeenCalledWith(
       "/wp-admin/admin-ajax.php",
-      { action: "fqj_process_queue_now", nonce: "n0nce" },
+      { action: "rfsd_process_queue_now", nonce: "n0nce" },
       expect.any(Function)
     );
-    expect(text("fqj-queue-count")).toBe("2");
-    expect(text("fqj-last-run")).toBe("2023-11-14 22:13:20 (1 min ago)");
-    expect(text("fqj-action-status")).toBe("Processed 5 items.");
+    expect(text("rfsd-queue-count")).toBe("2");
+    expect(text("rfsd-last-run")).toBe("2023-11-14 22:13:20 (1 min ago)");
+    expect(text("rfsd-action-status")).toBe("Processed 5 items.");
   });
 
   test("shows n/a when there is no last run", async () => {
@@ -79,23 +79,23 @@ describe("process queue now", () => {
         data: { processed: 0, queue_len: 0, last_run: 0, last_run_human: "" },
       },
     });
-    click("fqj-process-now");
-    expect(text("fqj-last-run")).toBe("n/a");
+    click("rfsd-process-now");
+    expect(text("rfsd-last-run")).toBe("n/a");
   });
 
   test("shows the server error message", async () => {
     await boot({
       response: { success: false, data: { message: "Permission denied" } },
     });
-    click("fqj-process-now");
-    expect(text("fqj-action-status")).toBe("Error: Permission denied");
-    expect(text("fqj-queue-count")).toBe("7");
+    click("rfsd-process-now");
+    expect(text("rfsd-action-status")).toBe("Error: Permission denied");
+    expect(text("rfsd-queue-count")).toBe("7");
   });
 
   test("shows unknown error when no message is given", async () => {
     await boot({ response: { success: false } });
-    click("fqj-process-now");
-    expect(text("fqj-action-status")).toBe("Error: unknown");
+    click("rfsd-process-now");
+    expect(text("rfsd-action-status")).toBe("Error: unknown");
   });
 
   test("reports a failed request", async () => {
@@ -104,9 +104,9 @@ describe("process queue now", () => {
       .mockImplementation(() => {});
     await boot({ fail: true, xhr: { status: 403 } });
 
-    click("fqj-process-now");
+    click("rfsd-process-now");
 
-    expect(text("fqj-action-status")).toBe("Request failed. See console.");
+    expect(text("rfsd-action-status")).toBe("Request failed. See console.");
     expect(consoleError).toHaveBeenCalledWith({ status: 403 });
   });
 });
@@ -114,15 +114,15 @@ describe("process queue now", () => {
 describe.each([
   [
     "purge transients",
-    "fqj-purge-transients",
-    "fqj_purge_transients",
+    "rfsd-purge-transients",
+    "rfsd_purge_transients",
     "Purged transients.",
     "Error purging.",
   ],
   [
     "clear log",
-    "fqj-clear-log",
-    "fqj_clear_invalidation_log",
+    "rfsd-clear-log",
+    "rfsd_clear_invalidation_log",
     "Cleared log. Reload to refresh the table.",
     "Error clearing log.",
   ],
@@ -136,7 +136,7 @@ describe.each([
     expect(event.defaultPrevented).toBe(true);
     expect(window.confirm).toHaveBeenCalledTimes(1);
     expect(post).not.toHaveBeenCalled();
-    expect(text("fqj-action-status")).toBe("");
+    expect(text("rfsd-action-status")).toBe("");
   });
 
   test("posts the action after confirmation", async () => {
@@ -148,26 +148,26 @@ describe.each([
       { action, nonce: "n0nce" },
       expect.any(Function)
     );
-    expect(text("fqj-action-status")).toBe(okText);
+    expect(text("rfsd-action-status")).toBe(okText);
   });
 
   test("shows an error response", async () => {
     await boot({ response: { success: false } });
     click(button);
-    expect(text("fqj-action-status")).toBe(errorText);
+    expect(text("rfsd-action-status")).toBe(errorText);
   });
 
   test("reports a failed request", async () => {
     await boot({ fail: true });
     click(button);
-    expect(text("fqj-action-status")).toBe("Request failed.");
+    expect(text("rfsd-action-status")).toBe("Request failed.");
   });
 });
 
 describe("localized strings", () => {
-  test("uses fqjHealth.i18n when provided", async () => {
+  test("uses rfsdHealth.i18n when provided", async () => {
     renderPage();
-    window.fqjHealth = {
+    window.rfsdHealth = {
       ajax_url: "/x",
       nonce: "n",
       i18n: { processing: "Traitement…", processed: "%d éléments traités." },
@@ -181,7 +181,7 @@ describe("localized strings", () => {
     await loadScript(loadHealth, (jq) => {
       jq.post = post;
     });
-    click("fqj-process-now");
-    expect(text("fqj-action-status")).toBe("3 éléments traités.");
+    click("rfsd-process-now");
+    expect(text("rfsd-action-status")).toBe("3 éléments traités.");
   });
 });
diff --git a/tests/php/bootstrap.php b/tests/php/bootstrap.php
index 1f4c691..4d1a872 100644
--- a/tests/php/bootstrap.php
+++ b/tests/php/bootstrap.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit bootstrap: loads the WordPress test suite with the plugin active.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 // phpcs:disable WordPress.Files.FileName, Generic.Files.OneObjectStructurePerFile, PSR1.Files.SideEffects
@@ -31,7 +31,7 @@
 tests_add_filter(
 	'muplugins_loaded',
 	function () use ( $root ) {
-		require $root . '/faq-jsonld.php';
+		require $root . '/renderbit-faq-structured-data.php';
 	}
 );
 
@@ -40,12 +40,12 @@ function () use ( $root ) {
 tests_add_filter(
 	'init',
 	function () {
-		fqj_activate();
+		rfsd_activate();
 	},
 	0
 );
 
 require $tests_dir . '/includes/bootstrap.php';
 
-require_once __DIR__ . '/class-fqj-testcase.php';
-require_once __DIR__ . '/class-fqj-multisite-testcase.php';
+require_once __DIR__ . '/class-rfsd-testcase.php';
+require_once __DIR__ . '/class-rfsd-multisite-testcase.php';
diff --git a/tests/php/class-fqj-multisite-testcase.php b/tests/php/class-rfsd-multisite-testcase.php
similarity index 84%
rename from tests/php/class-fqj-multisite-testcase.php
rename to tests/php/class-rfsd-multisite-testcase.php
index a0acc60..7c171f8 100644
--- a/tests/php/class-fqj-multisite-testcase.php
+++ b/tests/php/class-rfsd-multisite-testcase.php
@@ -2,7 +2,7 @@
 /**
  * Shared helpers for multisite tests.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 // phpcs:disable WordPress.Files.FileName
@@ -10,7 +10,7 @@
 /**
  * Base test case for tests that need a multisite network.
  */
-abstract class FQJ_Multisite_TestCase extends FQJ_TestCase {
+abstract class RFSD_Multisite_TestCase extends RFSD_TestCase {
 
 	/**
 	 * Skip on single-site and keep activation inside the test transaction.
@@ -32,7 +32,7 @@ public function set_up() {
 	 * @return string
 	 */
 	public function skip_noop_alters( $query ) {
-		if ( preg_match( '/^\s*ALTER TABLE \S*fqj_(mappings|queue) CHANGE COLUMN /', $query ) ) {
+		if ( preg_match( '/^\s*ALTER TABLE \S*rfsd_(mappings|queue) CHANGE COLUMN /', $query ) ) {
 			return '';
 		}
 
@@ -43,7 +43,7 @@ public function skip_noop_alters( $query ) {
 	 * Mark the plugin as network-active.
 	 */
 	protected function network_activate_plugin() {
-		update_site_option( 'active_sitewide_plugins', array( plugin_basename( FQJ_PLUGIN_DIR . 'faq-jsonld.php' ) => time() ) );
+		update_site_option( 'active_sitewide_plugins', array( plugin_basename( RFSD_PLUGIN_DIR . 'renderbit-faq-structured-data.php' ) => time() ) );
 	}
 
 	/**
@@ -72,6 +72,6 @@ protected function plugin_tables( $site_id ) {
 		global $wpdb;
 		$prefix = $wpdb->get_blog_prefix( $site_id );
 
-		return array( $prefix . 'fqj_mappings', $prefix . 'fqj_queue' );
+		return array( $prefix . 'rfsd_mappings', $prefix . 'rfsd_queue' );
 	}
 }
diff --git a/tests/php/class-fqj-testcase.php b/tests/php/class-rfsd-testcase.php
similarity index 87%
rename from tests/php/class-fqj-testcase.php
rename to tests/php/class-rfsd-testcase.php
index 8d6aee9..7a8fc89 100644
--- a/tests/php/class-fqj-testcase.php
+++ b/tests/php/class-rfsd-testcase.php
@@ -2,7 +2,7 @@
 /**
  * Shared helpers for plugin tests.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 // phpcs:disable WordPress.Files.FileName
@@ -10,7 +10,7 @@
 /**
  * Base test case.
  */
-abstract class FQJ_TestCase extends WP_UnitTestCase {
+abstract class RFSD_TestCase extends WP_UnitTestCase {
 
 	/**
 	 * Use pretty permalinks so URL mappings resolve to distinct paths.
@@ -41,15 +41,15 @@ public function tear_down() {
 	protected function create_faq( $question = 'What is it?', $answer = 'It is a thing.', $payload = null ) {
 		$faq_id = self::factory()->post->create(
 			array(
-				'post_type'    => 'fqj_faq',
+				'post_type'    => 'rfsd_faq',
 				'post_status'  => 'publish',
 				'post_title'   => $question,
 				'post_content' => $answer,
 			)
 		);
 		if ( null !== $payload ) {
-			update_post_meta( $faq_id, 'fqj_assoc_data_json', wp_json_encode( $payload ) );
-			fqj_rebuild_index_for_faq( $faq_id );
+			update_post_meta( $faq_id, 'rfsd_assoc_data_json', wp_json_encode( $payload ) );
+			rfsd_rebuild_index_for_faq( $faq_id );
 		}
 
 		return $faq_id;
@@ -63,7 +63,7 @@ protected function create_faq( $question = 'What is it?', $answer = 'It is a thi
 	 */
 	protected function get_mappings( $faq_id ) {
 		global $wpdb;
-		$table = fqj_table_name();
+		$table = rfsd_table_name();
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery, WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 		return $wpdb->get_results( $wpdb->prepare( "SELECT mapping_type, mapping_value FROM {$table} WHERE faq_id = %d ORDER BY id", $faq_id ), ARRAY_A );
 	}
@@ -75,7 +75,7 @@ protected function get_mappings( $faq_id ) {
 	 */
 	protected function get_queue() {
 		global $wpdb;
-		$table = fqj_queue_table_name();
+		$table = rfsd_queue_table_name();
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery, WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 		return array_map( 'intval', $wpdb->get_col( "SELECT item_value FROM {$table} WHERE item_type = 'post' ORDER BY id" ) );
 	}
@@ -87,7 +87,7 @@ protected function get_queue() {
 	 */
 	protected function get_queue_jobs() {
 		global $wpdb;
-		$table = fqj_queue_table_name();
+		$table = rfsd_queue_table_name();
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery, WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 		return $wpdb->get_results( "SELECT item_type, item_value, job_cursor FROM {$table} WHERE item_type <> 'post' ORDER BY id", ARRAY_A );
 	}
@@ -101,7 +101,7 @@ protected function get_queue_jobs() {
 	protected function render_head_for( $post_id ) {
 		$this->go_to( get_permalink( $post_id ) );
 		ob_start();
-		fqj_maybe_print_faq_jsonld();
+		rfsd_maybe_print_faq_jsonld();
 
 		return ob_get_clean();
 	}
diff --git a/tests/php/stubs/class-wp-cli.php b/tests/php/stubs/class-wp-cli.php
index 8012867..cc61496 100644
--- a/tests/php/stubs/class-wp-cli.php
+++ b/tests/php/stubs/class-wp-cli.php
@@ -2,7 +2,7 @@
 /**
  * Minimal WP_CLI stand-in that records calls instead of printing them.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 // phpcs:disable WordPress.Files.FileName, Generic.Files.OneObjectStructurePerFile
diff --git a/tests/php/test-admin.php b/tests/php/test-admin.php
index 60a15ed..c6f6f7f 100644
--- a/tests/php/test-admin.php
+++ b/tests/php/test-admin.php
@@ -2,13 +2,13 @@
 /**
  * Meta box, save handler and admin assets.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Admin tests.
  */
-class Test_FQJ_Admin extends FQJ_TestCase {
+class Test_RFSD_Admin extends RFSD_TestCase {
 
 	/**
 	 * Admin user ID.
@@ -24,9 +24,9 @@ public function set_up() {
 	}
 
 	public function tear_down() {
-		wp_dequeue_script( 'fqj-admin-js' );
-		wp_dequeue_script( 'fqj-select2-js' );
-		wp_dequeue_style( 'fqj-select2-css' );
+		wp_dequeue_script( 'rfsd-admin-js' );
+		wp_dequeue_script( 'rfsd-select2-js' );
+		wp_dequeue_style( 'rfsd-select2-css' );
 		parent::tear_down();
 	}
 
@@ -38,10 +38,10 @@ public function tear_down() {
 	 */
 	protected function submit( $faq_id, $fields ) {
 		$_POST = array_merge(
-			array( 'fqj_meta_nonce' => wp_create_nonce( 'fqj_save_meta' ) ),
+			array( 'rfsd_meta_nonce' => wp_create_nonce( 'rfsd_save_meta' ) ),
 			$fields
 		);
-		fqj_save_meta_handler( $faq_id, get_post( $faq_id ) );
+		rfsd_save_meta_handler( $faq_id, get_post( $faq_id ) );
 	}
 
 	/**
@@ -51,13 +51,13 @@ protected function submit( $faq_id, $fields ) {
 	 * @return array
 	 */
 	protected function payload( $faq_id ) {
-		return json_decode( get_post_meta( $faq_id, 'fqj_assoc_data_json', true ), true );
+		return json_decode( get_post_meta( $faq_id, 'rfsd_assoc_data_json', true ), true );
 	}
 
 	public function test_meta_box_is_registered_for_faqs() {
 		global $wp_meta_boxes;
-		fqj_add_meta_boxes();
-		$this->assertArrayHasKey( 'fqj_assoc_rules', $wp_meta_boxes['fqj_faq']['normal']['default'] );
+		rfsd_add_meta_boxes();
+		$this->assertArrayHasKey( 'rfsd_assoc_rules', $wp_meta_boxes['rfsd_faq']['normal']['default'] );
 	}
 
 	public function test_save_urls() {
@@ -65,12 +65,12 @@ public function test_save_urls() {
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type' => 'urls',
-				'fqj_assoc_urls' => "https://example.org/a/\r\n\r\n  https://example.org/b  \nhttps://example.org/a/\njavascript:alert(1)",
+				'rfsd_assoc_type' => 'urls',
+				'rfsd_assoc_urls' => "https://example.org/a/\r\n\r\n  https://example.org/b  \nhttps://example.org/a/\njavascript:alert(1)",
 			)
 		);
 
-		$this->assertSame( 'urls', get_post_meta( $faq, 'fqj_assoc_type', true ) );
+		$this->assertSame( 'urls', get_post_meta( $faq, 'rfsd_assoc_type', true ) );
 		$urls = $this->payload( $faq )['urls'];
 		$this->assertSame( array( 'https://example.org/a/', 'https://example.org/b' ), array_slice( $urls, 0, 2 ), 'Trimmed, blank lines skipped, deduped.' );
 		$this->assertSame( array( 'https://example.org/a/', 'https://example.org/b' ), $urls, 'Rejected URLs are dropped, not stored as empty strings.' );
@@ -86,20 +86,20 @@ public function test_rejected_urls_show_admin_notice_once() {
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type' => 'urls',
-				'fqj_assoc_urls' => "https://example.org/a\njavascript:alert(1)",
+				'rfsd_assoc_type' => 'urls',
+				'rfsd_assoc_urls' => "https://example.org/a\njavascript:alert(1)",
 			)
 		);
 
 		$_GET['post'] = $faq;
 		ob_start();
-		fqj_rejected_urls_notice();
+		rfsd_rejected_urls_notice();
 		$html = ob_get_clean();
 		$this->assertStringContainsString( 'javascript:alert(1)', $html );
 		$this->assertStringNotContainsString( 'example.org/a', $html );
 
 		ob_start();
-		fqj_rejected_urls_notice();
+		rfsd_rejected_urls_notice();
 		$this->assertSame( '', ob_get_clean(), 'Notice shows once.' );
 		unset( $_GET['post'] );
 	}
@@ -110,8 +110,8 @@ public function test_urls_matching_no_permalink_show_warning_with_suggestion() {
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type' => 'urls',
-				'fqj_assoc_urls' => implode( "\n", array( get_permalink( $post ), home_url( '/?p=' . $post ), 'https://external.example.net/x', home_url( '/missing/' ) ) ),
+				'rfsd_assoc_type' => 'urls',
+				'rfsd_assoc_urls' => implode( "\n", array( get_permalink( $post ), home_url( '/?p=' . $post ), 'https://external.example.net/x', home_url( '/missing/' ) ) ),
 			)
 		);
 
@@ -119,7 +119,7 @@ public function test_urls_matching_no_permalink_show_warning_with_suggestion() {
 
 		$_GET['post'] = $faq;
 		ob_start();
-		fqj_unmatched_urls_notice();
+		rfsd_unmatched_urls_notice();
 		$html = ob_get_clean();
 		unset( $_GET['post'] );
 
@@ -132,7 +132,7 @@ public function test_urls_matching_no_permalink_show_warning_with_suggestion() {
 
 		$_GET['post'] = $faq;
 		ob_start();
-		fqj_unmatched_urls_notice();
+		rfsd_unmatched_urls_notice();
 		$this->assertSame( '', ob_get_clean(), 'Notice shows once.' );
 		unset( $_GET['post'] );
 	}
@@ -143,21 +143,21 @@ public function test_urls_that_are_permalinks_show_no_warning() {
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type' => 'urls',
-				'fqj_assoc_urls' => 'https://example.org/missing',
+				'rfsd_assoc_type' => 'urls',
+				'rfsd_assoc_urls' => 'https://example.org/missing',
 			)
 		);
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type' => 'urls',
-				'fqj_assoc_urls' => get_permalink( $post ),
+				'rfsd_assoc_type' => 'urls',
+				'rfsd_assoc_urls' => get_permalink( $post ),
 			)
 		);
 
 		$_GET['post'] = $faq;
 		ob_start();
-		fqj_unmatched_urls_notice();
+		rfsd_unmatched_urls_notice();
 		$this->assertSame( '', ob_get_clean() );
 		unset( $_GET['post'] );
 	}
@@ -167,15 +167,15 @@ public function test_clean_save_clears_stale_rejected_url_notice() {
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type' => 'urls',
-				'fqj_assoc_urls' => 'javascript:alert(1)',
+				'rfsd_assoc_type' => 'urls',
+				'rfsd_assoc_urls' => 'javascript:alert(1)',
 			)
 		);
-		$this->submit( $faq, array( 'fqj_assoc_type' => 'global' ) );
+		$this->submit( $faq, array( 'rfsd_assoc_type' => 'global' ) );
 
 		$_GET['post'] = $faq;
 		ob_start();
-		fqj_rejected_urls_notice();
+		rfsd_rejected_urls_notice();
 		$this->assertSame( '', ob_get_clean() );
 		unset( $_GET['post'] );
 	}
@@ -186,8 +186,8 @@ public function test_save_posts() {
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type'         => 'posts',
-				'fqj_assoc_posts_select' => array( (string) $a, (string) $a, 'abc' ),
+				'rfsd_assoc_type'         => 'posts',
+				'rfsd_assoc_posts_select' => array( (string) $a, (string) $a, 'abc' ),
 			)
 		);
 
@@ -203,7 +203,7 @@ public function test_save_posts() {
 
 	public function test_save_posts_without_selection() {
 		$faq = $this->create_faq();
-		$this->submit( $faq, array( 'fqj_assoc_type' => 'posts' ) );
+		$this->submit( $faq, array( 'rfsd_assoc_type' => 'posts' ) );
 		$this->assertSame( array( 'posts' => array() ), $this->payload( $faq ) );
 	}
 
@@ -212,8 +212,8 @@ public function test_save_post_types() {
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type'       => 'post_types',
-				'fqj_assoc_post_types' => array( 'page', '<b>post</b>', 'page' ),
+				'rfsd_assoc_type'       => 'post_types',
+				'rfsd_assoc_post_types' => array( 'page', '<b>post</b>', 'page' ),
 			)
 		);
 		$this->assertSame( array( 'post_types' => array( 'page', 'post' ) ), $this->payload( $faq ) );
@@ -225,8 +225,8 @@ public function test_save_terms() {
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type'         => 'tax_terms',
-				'fqj_assoc_terms_select' => array( (string) $term ),
+				'rfsd_assoc_type'         => 'tax_terms',
+				'rfsd_assoc_terms_select' => array( (string) $term ),
 			)
 		);
 		$this->assertSame( array( 'terms' => array( $term ) ), $this->payload( $faq ) );
@@ -234,7 +234,7 @@ public function test_save_terms() {
 
 	public function test_save_global() {
 		$faq = $this->create_faq();
-		$this->submit( $faq, array( 'fqj_assoc_type' => 'global' ) );
+		$this->submit( $faq, array( 'rfsd_assoc_type' => 'global' ) );
 		$this->assertSame( array( 'global' => true ), $this->payload( $faq ) );
 		$this->assertSame(
 			array(
@@ -250,31 +250,31 @@ public function test_save_global() {
 	public function test_save_defaults_to_urls_type() {
 		$faq = $this->create_faq();
 		$this->submit( $faq, array() );
-		$this->assertSame( 'urls', get_post_meta( $faq, 'fqj_assoc_type', true ) );
+		$this->assertSame( 'urls', get_post_meta( $faq, 'rfsd_assoc_type', true ) );
 		$this->assertSame( array( 'urls' => array() ), $this->payload( $faq ) );
 	}
 
 	public function test_save_unknown_type_leaves_existing_data_untouched() {
-		$faq = $this->create_faq( 'Q', 'A', array( 'global' => true ) );
-		$before_meta     = get_post_meta( $faq, 'fqj_assoc_data_json', true );
+		$faq             = $this->create_faq( 'Q', 'A', array( 'global' => true ) );
+		$before_meta     = get_post_meta( $faq, 'rfsd_assoc_data_json', true );
 		$before_mappings = $this->get_mappings( $faq );
 		$this->assertNotEmpty( $before_mappings );
 
-		$this->submit( $faq, array( 'fqj_assoc_type' => 'bogus' ) );
+		$this->submit( $faq, array( 'rfsd_assoc_type' => 'bogus' ) );
 
-		$this->assertSame( $before_meta, get_post_meta( $faq, 'fqj_assoc_data_json', true ) );
+		$this->assertSame( $before_meta, get_post_meta( $faq, 'rfsd_assoc_data_json', true ) );
 		$this->assertSame( $before_mappings, $this->get_mappings( $faq ) );
 	}
 
 	public function test_save_switching_type_drops_old_mappings() {
 		$post = self::factory()->post->create();
 		$faq  = $this->create_faq();
-		$this->submit( $faq, array( 'fqj_assoc_type' => 'global' ) );
+		$this->submit( $faq, array( 'rfsd_assoc_type' => 'global' ) );
 		$this->submit(
 			$faq,
 			array(
-				'fqj_assoc_type'         => 'posts',
-				'fqj_assoc_posts_select' => array( $post ),
+				'rfsd_assoc_type'         => 'posts',
+				'rfsd_assoc_posts_select' => array( $post ),
 			)
 		);
 		$this->assertSame(
@@ -291,8 +291,8 @@ public function test_save_switching_type_drops_old_mappings() {
 	public function test_save_via_save_post_hook() {
 		$faq   = $this->create_faq();
 		$_POST = array(
-			'fqj_meta_nonce' => wp_create_nonce( 'fqj_save_meta' ),
-			'fqj_assoc_type' => 'global',
+			'rfsd_meta_nonce' => wp_create_nonce( 'rfsd_save_meta' ),
+			'rfsd_assoc_type' => 'global',
 		);
 		wp_update_post(
 			array(
@@ -300,37 +300,37 @@ public function test_save_via_save_post_hook() {
 				'post_title' => 'Updated',
 			)
 		);
-		$this->assertSame( 'global', get_post_meta( $faq, 'fqj_assoc_type', true ) );
+		$this->assertSame( 'global', get_post_meta( $faq, 'rfsd_assoc_type', true ) );
 	}
 
 	public function test_save_ignored_without_nonce() {
 		$faq   = $this->create_faq();
-		$_POST = array( 'fqj_assoc_type' => 'global' );
-		fqj_save_meta_handler( $faq, get_post( $faq ) );
-		$this->assertSame( '', get_post_meta( $faq, 'fqj_assoc_type', true ) );
+		$_POST = array( 'rfsd_assoc_type' => 'global' );
+		rfsd_save_meta_handler( $faq, get_post( $faq ) );
+		$this->assertSame( '', get_post_meta( $faq, 'rfsd_assoc_type', true ) );
 	}
 
 	public function test_save_ignored_with_bad_nonce() {
 		$faq   = $this->create_faq();
 		$_POST = array(
-			'fqj_meta_nonce' => 'nope',
-			'fqj_assoc_type' => 'global',
+			'rfsd_meta_nonce' => 'nope',
+			'rfsd_assoc_type' => 'global',
 		);
-		fqj_save_meta_handler( $faq, get_post( $faq ) );
-		$this->assertSame( '', get_post_meta( $faq, 'fqj_assoc_type', true ) );
+		rfsd_save_meta_handler( $faq, get_post( $faq ) );
+		$this->assertSame( '', get_post_meta( $faq, 'rfsd_assoc_type', true ) );
 	}
 
 	public function test_save_ignored_for_other_post_types() {
 		$post = self::factory()->post->create();
-		$this->submit( $post, array( 'fqj_assoc_type' => 'global' ) );
-		$this->assertSame( '', get_post_meta( $post, 'fqj_assoc_type', true ) );
+		$this->submit( $post, array( 'rfsd_assoc_type' => 'global' ) );
+		$this->assertSame( '', get_post_meta( $post, 'rfsd_assoc_type', true ) );
 	}
 
 	public function test_save_ignored_without_capability() {
 		$faq = $this->create_faq();
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
-		$this->submit( $faq, array( 'fqj_assoc_type' => 'global' ) );
-		$this->assertSame( '', get_post_meta( $faq, 'fqj_assoc_type', true ) );
+		$this->submit( $faq, array( 'rfsd_assoc_type' => 'global' ) );
+		$this->assertSame( '', get_post_meta( $faq, 'rfsd_assoc_type', true ) );
 		$this->assertSame( array(), $this->get_mappings( $faq ) );
 	}
 
@@ -342,19 +342,19 @@ public function test_save_ignored_without_capability() {
 	 */
 	protected function render_meta_box( $faq_id ) {
 		ob_start();
-		fqj_assoc_rules_meta_box_cb( get_post( $faq_id ) );
+		rfsd_assoc_rules_meta_box_cb( get_post( $faq_id ) );
 
 		return ob_get_clean();
 	}
 
 	/**
-	 * Decoded value of the hidden fqj_assoc_data field.
+	 * Decoded value of the hidden rfsd_assoc_data field.
 	 *
 	 * @param string $html Meta box markup.
 	 * @return mixed
 	 */
 	protected function hidden_data( $html ) {
-		preg_match( '/id="fqj_assoc_data" name="fqj_assoc_data" value="([^"]*)"/', $html, $m );
+		preg_match( '/id="rfsd_assoc_data" name="rfsd_assoc_data" value="([^"]*)"/', $html, $m );
 
 		return json_decode( html_entity_decode( $m[1], ENT_QUOTES ), true );
 	}
@@ -362,18 +362,18 @@ protected function hidden_data( $html ) {
 	public function test_meta_box_defaults() {
 		$html = $this->render_meta_box( $this->create_faq() );
 
-		$this->assertStringContainsString( 'name="fqj_meta_nonce"', $html );
+		$this->assertStringContainsString( 'name="rfsd_meta_nonce"', $html );
 		$this->assertMatchesRegularExpression( '/<option value="urls" selected=\'selected\'>/', $html );
 		foreach ( array( 'urls', 'posts', 'post_types', 'tax_terms', 'global' ) as $type ) {
 			$this->assertStringContainsString( 'value="' . $type . '"', $html );
 		}
 		$this->assertStringContainsString( 'value="{}"', $html );
-		$this->assertStringContainsString( 'id="fqj_assoc_container"', $html );
+		$this->assertStringContainsString( 'id="rfsd_assoc_container"', $html );
 	}
 
 	public function test_meta_box_selects_saved_type() {
 		$faq = $this->create_faq();
-		update_post_meta( $faq, 'fqj_assoc_type', 'global' );
+		update_post_meta( $faq, 'rfsd_assoc_type', 'global' );
 		$this->assertMatchesRegularExpression( '/<option value="global" selected=\'selected\'>/', $this->render_meta_box( $faq ) );
 	}
 
@@ -435,52 +435,52 @@ public function test_meta_box_passes_other_payloads_through() {
 
 	public function test_meta_box_handles_corrupt_json() {
 		$faq = $this->create_faq();
-		update_post_meta( $faq, 'fqj_assoc_data_json', 'not json' );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', 'not json' );
 		$this->assertStringContainsString( 'value="{}"', $this->render_meta_box( $faq ) );
 	}
 
 	public function test_admin_assets_load_on_faq_edit_screen() {
 		$GLOBALS['post'] = get_post( $this->create_faq() ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-		fqj_admin_assets( 'post.php' );
+		rfsd_admin_assets( 'post.php' );
 
-		$this->assertTrue( wp_script_is( 'fqj-admin-js', 'enqueued' ) );
-		$this->assertTrue( wp_script_is( 'fqj-select2-js', 'enqueued' ) );
-		$this->assertTrue( wp_style_is( 'fqj-select2-css', 'enqueued' ) );
+		$this->assertTrue( wp_script_is( 'rfsd-admin-js', 'enqueued' ) );
+		$this->assertTrue( wp_script_is( 'rfsd-select2-js', 'enqueued' ) );
+		$this->assertTrue( wp_style_is( 'rfsd-select2-css', 'enqueued' ) );
 
-		$this->assertStringStartsWith( FQJ_PLUGIN_URL, wp_scripts()->registered['fqj-select2-js']->src );
-		$this->assertStringStartsWith( FQJ_PLUGIN_URL, wp_styles()->registered['fqj-select2-css']->src );
-		$this->assertStringNotContainsString( 'cdnjs', wp_scripts()->registered['fqj-select2-js']->src );
+		$this->assertStringStartsWith( RFSD_PLUGIN_URL, wp_scripts()->registered['rfsd-select2-js']->src );
+		$this->assertStringStartsWith( RFSD_PLUGIN_URL, wp_styles()->registered['rfsd-select2-css']->src );
+		$this->assertStringNotContainsString( 'cdnjs', wp_scripts()->registered['rfsd-select2-js']->src );
 
-		$data = wp_scripts()->get_data( 'fqj-admin-js', 'data' );
-		$this->assertStringContainsString( 'var fqjAdmin', $data );
+		$data = wp_scripts()->get_data( 'rfsd-admin-js', 'data' );
+		$this->assertStringContainsString( 'var rfsdAdmin', $data );
 		$this->assertStringContainsString( 'admin-ajax.php', $data );
 	}
 
 	public function test_admin_assets_reuse_registered_select2() {
 		// Earlier tests leave these handles registered with the bundled copy as a dependency.
-		foreach ( array( 'fqj-admin-js', 'fqj-select2-js' ) as $handle ) {
+		foreach ( array( 'rfsd-admin-js', 'rfsd-select2-js' ) as $handle ) {
 			wp_dequeue_script( $handle );
 			wp_deregister_script( $handle );
 		}
 		wp_register_script( 'select2', 'https://example.org/select2.js', array( 'jquery' ), '4', true );
 		$GLOBALS['post'] = get_post( $this->create_faq() ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-		fqj_admin_assets( 'post.php' );
+		rfsd_admin_assets( 'post.php' );
 		wp_deregister_script( 'select2' );
 
-		$this->assertFalse( wp_script_is( 'fqj-select2-js', 'enqueued' ) );
-		$this->assertContains( 'select2', wp_scripts()->registered['fqj-admin-js']->deps );
+		$this->assertFalse( wp_script_is( 'rfsd-select2-js', 'enqueued' ) );
+		$this->assertContains( 'select2', wp_scripts()->registered['rfsd-admin-js']->deps );
 	}
 
 	/**
 	 * Reset the admin and Select2 handles left behind by earlier tests.
 	 */
 	private function reset_select2_handles() {
-		foreach ( array( 'fqj-admin-js', 'fqj-select2-js' ) as $handle ) {
+		foreach ( array( 'rfsd-admin-js', 'rfsd-select2-js' ) as $handle ) {
 			wp_dequeue_script( $handle );
 			wp_deregister_script( $handle );
 		}
-		wp_dequeue_style( 'fqj-select2-css' );
-		wp_deregister_style( 'fqj-select2-css' );
+		wp_dequeue_style( 'rfsd-select2-css' );
+		wp_deregister_style( 'rfsd-select2-css' );
 	}
 
 	public function test_admin_assets_use_select2_style_with_selectwoo_script() {
@@ -489,10 +489,10 @@ public function test_admin_assets_use_select2_style_with_selectwoo_script() {
 		wp_register_script( 'selectWoo', 'https://example.org/selectWoo.js', array( 'jquery' ), '1', true );
 		wp_register_style( 'select2', 'https://example.org/select2.css', array(), '4' );
 		$GLOBALS['post'] = get_post( $this->create_faq() ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-		fqj_admin_assets( 'post.php' );
+		rfsd_admin_assets( 'post.php' );
 
 		$this->assertTrue( wp_style_is( 'select2', 'enqueued' ) );
-		$this->assertFalse( wp_style_is( 'fqj-select2-css', 'enqueued' ) );
+		$this->assertFalse( wp_style_is( 'rfsd-select2-css', 'enqueued' ) );
 		wp_dequeue_style( 'select2' );
 		wp_deregister_style( 'select2' );
 		wp_dequeue_script( 'selectWoo' );
@@ -503,25 +503,25 @@ public function test_admin_assets_fall_back_to_bundled_css_for_reused_script() {
 		$this->reset_select2_handles();
 		wp_register_script( 'selectWoo', 'https://example.org/selectWoo.js', array( 'jquery' ), '1', true );
 		$GLOBALS['post'] = get_post( $this->create_faq() ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-		fqj_admin_assets( 'post.php' );
+		rfsd_admin_assets( 'post.php' );
 
-		$this->assertTrue( wp_style_is( 'fqj-select2-css', 'enqueued' ) );
-		$this->assertFalse( wp_script_is( 'fqj-select2-js', 'enqueued' ) );
+		$this->assertTrue( wp_style_is( 'rfsd-select2-css', 'enqueued' ) );
+		$this->assertFalse( wp_script_is( 'rfsd-select2-js', 'enqueued' ) );
 		wp_dequeue_script( 'selectWoo' );
 		wp_deregister_script( 'selectWoo' );
 	}
 
 	public function test_admin_assets_skip_other_screens_and_types() {
 		$GLOBALS['post'] = get_post( $this->create_faq() ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-		fqj_admin_assets( 'edit.php' );
-		$this->assertFalse( wp_script_is( 'fqj-admin-js', 'enqueued' ) );
+		rfsd_admin_assets( 'edit.php' );
+		$this->assertFalse( wp_script_is( 'rfsd-admin-js', 'enqueued' ) );
 
 		$GLOBALS['post'] = get_post( self::factory()->post->create() ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-		fqj_admin_assets( 'post-new.php' );
-		$this->assertFalse( wp_script_is( 'fqj-admin-js', 'enqueued' ) );
+		rfsd_admin_assets( 'post-new.php' );
+		$this->assertFalse( wp_script_is( 'rfsd-admin-js', 'enqueued' ) );
 
 		unset( $GLOBALS['post'] );
-		fqj_admin_assets( 'post.php' );
-		$this->assertFalse( wp_script_is( 'fqj-admin-js', 'enqueued' ) );
+		rfsd_admin_assets( 'post.php' );
+		$this->assertFalse( wp_script_is( 'rfsd-admin-js', 'enqueued' ) );
 	}
 }
diff --git a/tests/php/test-ajax.php b/tests/php/test-ajax.php
index 6c17698..f14f11b 100644
--- a/tests/php/test-ajax.php
+++ b/tests/php/test-ajax.php
@@ -2,13 +2,13 @@
 /**
  * AJAX endpoints for the meta box and Health page.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * AJAX tests.
  */
-class Test_FQJ_Ajax extends WP_Ajax_UnitTestCase {
+class Test_RFSD_Ajax extends WP_Ajax_UnitTestCase {
 
 	public function set_up() {
 		parent::set_up();
@@ -80,9 +80,9 @@ public function test_search_posts() {
 		);
 		self::factory()->post->create( array( 'post_title' => 'Unrelated' ) );
 
-		$this->nonce( 'fqj_admin_nonce' );
+		$this->nonce( 'rfsd_admin_nonce' );
 		$_GET['q'] = 'Shipping';
-		$results   = $this->call( 'fqj_search_posts' );
+		$results   = $this->call( 'rfsd_search_posts' );
 
 		$this->assertEqualSets( array( $match, $page ), wp_list_pluck( $results, 'id' ) );
 		$by_id = array_column( $results, 'text', 'id' );
@@ -90,30 +90,51 @@ public function test_search_posts() {
 	}
 
 	public function test_search_posts_includes_custom_public_post_types_only() {
-		register_post_type( 'fqj_book', array( 'public' => true ) );
-		register_post_type( 'fqj_secret', array( 'public' => false ) );
-		$book   = self::factory()->post->create( array( 'post_title' => 'Zebra book', 'post_type' => 'fqj_book' ) );
-		self::factory()->post->create( array( 'post_title' => 'Zebra secret', 'post_type' => 'fqj_secret' ) );
-		self::factory()->post->create( array( 'post_title' => 'Zebra faq', 'post_type' => 'fqj_faq' ) );
-		$attach = self::factory()->post->create( array( 'post_title' => 'Zebra file', 'post_type' => 'attachment', 'post_status' => 'inherit' ) );
-
-		$this->nonce( 'fqj_admin_nonce' );
+		register_post_type( 'rfsd_book', array( 'public' => true ) );
+		register_post_type( 'rfsd_secret', array( 'public' => false ) );
+		$book = self::factory()->post->create(
+			array(
+				'post_title' => 'Zebra book',
+				'post_type'  => 'rfsd_book',
+			)
+		);
+		self::factory()->post->create(
+			array(
+				'post_title' => 'Zebra secret',
+				'post_type'  => 'rfsd_secret',
+			)
+		);
+		self::factory()->post->create(
+			array(
+				'post_title' => 'Zebra faq',
+				'post_type'  => 'rfsd_faq',
+			)
+		);
+		$attach = self::factory()->post->create(
+			array(
+				'post_title'  => 'Zebra file',
+				'post_type'   => 'attachment',
+				'post_status' => 'inherit',
+			)
+		);
+
+		$this->nonce( 'rfsd_admin_nonce' );
 		$_GET['q'] = 'Zebra';
-		$ids       = wp_list_pluck( $this->call( 'fqj_search_posts' ), 'id' );
-		unregister_post_type( 'fqj_book' );
-		unregister_post_type( 'fqj_secret' );
+		$ids       = wp_list_pluck( $this->call( 'rfsd_search_posts' ), 'id' );
+		unregister_post_type( 'rfsd_book' );
+		unregister_post_type( 'rfsd_secret' );
 
 		$this->assertSame( array( $book ), $ids );
 		$this->assertNotContains( $attach, $ids );
 	}
 
 	public function test_search_posts_with_empty_query() {
-		$this->nonce( 'fqj_admin_nonce' );
-		$this->assertSame( array(), $this->call( 'fqj_search_posts' ) );
+		$this->nonce( 'rfsd_admin_nonce' );
+		$this->assertSame( array(), $this->call( 'rfsd_search_posts' ) );
 	}
 
 	public function test_search_posts_rejects_bad_nonce() {
-		$this->assert_rejects_bad_nonce( 'fqj_search_posts' );
+		$this->assert_rejects_bad_nonce( 'rfsd_search_posts' );
 	}
 
 	public function test_search_terms_across_public_taxonomies() {
@@ -121,9 +142,9 @@ public function test_search_terms_across_public_taxonomies() {
 		$tag = self::factory()->tag->create( array( 'name' => 'Returns policy' ) );
 		self::factory()->category->create( array( 'name' => 'Other' ) );
 
-		$this->nonce( 'fqj_admin_nonce' );
+		$this->nonce( 'rfsd_admin_nonce' );
 		$_GET['q'] = 'Return';
-		$results   = $this->call( 'fqj_search_terms' );
+		$results   = $this->call( 'rfsd_search_terms' );
 
 		$by_id = array_column( $results, 'text', 'id' );
 		$this->assertCount( 2, $by_id );
@@ -132,29 +153,29 @@ public function test_search_terms_across_public_taxonomies() {
 	}
 
 	public function test_search_terms_with_empty_query() {
-		$this->nonce( 'fqj_admin_nonce' );
-		$this->assertSame( array(), $this->call( 'fqj_search_terms' ) );
+		$this->nonce( 'rfsd_admin_nonce' );
+		$this->assertSame( array(), $this->call( 'rfsd_search_terms' ) );
 	}
 
 	public function test_search_terms_rejects_bad_nonce() {
-		$this->assert_rejects_bad_nonce( 'fqj_search_terms' );
+		$this->assert_rejects_bad_nonce( 'rfsd_search_terms' );
 	}
 
 	public function test_get_post_types_lists_public_types() {
-		$this->nonce( 'fqj_admin_nonce' );
-		$results = $this->call( 'fqj_get_post_types' );
+		$this->nonce( 'rfsd_admin_nonce' );
+		$results = $this->call( 'rfsd_get_post_types' );
 		$names   = wp_list_pluck( $results, 'name' );
 
 		$this->assertContains( 'post', $names );
 		$this->assertContains( 'page', $names );
-		$this->assertNotContains( 'fqj_faq', $names, 'FAQ items are not public.' );
+		$this->assertNotContains( 'rfsd_faq', $names, 'FAQ items are not public.' );
 
 		$by_name = array_column( $results, 'label', 'name' );
 		$this->assertSame( 'Page', $by_name['page'] );
 	}
 
 	public function test_get_post_types_rejects_bad_nonce() {
-		$this->assert_rejects_bad_nonce( 'fqj_get_post_types' );
+		$this->assert_rejects_bad_nonce( 'rfsd_get_post_types' );
 	}
 
 	/**
@@ -164,7 +185,7 @@ public function test_get_post_types_rejects_bad_nonce() {
 	 */
 	protected function assert_lookup_denied_to_subscriber( $action ) {
 		$this->_setRole( 'subscriber' );
-		$this->nonce( 'fqj_admin_nonce' );
+		$this->nonce( 'rfsd_admin_nonce' );
 		$_GET['q'] = 'a';
 
 		$resp = $this->call( $action );
@@ -174,49 +195,49 @@ protected function assert_lookup_denied_to_subscriber( $action ) {
 
 	public function test_search_posts_requires_edit_posts() {
 		self::factory()->post->create( array( 'post_title' => 'Alpha' ) );
-		$this->assert_lookup_denied_to_subscriber( 'fqj_search_posts' );
+		$this->assert_lookup_denied_to_subscriber( 'rfsd_search_posts' );
 	}
 
 	public function test_search_terms_requires_edit_posts() {
-		$this->assert_lookup_denied_to_subscriber( 'fqj_search_terms' );
+		$this->assert_lookup_denied_to_subscriber( 'rfsd_search_terms' );
 	}
 
 	public function test_get_post_types_requires_edit_posts() {
-		$this->assert_lookup_denied_to_subscriber( 'fqj_get_post_types' );
+		$this->assert_lookup_denied_to_subscriber( 'rfsd_get_post_types' );
 	}
 
 	public function test_search_posts_allows_editors() {
 		$id = self::factory()->post->create( array( 'post_title' => 'Alpha' ) );
 		$this->_setRole( 'editor' );
-		$this->nonce( 'fqj_admin_nonce' );
+		$this->nonce( 'rfsd_admin_nonce' );
 		$_GET['q'] = 'Alpha';
 
-		$this->assertSame( array( $id ), wp_list_pluck( $this->call( 'fqj_search_posts' ), 'id' ) );
+		$this->assertSame( array( $id ), wp_list_pluck( $this->call( 'rfsd_search_posts' ), 'id' ) );
 	}
 
 	public function test_search_terms_allows_editors() {
 		$cat = self::factory()->category->create( array( 'name' => 'Alpha' ) );
 		$this->_setRole( 'editor' );
-		$this->nonce( 'fqj_admin_nonce' );
+		$this->nonce( 'rfsd_admin_nonce' );
 		$_GET['q'] = 'Alpha';
 
-		$this->assertContains( $cat, wp_list_pluck( $this->call( 'fqj_search_terms' ), 'id' ) );
+		$this->assertContains( $cat, wp_list_pluck( $this->call( 'rfsd_search_terms' ), 'id' ) );
 	}
 
 	public function test_get_post_types_allows_editors() {
 		$this->_setRole( 'editor' );
-		$this->nonce( 'fqj_admin_nonce' );
+		$this->nonce( 'rfsd_admin_nonce' );
 
-		$this->assertContains( 'post', wp_list_pluck( $this->call( 'fqj_get_post_types' ), 'name' ) );
+		$this->assertContains( 'post', wp_list_pluck( $this->call( 'rfsd_get_post_types' ), 'name' ) );
 	}
 
 	public function test_process_queue_now() {
-		set_transient( fqj_cache_key( 11 ), 'x' );
-		fqj_queue_add_posts( array( 11, 12, 13 ) );
+		set_transient( rfsd_cache_key( 11 ), 'x' );
+		rfsd_queue_add_posts( array( 11, 12, 13 ) );
 
-		$this->nonce( 'fqj_health_nonce' );
+		$this->nonce( 'rfsd_health_nonce' );
 		$_POST['limit'] = '2';
-		$resp           = $this->call( 'fqj_process_queue_now' );
+		$resp           = $this->call( 'rfsd_process_queue_now' );
 
 		$this->assertTrue( $resp['success'] );
 		$this->assertSame( 2, $resp['data']['processed'] );
@@ -224,29 +245,29 @@ public function test_process_queue_now() {
 		$this->assertGreaterThan( 0, $resp['data']['last_run'] );
 		$this->assertSame( wp_date( 'Y-m-d H:i:s', $resp['data']['last_run'] ), substr( $resp['data']['last_run_human'], 0, 19 ) );
 		$this->assertStringEndsWith( ' ago)', $resp['data']['last_run_human'] );
-		$this->assertFalse( get_transient( fqj_cache_key( 11 ) ) );
+		$this->assertFalse( get_transient( rfsd_cache_key( 11 ) ) );
 	}
 
 	public function test_process_queue_now_requires_manage_options() {
 		$this->_setRole( 'editor' );
-		$this->nonce( 'fqj_health_nonce' );
-		fqj_queue_add_posts( array( 1 ) );
+		$this->nonce( 'rfsd_health_nonce' );
+		rfsd_queue_add_posts( array( 1 ) );
 
-		$resp = $this->call( 'fqj_process_queue_now' );
+		$resp = $this->call( 'rfsd_process_queue_now' );
 		$this->assertFalse( $resp['success'] );
 		$this->assertSame( 'Permission denied', $resp['data']['message'] );
-		$this->assertSame( 1, fqj_queue_length() );
+		$this->assertSame( 1, rfsd_queue_length() );
 	}
 
 	public function test_process_queue_now_rejects_bad_nonce() {
-		$this->assert_rejects_bad_nonce( 'fqj_process_queue_now' );
+		$this->assert_rejects_bad_nonce( 'rfsd_process_queue_now' );
 	}
 
 	public function test_purge_transients() {
-		$key = fqj_cache_key( 1 );
+		$key = rfsd_cache_key( 1 );
 		set_transient( $key, 'x' );
-		$this->nonce( 'fqj_health_nonce' );
-		$resp = $this->call( 'fqj_purge_transients' );
+		$this->nonce( 'rfsd_health_nonce' );
+		$resp = $this->call( 'rfsd_purge_transients' );
 
 		$this->assertTrue( $resp['success'] );
 		$this->assertFalse( get_transient( $key ) );
@@ -254,44 +275,44 @@ public function test_purge_transients() {
 
 	public function test_purge_transients_requires_manage_options() {
 		$this->_setRole( 'editor' );
-		set_transient( fqj_cache_key( 1 ), 'x' );
-		$this->nonce( 'fqj_health_nonce' );
+		set_transient( rfsd_cache_key( 1 ), 'x' );
+		$this->nonce( 'rfsd_health_nonce' );
 
-		$resp = $this->call( 'fqj_purge_transients' );
+		$resp = $this->call( 'rfsd_purge_transients' );
 		$this->assertFalse( $resp['success'] );
-		$this->assertSame( 'x', get_transient( fqj_cache_key( 1 ) ) );
+		$this->assertSame( 'x', get_transient( rfsd_cache_key( 1 ) ) );
 	}
 
 	public function test_purge_transients_rejects_bad_nonce() {
-		$this->assert_rejects_bad_nonce( 'fqj_purge_transients' );
+		$this->assert_rejects_bad_nonce( 'rfsd_purge_transients' );
 	}
 
 	public function test_clear_invalidation_log() {
-		fqj_log_invalidation_run( 1, array( 1 ) );
-		$this->nonce( 'fqj_health_nonce' );
-		$resp = $this->call( 'fqj_clear_invalidation_log' );
+		rfsd_log_invalidation_run( 1, array( 1 ) );
+		$this->nonce( 'rfsd_health_nonce' );
+		$resp = $this->call( 'rfsd_clear_invalidation_log' );
 
 		$this->assertTrue( $resp['success'] );
-		$this->assertSame( array(), get_option( 'fqj_invalidation_log' ) );
+		$this->assertSame( array(), get_option( 'rfsd_invalidation_log' ) );
 	}
 
 	public function test_clear_invalidation_log_requires_manage_options() {
 		$this->_setRole( 'editor' );
-		fqj_log_invalidation_run( 1, array( 1 ) );
-		$this->nonce( 'fqj_health_nonce' );
+		rfsd_log_invalidation_run( 1, array( 1 ) );
+		$this->nonce( 'rfsd_health_nonce' );
 
-		$resp = $this->call( 'fqj_clear_invalidation_log' );
+		$resp = $this->call( 'rfsd_clear_invalidation_log' );
 		$this->assertFalse( $resp['success'] );
-		$this->assertCount( 1, get_option( 'fqj_invalidation_log' ) );
+		$this->assertCount( 1, get_option( 'rfsd_invalidation_log' ) );
 	}
 
 	public function test_clear_invalidation_log_rejects_bad_nonce() {
-		$this->assert_rejects_bad_nonce( 'fqj_clear_invalidation_log' );
+		$this->assert_rejects_bad_nonce( 'rfsd_clear_invalidation_log' );
 	}
 
 	public function test_health_actions_reject_admin_nonce() {
-		$this->nonce( 'fqj_admin_nonce' );
+		$this->nonce( 'rfsd_admin_nonce' );
 		$this->expectException( WPAjaxDieStopException::class );
-		$this->_handleAjax( 'fqj_purge_transients' );
+		$this->_handleAjax( 'rfsd_purge_transients' );
 	}
 }
diff --git a/tests/php/test-cli.php b/tests/php/test-cli.php
index 6c75113..b7886d9 100644
--- a/tests/php/test-cli.php
+++ b/tests/php/test-cli.php
@@ -2,25 +2,25 @@
 /**
  * WP-CLI commands.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * CLI tests.
  */
-class Test_FQJ_Cli extends FQJ_TestCase {
+class Test_RFSD_Cli extends RFSD_TestCase {
 
 	/**
 	 * Command instance.
 	 *
-	 * @var FQJ\FqjCli
+	 * @var RFSD\Rfsd_Cli
 	 */
 	protected $cli;
 
 	public function set_up() {
 		parent::set_up();
 		WP_CLI::reset();
-		$this->cli = new FQJ\FqjCli();
+		$this->cli = new RFSD\Rfsd_Cli();
 	}
 
 	/**
@@ -41,42 +41,42 @@ function ( $m ) {
 	}
 
 	public function test_command_is_registered() {
-		$this->assertSame( 'FQJ\FqjCli', WP_CLI::get_command( 'fqj' ) );
+		$this->assertSame( 'RFSD\Rfsd_Cli', WP_CLI::get_command( 'rfsd' ) );
 	}
 
 	public function test_purge_transients_bumps_generation() {
-		$key = fqj_cache_key( 1 );
+		$key = rfsd_cache_key( 1 );
 		set_transient( $key, 'a' );
 		set_transient( 'keep_me', 'c' );
-		$gen = fqj_cache_generation();
+		$gen = rfsd_cache_generation();
 
 		$this->cli->purge_transients( array(), array() );
 
 		$this->assertFalse( get_transient( $key ) );
 		$this->assertSame( 'c', get_transient( 'keep_me' ) );
-		$this->assertSame( $gen + 1, fqj_cache_generation() );
+		$this->assertSame( $gen + 1, rfsd_cache_generation() );
 		$this->assertSame( 'Purged FAQ cache (generation ' . ( $gen + 1 ) . ').', $this->last_success() );
 	}
 
 	public function test_process_queue_with_limit() {
-		fqj_queue_add_posts( array( 1, 2, 3 ) );
+		rfsd_queue_add_posts( array( 1, 2, 3 ) );
 		$this->cli->process_queue( array(), array( 'limit' => '2' ) );
 
 		$this->assertSame( 'Processed 2 invalidation items.', $this->last_success() );
-		$this->assertSame( 1, fqj_queue_length() );
+		$this->assertSame( 1, rfsd_queue_length() );
 	}
 
 	public function test_process_queue_without_limit_uses_batch_size() {
-		update_option( FQJ_OPTION_KEY, array( 'batch_size' => 500 ) );
-		fqj_queue_add_posts( range( 1, 5 ) );
+		update_option( RFSD_OPTION_KEY, array( 'batch_size' => 500 ) );
+		rfsd_queue_add_posts( range( 1, 5 ) );
 		$this->cli->process_queue( array(), array() );
 
 		$this->assertSame( 'Processed 5 invalidation items.', $this->last_success() );
-		$this->assertSame( 0, fqj_queue_length() );
+		$this->assertSame( 0, rfsd_queue_length() );
 	}
 
 	public function test_queue_info() {
-		fqj_queue_add_posts( array( 4, 5 ) );
+		rfsd_queue_add_posts( array( 4, 5 ) );
 		$this->cli->queue_info( array(), array() );
 		$this->assertSame( 'Queue length: 2', $this->last_success() );
 	}
diff --git a/tests/php/test-coverage.php b/tests/php/test-coverage.php
index 7e73e55..b57fa19 100644
--- a/tests/php/test-coverage.php
+++ b/tests/php/test-coverage.php
@@ -2,13 +2,13 @@
 /**
  * Coverage module: the forward lookup and the inverse (posts covered by a mapping) must agree.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Coverage tests.
  */
-class Test_FQJ_Coverage extends FQJ_TestCase {
+class Test_RFSD_Coverage extends RFSD_TestCase {
 
 	/**
 	 * Fixture post IDs by name.
@@ -22,16 +22,16 @@ class Test_FQJ_Coverage extends FQJ_TestCase {
 	 */
 	public function set_up() {
 		parent::set_up();
-		register_post_type( 'fqj_book', array( 'public' => true ) );
-		register_taxonomy( 'fqj_genre', 'fqj_book', array( 'public' => true ) );
+		register_post_type( 'rfsd_book', array( 'public' => true ) );
+		register_taxonomy( 'rfsd_genre', 'rfsd_book', array( 'public' => true ) );
 	}
 
 	/**
 	 * Remove the custom post type and taxonomy.
 	 */
 	public function tear_down() {
-		unregister_taxonomy( 'fqj_genre' );
-		unregister_post_type( 'fqj_book' );
+		unregister_taxonomy( 'rfsd_genre' );
+		unregister_post_type( 'rfsd_book' );
 		parent::tear_down();
 	}
 
@@ -43,7 +43,7 @@ private function create_fixtures() {
 		$category = self::factory()->category->create( array( 'name' => 'News' ) );
 		$genre    = self::factory()->term->create(
 			array(
-				'taxonomy' => 'fqj_genre',
+				'taxonomy' => 'rfsd_genre',
 				'name'     => 'Fantasy',
 			)
 		);
@@ -62,11 +62,11 @@ private function create_fixtures() {
 		);
 		$this->posts['book'] = self::factory()->post->create(
 			array(
-				'post_type'  => 'fqj_book',
+				'post_type'  => 'rfsd_book',
 				'post_title' => 'Dragons',
 			)
 		);
-		wp_set_object_terms( $this->posts['book'], array( $genre ), 'fqj_genre' );
+		wp_set_object_terms( $this->posts['book'], array( $genre ), 'rfsd_genre' );
 		$this->posts['private'] = self::factory()->post->create(
 			array(
 				'post_title'    => 'Secret',
@@ -74,7 +74,7 @@ private function create_fixtures() {
 				'post_category' => array( $category ),
 			)
 		);
-		$this->posts['draft'] = self::factory()->post->create(
+		$this->posts['draft']   = self::factory()->post->create(
 			array(
 				'post_title'    => 'Later',
 				'post_status'   => 'draft',
@@ -87,7 +87,7 @@ private function create_fixtures() {
 			$this->create_faq( 'Post?', 'Yes.', array( 'posts' => array( $post_id ) ) );
 			$this->create_faq( 'URL?', 'Yes.', array( 'urls' => array( get_permalink( $post_id ) ) ) );
 		}
-		foreach ( array( 'page', 'post', 'fqj_book' ) as $post_type ) {
+		foreach ( array( 'page', 'post', 'rfsd_book' ) as $post_type ) {
 			$this->create_faq( 'Type?', 'Yes.', array( 'post_types' => array( $post_type ) ) );
 		}
 		foreach ( array( $category, $genre ) as $term_id ) {
@@ -104,7 +104,7 @@ private function create_fixtures() {
 	private function all_mappings() {
 		global $wpdb;
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
-		$rows = $wpdb->get_results( $wpdb->prepare( 'SELECT faq_id, mapping_type, mapping_value FROM %i', fqj_table_name() ), ARRAY_A );
+		$rows = $wpdb->get_results( $wpdb->prepare( 'SELECT faq_id, mapping_type, mapping_value FROM %i', rfsd_table_name() ), ARRAY_A );
 
 		$mappings = array();
 		foreach ( $rows as $row ) {
@@ -157,18 +157,18 @@ public function test_covered_posts_agree_with_faq_ids_for_every_mapping_and_post
 			$mapping = $entry['mapping'];
 			$label   = $mapping['type'] . ' ' . $mapping['value'];
 
-			if ( fqj_mapping_covers_everything( $mapping ) ) {
+			if ( rfsd_mapping_covers_everything( $mapping ) ) {
 				$this->assertSame( 'global', $mapping['type'], $label );
 				foreach ( $this->posts as $name => $post_id ) {
-					$this->assertNotEmpty( array_intersect( $entry['faq_ids'], fqj_faq_ids_for_post( $post_id ) ), "{$label} must match {$name}" );
+					$this->assertNotEmpty( array_intersect( $entry['faq_ids'], rfsd_faq_ids_for_post( $post_id ) ), "{$label} must match {$name}" );
 				}
 				continue;
 			}
 
-			$covered = fqj_posts_covered_by_mapping( $mapping, 0, 1000 );
+			$covered = rfsd_posts_covered_by_mapping( $mapping, 0, 1000 );
 			foreach ( $this->posts as $name => $post_id ) {
-				$matches = fqj_post_is_coverable( $post_id )
-					&& array() !== array_intersect( $entry['faq_ids'], fqj_faq_ids_for_post( $post_id ) );
+				$matches = rfsd_post_is_coverable( $post_id )
+					&& array() !== array_intersect( $entry['faq_ids'], rfsd_faq_ids_for_post( $post_id ) );
 				$this->assertSame( $matches, in_array( $post_id, $covered, true ), "{$label} covering {$name}" );
 			}
 		}
@@ -177,11 +177,11 @@ public function test_covered_posts_agree_with_faq_ids_for_every_mapping_and_post
 	public function test_only_published_posts_are_coverable() {
 		$this->create_fixtures();
 
-		$this->assertTrue( fqj_post_is_coverable( $this->posts['page'] ) );
-		$this->assertTrue( fqj_post_is_coverable( $this->posts['book'] ) );
-		$this->assertFalse( fqj_post_is_coverable( $this->posts['private'] ) );
-		$this->assertFalse( fqj_post_is_coverable( $this->posts['draft'] ) );
-		$this->assertFalse( fqj_post_is_coverable( 0 ) );
+		$this->assertTrue( rfsd_post_is_coverable( $this->posts['page'] ) );
+		$this->assertTrue( rfsd_post_is_coverable( $this->posts['book'] ) );
+		$this->assertFalse( rfsd_post_is_coverable( $this->posts['private'] ) );
+		$this->assertFalse( rfsd_post_is_coverable( $this->posts['draft'] ) );
+		$this->assertFalse( rfsd_post_is_coverable( 0 ) );
 	}
 
 	public function test_faq_ids_for_post_are_ascending_and_unique() {
@@ -189,10 +189,19 @@ public function test_faq_ids_for_post_are_ascending_and_unique() {
 		$second  = $this->create_faq( 'B?', 'B.', array( 'posts' => array( $post_id ) ) );
 		$first   = $this->create_faq( 'A?', 'A.', array( 'post_types' => array( 'post' ) ) );
 		$this->create_faq( 'C?', 'C.', array( 'posts' => array( self::factory()->post->create() ) ) );
-		update_post_meta( $first, 'fqj_assoc_data_json', wp_json_encode( array( 'posts' => array( $post_id ), 'post_types' => array( 'post' ) ) ) );
-		fqj_rebuild_index_for_faq( $first );
+		update_post_meta(
+			$first,
+			'rfsd_assoc_data_json',
+			wp_json_encode(
+				array(
+					'posts'      => array( $post_id ),
+					'post_types' => array( 'post' ),
+				)
+			)
+		);
+		rfsd_rebuild_index_for_faq( $first );
 
-		$this->assertSame( array( $second, $first ), fqj_faq_ids_for_post( $post_id ) );
+		$this->assertSame( array( $second, $first ), rfsd_faq_ids_for_post( $post_id ) );
 	}
 
 	public function test_covered_posts_respect_cursor_and_limit() {
@@ -203,11 +212,11 @@ public function test_covered_posts_respect_cursor_and_limit() {
 			'value' => 'post',
 		);
 
-		$this->assertSame( array( $ids[1] ), fqj_posts_covered_by_mapping( $mapping, $ids[0], 1 ) );
-		$this->assertSame( array( $ids[2] ), fqj_posts_covered_by_mapping( $mapping, $ids[1], 10 ) );
+		$this->assertSame( array( $ids[1] ), rfsd_posts_covered_by_mapping( $mapping, $ids[0], 1 ) );
+		$this->assertSame( array( $ids[2] ), rfsd_posts_covered_by_mapping( $mapping, $ids[1], 10 ) );
 		$this->assertSame(
 			array(),
-			fqj_posts_covered_by_mapping(
+			rfsd_posts_covered_by_mapping(
 				array(
 					'type'  => 'post',
 					'value' => $ids[0],
@@ -219,7 +228,7 @@ public function test_covered_posts_respect_cursor_and_limit() {
 	}
 
 	/**
-	 * @expectedIncorrectUsage fqj_posts_covered_by_mapping
+	 * @expectedIncorrectUsage rfsd_posts_covered_by_mapping
 	 */
 	public function test_covered_posts_for_global_is_a_programming_error() {
 		self::factory()->post->create();
@@ -228,14 +237,14 @@ public function test_covered_posts_for_global_is_a_programming_error() {
 			'value' => '1',
 		);
 
-		$this->assertTrue( fqj_mapping_covers_everything( $mapping ) );
-		$this->assertSame( array(), fqj_posts_covered_by_mapping( $mapping ) );
+		$this->assertTrue( rfsd_mapping_covers_everything( $mapping ) );
+		$this->assertSame( array(), rfsd_posts_covered_by_mapping( $mapping ) );
 	}
 
 	public function test_normalize_url_is_idempotent() {
 		foreach ( array( 'https://example.org/a/b/#x', 'https://example.org/?p=5&utm_source=x', 'https://example.org/' ) as $url ) {
-			$once = fqj_normalize_url( $url );
-			$this->assertSame( $once, fqj_normalize_url( $once ), $url );
+			$once = rfsd_normalize_url( $url );
+			$this->assertSame( $once, rfsd_normalize_url( $once ), $url );
 		}
 	}
 
@@ -250,40 +259,40 @@ public function test_post_for_url_needs_the_permalink_itself() {
 		update_option( 'show_on_front', 'page' );
 		update_option( 'page_on_front', $page );
 
-		$this->assertSame( $post, fqj_post_for_url( get_permalink( $post ) ) );
-		$this->assertSame( $post, fqj_post_for_url( '/hello/' ) );
-		$this->assertSame( $post, fqj_post_for_url( 'https://www.example.org/hello?utm=x#top' ) );
-		$this->assertSame( 0, fqj_post_for_url( home_url( '/?p=' . $post ) ), 'A shortlink is not the permalink.' );
-		$this->assertSame( $post, fqj_post_routed_from_url( home_url( '/?p=' . $post ) ) );
-		$this->assertSame( $page, fqj_post_for_url( home_url( '/' ) ) );
-		$this->assertSame( 0, fqj_post_for_url( home_url( '/welcome/' ) ), 'The front page slug URL is not its permalink.' );
-		$this->assertSame( $page, fqj_post_routed_from_url( home_url( '/welcome/' ) ) );
-		$this->assertSame( 0, fqj_post_for_url( 'https://external.example.net/hello' ) );
-		$this->assertSame( 0, fqj_post_routed_from_url( 'https://external.example.net/hello' ) );
+		$this->assertSame( $post, rfsd_post_for_url( get_permalink( $post ) ) );
+		$this->assertSame( $post, rfsd_post_for_url( '/hello/' ) );
+		$this->assertSame( $post, rfsd_post_for_url( 'https://www.example.org/hello?utm=x#top' ) );
+		$this->assertSame( 0, rfsd_post_for_url( home_url( '/?p=' . $post ) ), 'A shortlink is not the permalink.' );
+		$this->assertSame( $post, rfsd_post_routed_from_url( home_url( '/?p=' . $post ) ) );
+		$this->assertSame( $page, rfsd_post_for_url( home_url( '/' ) ) );
+		$this->assertSame( 0, rfsd_post_for_url( home_url( '/welcome/' ) ), 'The front page slug URL is not its permalink.' );
+		$this->assertSame( $page, rfsd_post_routed_from_url( home_url( '/welcome/' ) ) );
+		$this->assertSame( 0, rfsd_post_for_url( 'https://external.example.net/hello' ) );
+		$this->assertSame( 0, rfsd_post_routed_from_url( 'https://external.example.net/hello' ) );
 	}
 
 	public function test_post_for_url_resolves_custom_post_types_with_plain_permalinks() {
 		$this->set_permalink_structure( '' );
 		$book = self::factory()->post->create(
 			array(
-				'post_type' => 'fqj_book',
+				'post_type' => 'rfsd_book',
 				'post_name' => 'dragons',
 			)
 		);
 
-		$this->assertSame( '/?fqj_book=dragons', fqj_normalize_url( get_permalink( $book ) ) );
-		$this->assertSame( $book, fqj_post_for_url( get_permalink( $book ) ) );
-		$this->assertSame( 0, fqj_post_for_url( home_url( '/?fqj_book=nothing' ) ) );
+		$this->assertSame( '/?rfsd_book=dragons', rfsd_normalize_url( get_permalink( $book ) ) );
+		$this->assertSame( $book, rfsd_post_for_url( get_permalink( $book ) ) );
+		$this->assertSame( 0, rfsd_post_for_url( home_url( '/?rfsd_book=nothing' ) ) );
 	}
 
 	public function test_normalize_url_below_a_subdirectory_home() {
 		update_option( 'home', 'http://example.org/blog' );
 
-		$this->assertSame( '/about', fqj_normalize_url( 'http://example.org/blog/about/' ) );
-		$this->assertSame( '/', fqj_normalize_url( 'https://example.org/blog/' ) );
-		$this->assertSame( '/?p=3', fqj_normalize_url( 'http://example.org/blog/?p=3' ) );
-		$this->assertSame( 'http://example.org/blogroll', fqj_normalize_url( 'http://example.org/blogroll/' ) );
-		$this->assertSame( 'http://example.org/other', fqj_normalize_url( 'http://example.org/other' ) );
+		$this->assertSame( '/about', rfsd_normalize_url( 'http://example.org/blog/about/' ) );
+		$this->assertSame( '/', rfsd_normalize_url( 'https://example.org/blog/' ) );
+		$this->assertSame( '/?p=3', rfsd_normalize_url( 'http://example.org/blog/?p=3' ) );
+		$this->assertSame( 'http://example.org/blogroll', rfsd_normalize_url( 'http://example.org/blogroll/' ) );
+		$this->assertSame( 'http://example.org/other', rfsd_normalize_url( 'http://example.org/other' ) );
 	}
 
 	/**
@@ -309,9 +318,9 @@ public function url_settings() {
 	 * @param string $value  New value.
 	 */
 	public function test_url_settings_change_purges_all_cached_output( $option, $value ) {
-		$generation = fqj_cache_generation();
+		$generation = rfsd_cache_generation();
 		update_option( $option, $value );
-		$this->assertGreaterThan( $generation, fqj_cache_generation() );
+		$this->assertGreaterThan( $generation, rfsd_cache_generation() );
 	}
 
 	public function test_renaming_a_parent_invalidates_descendants() {
@@ -337,9 +346,9 @@ public function test_renaming_a_parent_invalidates_descendants() {
 		);
 		$other      = self::factory()->post->create( array( 'post_type' => 'page' ) );
 		$this->create_faq( 'Child?', 'Yes.', array( 'urls' => array( get_permalink( $child ) ) ) );
-		$this->assertSame( array( $child, $grandchild ), fqj_descendant_post_ids( $parent ) );
+		$this->assertSame( array( $child, $grandchild ), rfsd_descendant_post_ids( $parent ) );
 
-		fqj_queue_pop_posts( 1000 );
+		rfsd_queue_pop_posts( 1000 );
 		wp_update_post(
 			array(
 				'ID'         => $parent,
@@ -356,6 +365,6 @@ public function test_renaming_a_parent_invalidates_descendants() {
 		);
 		$this->assertEqualSets( array( $child, $grandchild ), $this->get_queue() );
 		$this->assertNotContains( $other, $this->get_queue() );
-		$this->assertSame( array(), fqj_faq_ids_for_post( $child ), 'The URL association no longer matches the moved child.' );
+		$this->assertSame( array(), rfsd_faq_ids_for_post( $child ), 'The URL association no longer matches the moved child.' );
 	}
 }
diff --git a/tests/php/test-frontend.php b/tests/php/test-frontend.php
index 3076a35..4668768 100644
--- a/tests/php/test-frontend.php
+++ b/tests/php/test-frontend.php
@@ -2,18 +2,18 @@
 /**
  * JSON-LD output on the frontend.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Frontend tests.
  */
-class Test_FQJ_Frontend extends FQJ_TestCase {
+class Test_RFSD_Frontend extends RFSD_TestCase {
 
 	public function test_no_output_without_queried_post() {
 		$this->go_to( home_url( '/' ) );
 		ob_start();
-		fqj_maybe_print_faq_jsonld();
+		rfsd_maybe_print_faq_jsonld();
 		$this->assertSame( '', ob_get_clean() );
 	}
 
@@ -24,7 +24,7 @@ public function test_no_output_in_admin() {
 		$this->go_to( get_permalink( $post ) );
 		set_current_screen( 'dashboard' );
 		ob_start();
-		fqj_maybe_print_faq_jsonld();
+		rfsd_maybe_print_faq_jsonld();
 		$this->assertSame( '', ob_get_clean() );
 		set_current_screen( 'front' );
 	}
@@ -56,7 +56,7 @@ public function test_post_mapping_outputs_faq_page() {
 	}
 
 	public function test_faqpage_output_type_setting() {
-		update_option( FQJ_OPTION_KEY, array( 'output_type' => 'faqpage' ) );
+		update_option( RFSD_OPTION_KEY, array( 'output_type' => 'faqpage' ) );
 		$post = self::factory()->post->create();
 		$this->create_faq( 'Q', 'A', array( 'posts' => array( $post ) ) );
 
@@ -65,7 +65,7 @@ public function test_faqpage_output_type_setting() {
 	}
 
 	public function test_unknown_output_type_falls_back_to_faq_page() {
-		update_option( FQJ_OPTION_KEY, array( 'output_type' => 'nonsense' ) );
+		update_option( RFSD_OPTION_KEY, array( 'output_type' => 'nonsense' ) );
 		$post = self::factory()->post->create();
 		$this->create_faq( 'Q', 'A', array( 'posts' => array( $post ) ) );
 
@@ -81,14 +81,14 @@ public function test_unmapped_post_gets_negative_cache() {
 		$html = $this->render_head_for( $post );
 		$this->assertStringContainsString( 'generated, no output', $html );
 		$this->assertStringNotContainsString( '<script', $html );
-		$this->assertSame( '__FQJ_EMPTY__', get_transient( fqj_cache_key( $post ) ) );
+		$this->assertSame( '__RFSD_EMPTY__', get_transient( rfsd_cache_key( $post ) ) );
 
 		$this->assertStringContainsString( 'cached, no output', $this->render_head_for( $post ) );
 	}
 
 	public function test_cached_output_is_served_from_transient() {
 		$post = self::factory()->post->create();
-		set_transient( fqj_cache_key( $post ), '<script type="application/ld+json">{"cached":true}</script>' );
+		set_transient( rfsd_cache_key( $post ), '<script type="application/ld+json">{"cached":true}</script>' );
 
 		$html = $this->render_head_for( $post );
 		$this->assertStringContainsString( '(cached)', $html );
@@ -97,21 +97,21 @@ public function test_cached_output_is_served_from_transient() {
 
 	public function test_blank_cached_value_reports_unknown_state() {
 		$post = self::factory()->post->create();
-		set_transient( fqj_cache_key( $post ), '   ' );
+		set_transient( rfsd_cache_key( $post ), '   ' );
 		$this->assertStringContainsString( 'cached, unknown state', $this->render_head_for( $post ) );
 	}
 
 	public function test_generated_output_is_cached_with_ttl() {
-		update_option( FQJ_OPTION_KEY, array( 'cache_ttl' => 600 ) );
+		update_option( RFSD_OPTION_KEY, array( 'cache_ttl' => 600 ) );
 		$post = self::factory()->post->create();
 		$this->create_faq( 'Q', 'A', array( 'posts' => array( $post ) ) );
 
 		$html   = $this->render_head_for( $post );
-		$cached = get_transient( fqj_cache_key( $post ) );
+		$cached = get_transient( rfsd_cache_key( $post ) );
 		$this->assertStringStartsWith( '<script type="application/ld+json">', $cached );
 		$this->assertStringContainsString( $cached, $html );
 
-		$timeout = (int) get_option( '_transient_timeout_' . fqj_cache_key( $post ) );
+		$timeout = (int) get_option( '_transient_timeout_' . rfsd_cache_key( $post ) );
 		$this->assertEqualsWithDelta( time() + 600, $timeout, 5 );
 	}
 
@@ -119,14 +119,14 @@ public function test_private_posts_render_without_cached_output() {
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 		$post = self::factory()->post->create( array( 'post_status' => 'private' ) );
 		$this->create_faq( 'Private?', 'Yes.', array( 'posts' => array( $post ) ) );
-		set_transient( fqj_cache_key( $post ), '__FQJ_EMPTY__' );
+		set_transient( rfsd_cache_key( $post ), '__RFSD_EMPTY__' );
 
 		$html = $this->render_head_for( $post );
 		$json = $this->extract_json_ld( $html );
 
 		$this->assertSame( 'Private?', $json['mainEntity'][0]['name'], 'Never served from cache.' );
 		$this->assertStringContainsString( '(uncached)', $html );
-		$this->assertSame( '__FQJ_EMPTY__', get_transient( fqj_cache_key( $post ) ), 'Never written to cache.' );
+		$this->assertSame( '__RFSD_EMPTY__', get_transient( rfsd_cache_key( $post ) ), 'Never written to cache.' );
 	}
 
 	public function test_draft_preview_renders_without_cached_output() {
@@ -135,12 +135,12 @@ public function test_draft_preview_renders_without_cached_output() {
 
 		$this->go_to( get_preview_post_link( $post ) );
 		ob_start();
-		fqj_maybe_print_faq_jsonld();
+		rfsd_maybe_print_faq_jsonld();
 		$html = ob_get_clean();
 
 		$this->assertTrue( is_preview() );
 		$this->assertStringContainsString( '(uncached, no output)', $html );
-		$this->assertFalse( get_transient( fqj_cache_key( $post ) ) );
+		$this->assertFalse( get_transient( rfsd_cache_key( $post ) ) );
 	}
 
 	public function test_post_type_mapping() {
@@ -153,15 +153,15 @@ public function test_post_type_mapping() {
 	}
 
 	public function test_term_mapping_for_category_and_custom_taxonomy() {
-		register_taxonomy( 'fqj_topic', 'post' );
+		register_taxonomy( 'rfsd_topic', 'post' );
 		$cat   = self::factory()->category->create();
-		$topic = self::factory()->term->create( array( 'taxonomy' => 'fqj_topic' ) );
+		$topic = self::factory()->term->create( array( 'taxonomy' => 'rfsd_topic' ) );
 
 		$in_cat   = self::factory()->post->create();
 		$in_topic = self::factory()->post->create();
 		$neither  = self::factory()->post->create();
 		wp_set_post_categories( $in_cat, array( $cat ) );
-		wp_set_object_terms( $in_topic, array( $topic ), 'fqj_topic' );
+		wp_set_object_terms( $in_topic, array( $topic ), 'rfsd_topic' );
 
 		$this->create_faq( 'Cat Q', 'Cat A', array( 'terms' => array( $cat ) ) );
 		$this->create_faq( 'Topic Q', 'Topic A', array( 'terms' => array( $topic ) ) );
@@ -172,7 +172,7 @@ public function test_term_mapping_for_category_and_custom_taxonomy() {
 		$this->assertSame( 'Topic Q', $topic_json['mainEntity'][0]['name'] );
 		$this->assertNull( $this->extract_json_ld( $this->render_head_for( $neither ) ) );
 
-		unregister_taxonomy( 'fqj_topic' );
+		unregister_taxonomy( 'rfsd_topic' );
 	}
 
 	public function test_url_mapping_matches_permalink() {
@@ -190,7 +190,7 @@ public function test_url_mapping_matches_permalink() {
 	public function test_legacy_url_rows_match_only_while_migration_runs() {
 		$post = self::factory()->post->create( array( 'post_name' => 'legacy' ) );
 		foreach ( array( 'http://example.org/legacy/', 'http://example.org/legacy' ) as $value ) {
-			fqj_insert_mappings(
+			rfsd_insert_mappings(
 				$this->create_faq( 'Old?', 'Yes.' ),
 				array(
 					array(
@@ -201,11 +201,11 @@ public function test_legacy_url_rows_match_only_while_migration_runs() {
 			);
 		}
 
-		update_option( FQJ_DATA_VERSION_OPTION, '2' );
-		$this->assertCount( 2, fqj_faq_ids_for_post( $post ) );
+		update_option( RFSD_DATA_VERSION_OPTION, '2' );
+		$this->assertCount( 2, rfsd_faq_ids_for_post( $post ) );
 
-		update_option( FQJ_DATA_VERSION_OPTION, '3' );
-		$this->assertSame( array(), fqj_faq_ids_for_post( $post ) );
+		update_option( RFSD_DATA_VERSION_OPTION, '3' );
+		$this->assertSame( array(), rfsd_faq_ids_for_post( $post ) );
 	}
 
 	public function test_global_mapping_applies_everywhere() {
@@ -220,7 +220,7 @@ public function test_global_mapping_applies_everywhere() {
 	public function test_post_id_does_not_partially_match_longer_ids() {
 		$post = self::factory()->post->create();
 		$faq  = $this->create_faq();
-		fqj_insert_mappings(
+		rfsd_insert_mappings(
 			$faq,
 			array(
 				array(
@@ -240,7 +240,7 @@ public function test_post_id_does_not_partially_match_longer_ids() {
 	public function test_mapping_type_must_match_value() {
 		$post = self::factory()->post->create();
 		$faq  = $this->create_faq();
-		fqj_insert_mappings(
+		rfsd_insert_mappings(
 			$faq,
 			array(
 				array(
@@ -258,7 +258,7 @@ public function test_multiple_faqs_are_combined_once() {
 		$a    = $this->create_faq( 'A?', 'a', array( 'posts' => array( $post ) ) );
 		$b    = $this->create_faq( 'B?', 'b', array( 'post_types' => array( 'page' ) ) );
 		// Matches through two mapping rows but must appear only once.
-		fqj_insert_mappings(
+		rfsd_insert_mappings(
 			$b,
 			array(
 				array(
@@ -287,7 +287,7 @@ public function test_unpublished_faqs_are_excluded() {
 
 		$html = $this->render_head_for( $post );
 		$this->assertNull( $this->extract_json_ld( $html ) );
-		$this->assertSame( '__FQJ_EMPTY__', get_transient( fqj_cache_key( $post ) ) );
+		$this->assertSame( '__RFSD_EMPTY__', get_transient( rfsd_cache_key( $post ) ) );
 	}
 
 	public function test_faqs_with_empty_question_or_answer_are_skipped() {
@@ -298,7 +298,7 @@ public function test_faqs_with_empty_question_or_answer_are_skipped() {
 
 		$html = $this->render_head_for( $post );
 		$this->assertNull( $this->extract_json_ld( $html ) );
-		$this->assertSame( '__FQJ_EMPTY__', get_transient( fqj_cache_key( $post ) ) );
+		$this->assertSame( '__RFSD_EMPTY__', get_transient( rfsd_cache_key( $post ) ) );
 	}
 
 	public function test_answer_html_is_stripped_and_unicode_kept() {
@@ -327,7 +327,7 @@ public function test_faq_mapped_to_trashed_post_id_has_no_effect_on_others() {
 	}
 
 	public function test_legacy_faqsection_value_outputs_faq_page() {
-		update_option( FQJ_OPTION_KEY, array( 'output_type' => 'faqsection' ) );
+		update_option( RFSD_OPTION_KEY, array( 'output_type' => 'faqsection' ) );
 		$post = self::factory()->post->create();
 		$this->create_faq( 'Q', 'A', array( 'posts' => array( $post ) ) );
 
@@ -345,7 +345,7 @@ public function test_html_entities_are_decoded_and_whitespace_normalized() {
 
 		$json = $this->extract_json_ld( $this->render_head_for( $post ) );
 		$this->assertSame( "Don\u{2019}t & won't?", $json['mainEntity'][0]['name'] );
-		$this->assertSame( "Tom & Jerry said \"hi\". Second paragraph", $json['mainEntity'][0]['acceptedAnswer']['text'] );
+		$this->assertSame( 'Tom & Jerry said "hi". Second paragraph', $json['mainEntity'][0]['acceptedAnswer']['text'] );
 	}
 
 	public function test_decoded_script_close_cannot_break_out_of_script_element() {
@@ -375,7 +375,7 @@ public function test_blog_home_category_archive_and_search_output_nothing() {
 			$this->go_to( $url );
 			$this->assertFalse( is_singular(), $url );
 			ob_start();
-			fqj_maybe_print_faq_jsonld();
+			rfsd_maybe_print_faq_jsonld();
 			$this->assertSame( '', ob_get_clean(), $url );
 		}
 	}
@@ -404,16 +404,16 @@ public function test_the_content_filters_do_not_pollute_answer() {
 
 	public function test_shortcodes_render_in_answer() {
 		add_shortcode(
-			'fqj_test_sc',
+			'rfsd_test_sc',
 			static function () {
 				return '<b>rendered</b>';
 			}
 		);
 		$post = self::factory()->post->create();
-		$this->create_faq( 'Q', 'Value: [fqj_test_sc]', array( 'posts' => array( $post ) ) );
+		$this->create_faq( 'Q', 'Value: [rfsd_test_sc]', array( 'posts' => array( $post ) ) );
 
 		$json = $this->extract_json_ld( $this->render_head_for( $post ) );
-		remove_shortcode( 'fqj_test_sc' );
+		remove_shortcode( 'rfsd_test_sc' );
 		$this->assertSame( 'Value: rendered', $json['mainEntity'][0]['acceptedAnswer']['text'] );
 	}
 
@@ -424,16 +424,16 @@ public function test_text_filters_can_modify_question_and_answer() {
 		$a = static function ( $text ) {
 			return strtoupper( $text );
 		};
-		add_filter( 'fqj_question_text', $q, 10, 2 );
-		add_filter( 'fqj_answer_text', $a );
+		add_filter( 'rfsd_question_text', $q, 10, 2 );
+		add_filter( 'rfsd_answer_text', $a );
 
 		$post = self::factory()->post->create();
 		$this->create_faq( 'Q', 'answer', array( 'posts' => array( $post ) ) );
 
 		$json = $this->extract_json_ld( $this->render_head_for( $post ) );
-		remove_filter( 'fqj_question_text', $q, 10 );
-		remove_filter( 'fqj_answer_text', $a );
-		$this->assertSame( 'Q [fqj_faq]', $json['mainEntity'][0]['name'] );
+		remove_filter( 'rfsd_question_text', $q, 10 );
+		remove_filter( 'rfsd_answer_text', $a );
+		$this->assertSame( 'Q [rfsd_faq]', $json['mainEntity'][0]['name'] );
 		$this->assertSame( 'ANSWER', $json['mainEntity'][0]['acceptedAnswer']['text'] );
 	}
 }
diff --git a/tests/php/test-health.php b/tests/php/test-health.php
index bca4bc5..77751cf 100644
--- a/tests/php/test-health.php
+++ b/tests/php/test-health.php
@@ -2,23 +2,23 @@
 /**
  * Health & Diagnostics page.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Health page tests.
  */
-class Test_FQJ_Health extends FQJ_TestCase {
+class Test_RFSD_Health extends RFSD_TestCase {
 
 	public function set_up() {
 		parent::set_up();
-		delete_option( 'fqj_invalidation_log' );
-		delete_option( 'fqj_last_queue_run' );
+		delete_option( 'rfsd_invalidation_log' );
+		delete_option( 'rfsd_last_queue_run' );
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 	}
 
 	public function tear_down() {
-		wp_dequeue_script( 'fqj-health-js' );
+		wp_dequeue_script( 'rfsd-health-js' );
 		parent::tear_down();
 	}
 
@@ -29,34 +29,34 @@ public function tear_down() {
 	 */
 	protected function render() {
 		ob_start();
-		fqj_render_health_page();
+		rfsd_render_health_page();
 
 		return ob_get_clean();
 	}
 
 	public function test_submenu_is_registered() {
 		global $submenu;
-		fqj_register_health_page();
-		$slugs = wp_list_pluck( $submenu['edit.php?post_type=fqj_faq'], 2 );
-		$this->assertContains( 'fqj-health', $slugs );
+		rfsd_register_health_page();
+		$slugs = wp_list_pluck( $submenu['edit.php?post_type=rfsd_faq'], 2 );
+		$this->assertContains( 'rfsd-health', $slugs );
 	}
 
 	public function test_render_empty_state() {
 		$html = $this->render();
-		$this->assertStringContainsString( '<strong id="fqj-queue-count">0</strong>', $html );
-		$this->assertMatchesRegularExpression( '#<strong id="fqj-last-run">\s*Never\s*</strong>#', $html );
+		$this->assertStringContainsString( '<strong id="rfsd-queue-count">0</strong>', $html );
+		$this->assertMatchesRegularExpression( '#<strong id="rfsd-last-run">\s*Never\s*</strong>#', $html );
 		$this->assertStringContainsString( 'No invalidation runs logged yet.', $html );
-		$this->assertStringContainsString( 'id="fqj-process-now"', $html );
-		$this->assertStringContainsString( 'id="fqj-purge-transients"', $html );
-		$this->assertStringContainsString( 'id="fqj-clear-log"', $html );
+		$this->assertStringContainsString( 'id="rfsd-process-now"', $html );
+		$this->assertStringContainsString( 'id="rfsd-purge-transients"', $html );
+		$this->assertStringContainsString( 'id="rfsd-clear-log"', $html );
 	}
 
 	public function test_render_with_queue_and_log() {
-		fqj_queue_add_posts( array( 1, 2, 3 ) );
-		fqj_log_invalidation_run( 4, array( 10, 11 ) );
+		rfsd_queue_add_posts( array( 1, 2, 3 ) );
+		rfsd_log_invalidation_run( 4, array( 10, 11 ) );
 
 		$html = $this->render();
-		$this->assertStringContainsString( '<strong id="fqj-queue-count">3</strong>', $html );
+		$this->assertStringContainsString( '<strong id="rfsd-queue-count">3</strong>', $html );
 		$this->assertStringNotContainsString( 'Never', $html );
 		$this->assertStringContainsString( '<td>4</td>', $html );
 		$this->assertStringContainsString( '<td>10, 11</td>', $html );
@@ -64,20 +64,20 @@ public function test_render_with_queue_and_log() {
 	}
 
 	public function test_render_tolerates_malformed_log_entries() {
-		update_option( 'fqj_invalidation_log', array( array(), array( 'sample' => 'nope' ) ) );
+		update_option( 'rfsd_invalidation_log', array( array(), array( 'sample' => 'nope' ) ) );
 		$html = $this->render();
 		$this->assertStringContainsString( '<td>n/a</td>', $html );
 		$this->assertStringContainsString( '<td>0</td>', $html );
 	}
 
 	public function test_render_handles_non_array_log() {
-		update_option( 'fqj_invalidation_log', 'garbage' );
+		update_option( 'rfsd_invalidation_log', 'garbage' );
 		$this->assertStringContainsString( 'No invalidation runs logged yet.', $this->render() );
 	}
 
 	public function test_render_escapes_log_values() {
 		update_option(
-			'fqj_invalidation_log',
+			'rfsd_invalidation_log',
 			array(
 				array(
 					'ts'        => time(),
@@ -96,11 +96,11 @@ public function test_non_admin_sees_nothing() {
 	}
 
 	public function test_assets_only_on_health_page() {
-		fqj_health_admin_assets( 'edit.php' );
-		$this->assertFalse( wp_script_is( 'fqj-health-js', 'enqueued' ) );
+		rfsd_health_admin_assets( 'edit.php' );
+		$this->assertFalse( wp_script_is( 'rfsd-health-js', 'enqueued' ) );
 
-		fqj_health_admin_assets( 'fqj_faq_page_fqj-health' );
-		$this->assertTrue( wp_script_is( 'fqj-health-js', 'enqueued' ) );
-		$this->assertStringContainsString( 'var fqjHealth', wp_scripts()->get_data( 'fqj-health-js', 'data' ) );
+		rfsd_health_admin_assets( 'rfsd_faq_page_rfsd-health' );
+		$this->assertTrue( wp_script_is( 'rfsd-health-js', 'enqueued' ) );
+		$this->assertStringContainsString( 'var rfsdHealth', wp_scripts()->get_data( 'rfsd-health-js', 'data' ) );
 	}
 }
diff --git a/tests/php/test-indexer.php b/tests/php/test-indexer.php
index 34436a1..635cd35 100644
--- a/tests/php/test-indexer.php
+++ b/tests/php/test-indexer.php
@@ -2,13 +2,13 @@
 /**
  * Mapping table and indexer.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Indexer tests.
  */
-class Test_FQJ_Indexer extends FQJ_TestCase {
+class Test_RFSD_Indexer extends RFSD_TestCase {
 
 	/**
 	 * @dataProvider url_provider
@@ -17,7 +17,7 @@ class Test_FQJ_Indexer extends FQJ_TestCase {
 	 * @param string $expected Normalized URL.
 	 */
 	public function test_normalize_url( $input, $expected ) {
-		$this->assertSame( $expected, fqj_normalize_url( $input ) );
+		$this->assertSame( $expected, rfsd_normalize_url( $input ) );
 	}
 
 	public function url_provider() {
@@ -51,27 +51,27 @@ public function url_provider() {
 	}
 
 	public function test_create_table_stores_schema_version() {
-		delete_option( FQJ_DB_VERSION_OPTION );
-		fqj_create_table();
-		$this->assertSame( FQJ_DB_VERSION, get_option( FQJ_DB_VERSION_OPTION ) );
+		delete_option( RFSD_DB_VERSION_OPTION );
+		rfsd_create_table();
+		$this->assertSame( RFSD_DB_VERSION, get_option( RFSD_DB_VERSION_OPTION ) );
 	}
 
 	public function test_maybe_upgrade_db_runs_when_version_is_stale() {
-		update_option( FQJ_DB_VERSION_OPTION, '0' );
-		fqj_maybe_upgrade_db();
-		$this->assertSame( FQJ_DB_VERSION, get_option( FQJ_DB_VERSION_OPTION ) );
+		update_option( RFSD_DB_VERSION_OPTION, '0' );
+		rfsd_maybe_upgrade_db();
+		$this->assertSame( RFSD_DB_VERSION, get_option( RFSD_DB_VERSION_OPTION ) );
 	}
 
 	public function test_maybe_upgrade_db_skips_newer_stored_version() {
-		update_option( FQJ_DB_VERSION_OPTION, '999' );
-		fqj_maybe_upgrade_db();
-		$this->assertSame( '999', get_option( FQJ_DB_VERSION_OPTION ) );
+		update_option( RFSD_DB_VERSION_OPTION, '999' );
+		rfsd_maybe_upgrade_db();
+		$this->assertSame( '999', get_option( RFSD_DB_VERSION_OPTION ) );
 	}
 
 	public function test_data_migration_reindexes_and_purges_once() {
-		$faq = self::factory()->post->create( array( 'post_type' => 'fqj_faq' ) );
-		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array( 'posts' => array( 5 ) ) ) );
-		fqj_insert_mappings(
+		$faq = self::factory()->post->create( array( 'post_type' => 'rfsd_faq' ) );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array( 'posts' => array( 5 ) ) ) );
+		rfsd_insert_mappings(
 			$faq,
 			array(
 				array(
@@ -80,33 +80,39 @@ public function test_data_migration_reindexes_and_purges_once() {
 				),
 			)
 		);
-		$stale_key = fqj_cache_key( 5 );
+		$stale_key = rfsd_cache_key( 5 );
 		set_transient( $stale_key, 'stale', 600 );
-		delete_option( FQJ_DATA_VERSION_OPTION );
+		delete_option( RFSD_DATA_VERSION_OPTION );
 
-		fqj_run_data_migration();
+		rfsd_run_data_migration();
 
-		$this->assertSame( FQJ_DATA_VERSION, get_option( FQJ_DATA_VERSION_OPTION ) );
+		$this->assertSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
 		$this->assertFalse( get_transient( $stale_key ) );
-		$this->assertNotSame( $stale_key, fqj_cache_key( 5 ) );
+		$this->assertNotSame( $stale_key, rfsd_cache_key( 5 ) );
 		global $wpdb;
-		$rows = $wpdb->get_col( $wpdb->prepare( 'SELECT mapping_type FROM ' . fqj_table_name() . ' WHERE faq_id = %d', $faq ) );
+		$rows = $wpdb->get_col( $wpdb->prepare( 'SELECT mapping_type FROM ' . rfsd_table_name() . ' WHERE faq_id = %d', $faq ) );
 		$this->assertSame( array( 'post' ), $rows );
 
-		set_transient( fqj_cache_key( 5 ), 'fresh', 600 );
-		fqj_run_data_migration();
-		$this->assertSame( 'fresh', get_transient( fqj_cache_key( 5 ) ) );
+		set_transient( rfsd_cache_key( 5 ), 'fresh', 600 );
+		rfsd_run_data_migration();
+		$this->assertSame( 'fresh', get_transient( rfsd_cache_key( 5 ) ) );
 	}
 
 	public function test_data_migration_normalizes_legacy_faqsection_option_and_purges() {
-		update_option( FQJ_OPTION_KEY, array( 'output_type' => 'faqsection', 'cache_ttl' => 99 ) );
-		$stale_key = fqj_cache_key( 5 );
+		update_option(
+			RFSD_OPTION_KEY,
+			array(
+				'output_type' => 'faqsection',
+				'cache_ttl'   => 99,
+			)
+		);
+		$stale_key = rfsd_cache_key( 5 );
 		set_transient( $stale_key, 'stale', 600 );
-		delete_option( FQJ_DATA_VERSION_OPTION );
+		delete_option( RFSD_DATA_VERSION_OPTION );
 
-		fqj_run_data_migration();
+		rfsd_run_data_migration();
 
-		$opts = get_option( FQJ_OPTION_KEY );
+		$opts = get_option( RFSD_OPTION_KEY );
 		$this->assertSame( 'faqpage', $opts['output_type'] );
 		$this->assertSame( 99, $opts['cache_ttl'] );
 		$this->assertFalse( get_transient( $stale_key ) );
@@ -115,11 +121,11 @@ public function test_data_migration_normalizes_legacy_faqsection_option_and_purg
 	public function test_data_migration_reindexes_trashed_faqs() {
 		$faq = self::factory()->post->create(
 			array(
-				'post_type'   => 'fqj_faq',
+				'post_type'   => 'rfsd_faq',
 				'post_status' => 'trash',
 			)
 		);
-		fqj_insert_mappings(
+		rfsd_insert_mappings(
 			$faq,
 			array(
 				array(
@@ -128,67 +134,75 @@ public function test_data_migration_reindexes_trashed_faqs() {
 				),
 			)
 		);
-		delete_option( FQJ_DATA_VERSION_OPTION );
+		delete_option( RFSD_DATA_VERSION_OPTION );
 
-		fqj_run_data_migration();
+		rfsd_run_data_migration();
 
 		global $wpdb;
-		$count = $wpdb->get_var( $wpdb->prepare( 'SELECT COUNT(*) FROM ' . fqj_table_name() . ' WHERE faq_id = %d', $faq ) );
+		$count = $wpdb->get_var( $wpdb->prepare( 'SELECT COUNT(*) FROM ' . rfsd_table_name() . ' WHERE faq_id = %d', $faq ) );
 		$this->assertSame( '0', (string) $count );
 	}
 
 	public function test_data_migration_runs_in_batches() {
-		add_filter( 'fqj_data_migration_batch_size', array( $this, 'tiny_batch' ) );
-		self::factory()->post->create_many( 3, array( 'post_type' => 'fqj_faq' ) );
-		delete_option( FQJ_DATA_VERSION_OPTION );
-		delete_option( FQJ_DATA_MIGRATION_CURSOR_OPTION );
-		wp_clear_scheduled_hook( 'fqj_data_migration' );
-
-		fqj_run_data_migration();
-		$this->assertNotSame( FQJ_DATA_VERSION, get_option( FQJ_DATA_VERSION_OPTION ) );
-		$this->assertNotFalse( wp_next_scheduled( 'fqj_data_migration' ) );
-
-		for ( $i = 0; $i < 5 && FQJ_DATA_VERSION !== get_option( FQJ_DATA_VERSION_OPTION ); $i++ ) {
-			fqj_run_data_migration();
+		add_filter( 'rfsd_data_migration_batch_size', array( $this, 'tiny_batch' ) );
+		self::factory()->post->create_many( 3, array( 'post_type' => 'rfsd_faq' ) );
+		delete_option( RFSD_DATA_VERSION_OPTION );
+		delete_option( RFSD_DATA_MIGRATION_CURSOR_OPTION );
+		wp_clear_scheduled_hook( 'rfsd_data_migration' );
+
+		rfsd_run_data_migration();
+		$this->assertNotSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
+		$this->assertNotFalse( wp_next_scheduled( 'rfsd_data_migration' ) );
+
+		for ( $i = 0; $i < 5 && RFSD_DATA_VERSION !== get_option( RFSD_DATA_VERSION_OPTION ); $i++ ) {
+			rfsd_run_data_migration();
 		}
-		remove_filter( 'fqj_data_migration_batch_size', array( $this, 'tiny_batch' ) );
-		$this->assertSame( FQJ_DATA_VERSION, get_option( FQJ_DATA_VERSION_OPTION ) );
-		$this->assertFalse( get_option( FQJ_DATA_MIGRATION_CURSOR_OPTION ) );
+		remove_filter( 'rfsd_data_migration_batch_size', array( $this, 'tiny_batch' ) );
+		$this->assertSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
+		$this->assertFalse( get_option( RFSD_DATA_MIGRATION_CURSOR_OPTION ) );
 	}
 
 	public function test_data_migration_restarts_cursor_left_by_an_older_migration() {
-		$ids = self::factory()->post->create_many( 3, array( 'post_type' => 'fqj_faq' ) );
+		$ids = self::factory()->post->create_many( 3, array( 'post_type' => 'rfsd_faq' ) );
 		foreach ( $ids as $faq ) {
-			update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array( 'posts' => array( 5 ) ) ) );
+			update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array( 'posts' => array( 5 ) ) ) );
 		}
-		delete_option( FQJ_DATA_VERSION_OPTION );
+		delete_option( RFSD_DATA_VERSION_OPTION );
 		// Migration 2 stored a bare ID past every FAQ before the plugin was updated.
-		update_option( FQJ_DATA_MIGRATION_CURSOR_OPTION, max( $ids ), false );
+		update_option( RFSD_DATA_MIGRATION_CURSOR_OPTION, max( $ids ), false );
 
-		fqj_run_data_migration();
+		rfsd_run_data_migration();
 
-		$this->assertSame( FQJ_DATA_VERSION, get_option( FQJ_DATA_VERSION_OPTION ) );
+		$this->assertSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
 		foreach ( $ids as $faq ) {
-			$this->assertSame( array( array( 'mapping_type' => 'post', 'mapping_value' => '5' ) ), $this->get_mappings( $faq ) );
+			$this->assertSame(
+				array(
+					array(
+						'mapping_type'  => 'post',
+						'mapping_value' => '5',
+					),
+				),
+				$this->get_mappings( $faq )
+			);
 		}
 	}
 
 	public function test_data_migration_cursor_records_its_version() {
-		add_filter( 'fqj_data_migration_batch_size', array( $this, 'tiny_batch' ) );
-		$ids = self::factory()->post->create_many( 3, array( 'post_type' => 'fqj_faq' ) );
+		add_filter( 'rfsd_data_migration_batch_size', array( $this, 'tiny_batch' ) );
+		$ids = self::factory()->post->create_many( 3, array( 'post_type' => 'rfsd_faq' ) );
 		sort( $ids );
-		delete_option( FQJ_DATA_VERSION_OPTION );
-		delete_option( FQJ_DATA_MIGRATION_CURSOR_OPTION );
+		delete_option( RFSD_DATA_VERSION_OPTION );
+		delete_option( RFSD_DATA_MIGRATION_CURSOR_OPTION );
 
-		fqj_run_data_migration();
-		remove_filter( 'fqj_data_migration_batch_size', array( $this, 'tiny_batch' ) );
+		rfsd_run_data_migration();
+		remove_filter( 'rfsd_data_migration_batch_size', array( $this, 'tiny_batch' ) );
 
 		$this->assertSame(
 			array(
-				'version' => FQJ_DATA_VERSION,
+				'version' => RFSD_DATA_VERSION,
 				'cursor'  => $ids[1],
 			),
-			get_option( FQJ_DATA_MIGRATION_CURSOR_OPTION )
+			get_option( RFSD_DATA_MIGRATION_CURSOR_OPTION )
 		);
 	}
 
@@ -197,25 +211,25 @@ public function tiny_batch() {
 	}
 
 	public function test_maybe_schedule_data_migration() {
-		wp_clear_scheduled_hook( 'fqj_data_migration' );
-		update_option( FQJ_DATA_VERSION_OPTION, FQJ_DATA_VERSION );
-		fqj_maybe_schedule_data_migration();
-		$this->assertFalse( wp_next_scheduled( 'fqj_data_migration' ) );
-
-		delete_option( FQJ_DATA_VERSION_OPTION );
-		fqj_maybe_schedule_data_migration();
-		$this->assertNotFalse( wp_next_scheduled( 'fqj_data_migration' ) );
-		wp_clear_scheduled_hook( 'fqj_data_migration' );
+		wp_clear_scheduled_hook( 'rfsd_data_migration' );
+		update_option( RFSD_DATA_VERSION_OPTION, RFSD_DATA_VERSION );
+		rfsd_maybe_schedule_data_migration();
+		$this->assertFalse( wp_next_scheduled( 'rfsd_data_migration' ) );
+
+		delete_option( RFSD_DATA_VERSION_OPTION );
+		rfsd_maybe_schedule_data_migration();
+		$this->assertNotFalse( wp_next_scheduled( 'rfsd_data_migration' ) );
+		wp_clear_scheduled_hook( 'rfsd_data_migration' );
 	}
 
 	public function test_activation_skips_migration_on_fresh_install() {
-		delete_option( FQJ_DATA_VERSION_OPTION );
-		fqj_activate();
-		$this->assertSame( FQJ_DATA_VERSION, get_option( FQJ_DATA_VERSION_OPTION ) );
+		delete_option( RFSD_DATA_VERSION_OPTION );
+		rfsd_activate();
+		$this->assertSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
 	}
 
 	public function test_insert_and_delete_mappings() {
-		fqj_insert_mappings(
+		rfsd_insert_mappings(
 			123,
 			array(
 				array(
@@ -243,7 +257,7 @@ public function test_insert_and_delete_mappings() {
 			$this->get_mappings( 123 )
 		);
 
-		fqj_insert_mappings(
+		rfsd_insert_mappings(
 			456,
 			array(
 				array(
@@ -252,13 +266,13 @@ public function test_insert_and_delete_mappings() {
 				),
 			)
 		);
-		fqj_delete_mappings_for_faq( 123 );
+		rfsd_delete_mappings_for_faq( 123 );
 		$this->assertSame( array(), $this->get_mappings( 123 ) );
 		$this->assertCount( 1, $this->get_mappings( 456 ), 'Deleting one FAQ must not touch another.' );
 	}
 
 	public function test_insert_sanitizes_mapping_type() {
-		fqj_insert_mappings(
+		rfsd_insert_mappings(
 			77,
 			array(
 				array(
@@ -368,8 +382,8 @@ public function test_rebuild_replaces_previous_mappings() {
 		$b   = self::factory()->post->create();
 		$faq = $this->create_faq( 'Q', 'A', array( 'posts' => array( $a ) ) );
 
-		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array( 'posts' => array( $b ) ) ) );
-		fqj_rebuild_index_for_faq( $faq );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array( 'posts' => array( $b ) ) ) );
+		rfsd_rebuild_index_for_faq( $faq );
 
 		$this->assertSame(
 			array(
@@ -384,7 +398,7 @@ public function test_rebuild_replaces_previous_mappings() {
 
 	public function test_rebuild_handles_missing_or_invalid_payload() {
 		$faq = $this->create_faq();
-		fqj_insert_mappings(
+		rfsd_insert_mappings(
 			$faq,
 			array(
 				array(
@@ -394,15 +408,15 @@ public function test_rebuild_handles_missing_or_invalid_payload() {
 			)
 		);
 
-		fqj_rebuild_index_for_faq( $faq );
+		rfsd_rebuild_index_for_faq( $faq );
 		$this->assertSame( array(), $this->get_mappings( $faq ), 'No payload clears old rows.' );
 
-		update_post_meta( $faq, 'fqj_assoc_data_json', '{not json' );
-		fqj_rebuild_index_for_faq( $faq );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', '{not json' );
+		rfsd_rebuild_index_for_faq( $faq );
 		$this->assertSame( array(), $this->get_mappings( $faq ) );
 
-		update_post_meta( $faq, 'fqj_assoc_data_json', '"a string"' );
-		fqj_rebuild_index_for_faq( $faq );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', '"a string"' );
+		rfsd_rebuild_index_for_faq( $faq );
 		$this->assertSame( array(), $this->get_mappings( $faq ) );
 	}
 
@@ -421,7 +435,7 @@ public function test_rebuild_ignores_non_array_payload_keys() {
 	}
 
 	public function test_enqueue_ignores_empty_mappings() {
-		fqj_enqueue_invalidation_for_mappings( array() );
+		rfsd_enqueue_invalidation_for_mappings( array() );
 		$this->assertSame( array(), $this->get_queue() );
 	}
 
@@ -433,7 +447,7 @@ public function test_enqueue_post_mapping_queues_post() {
 
 	public function test_enqueue_url_mapping_resolves_post() {
 		$target = self::factory()->post->create( array( 'post_name' => 'pricing' ) );
-		fqj_enqueue_invalidation_for_mappings(
+		rfsd_enqueue_invalidation_for_mappings(
 			array(
 				array(
 					'type'  => 'url',
@@ -452,7 +466,7 @@ public function test_enqueue_post_type_and_term_mappings_queue_jobs_without_enum
 		$term  = self::factory()->category->create();
 		$pages = self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
 
-		fqj_enqueue_invalidation_for_mappings(
+		rfsd_enqueue_invalidation_for_mappings(
 			array(
 				array(
 					'type'  => 'post_type',
@@ -489,13 +503,13 @@ public function test_enqueue_post_type_and_term_mappings_queue_jobs_without_enum
 	}
 
 	public function test_enqueue_global_mapping_purges_all_faq_transients() {
-		$key_1 = fqj_cache_key( 1 );
-		$key_2 = fqj_cache_key( 2 );
+		$key_1 = rfsd_cache_key( 1 );
+		$key_2 = rfsd_cache_key( 2 );
 		set_transient( $key_1, 'x' );
 		set_transient( $key_2, 'y' );
 		set_transient( 'unrelated_transient', 'z' );
 
-		fqj_enqueue_invalidation_for_mappings(
+		rfsd_enqueue_invalidation_for_mappings(
 			array(
 				array(
 					'type'  => 'global',
@@ -506,12 +520,12 @@ public function test_enqueue_global_mapping_purges_all_faq_transients() {
 
 		$this->assertFalse( get_transient( $key_1 ) );
 		$this->assertFalse( get_transient( $key_2 ) );
-		$this->assertNotSame( $key_1, fqj_cache_key( 1 ) );
+		$this->assertNotSame( $key_1, rfsd_cache_key( 1 ) );
 		$this->assertSame( 'z', get_transient( 'unrelated_transient' ) );
 	}
 
 	public function test_enqueue_ignores_unknown_mapping_type() {
-		fqj_enqueue_invalidation_for_mappings(
+		rfsd_enqueue_invalidation_for_mappings(
 			array(
 				array(
 					'type'  => 'bogus',
diff --git a/tests/php/test-invalidation-hooks.php b/tests/php/test-invalidation-hooks.php
index 045fbe8..61e5352 100644
--- a/tests/php/test-invalidation-hooks.php
+++ b/tests/php/test-invalidation-hooks.php
@@ -2,20 +2,20 @@
 /**
  * Invalidation triggered by FAQ lifecycle and post changes.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Invalidation hook tests.
  */
-class Test_FQJ_Invalidation_Hooks extends FQJ_TestCase {
+class Test_RFSD_Invalidation_Hooks extends RFSD_TestCase {
 
 	/**
 	 * Empty the queue so a test sees only its own entries.
 	 */
 	private function clear_queue() {
 		global $wpdb;
-		$table = fqj_queue_table_name();
+		$table = rfsd_queue_table_name();
 		$wpdb->query( "DELETE FROM {$table}" ); // phpcs:ignore WordPress.DB
 	}
 
@@ -41,7 +41,7 @@ public function test_get_mappings_for_faq_returns_type_value_rows() {
 					'value' => '1',
 				),
 			),
-			fqj_get_mappings_for_faq( $faq )
+			rfsd_get_mappings_for_faq( $faq )
 		);
 	}
 
@@ -51,8 +51,8 @@ public function test_removing_association_enqueues_old_post() {
 		$faq = $this->create_faq( 'Q', 'A', array( 'posts' => array( $a ) ) );
 		$this->clear_queue();
 
-		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array( 'posts' => array( $b ) ) ) );
-		fqj_rebuild_index_for_faq( $faq );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array( 'posts' => array( $b ) ) ) );
+		rfsd_rebuild_index_for_faq( $faq );
 
 		$this->assertEqualSets( array( $a, $b ), $this->get_queue() );
 	}
@@ -62,8 +62,8 @@ public function test_removing_all_associations_enqueues_old_post() {
 		$faq = $this->create_faq( 'Q', 'A', array( 'posts' => array( $a ) ) );
 		$this->clear_queue();
 
-		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array() ) );
-		fqj_rebuild_index_for_faq( $faq );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array() ) );
+		rfsd_rebuild_index_for_faq( $faq );
 
 		$this->assertSame( array( $a ), $this->get_queue() );
 	}
@@ -80,8 +80,8 @@ public function test_removing_term_and_post_type_enqueue_jobs() {
 		);
 		$this->clear_queue();
 
-		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array() ) );
-		fqj_rebuild_index_for_faq( $faq );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array() ) );
+		rfsd_rebuild_index_for_faq( $faq );
 
 		$jobs = wp_list_pluck( $this->get_queue_jobs(), 'item_value', 'item_type' );
 		$this->assertSame( (string) $term, $jobs['term'] );
@@ -91,11 +91,11 @@ public function test_removing_term_and_post_type_enqueue_jobs() {
 	public function test_removing_global_purges_cache() {
 		$post = self::factory()->post->create();
 		$faq  = $this->create_faq( 'Q', 'A', array( 'global' => true ) );
-		$key  = fqj_cache_key( $post );
+		$key  = rfsd_cache_key( $post );
 		set_transient( $key, 'x' );
 
-		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array() ) );
-		fqj_rebuild_index_for_faq( $faq );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array() ) );
+		rfsd_rebuild_index_for_faq( $faq );
 
 		$this->assertFalse( get_transient( $key ) );
 	}
@@ -105,7 +105,7 @@ public function test_rebuild_without_enqueue_does_not_enqueue() {
 		$faq = $this->create_faq( 'Q', 'A', array( 'posts' => array( $a ) ) );
 		$this->clear_queue();
 
-		fqj_rebuild_index_for_faq( $faq, false );
+		rfsd_rebuild_index_for_faq( $faq, false );
 		$this->assertSame( array(), $this->get_queue() );
 	}
 
@@ -233,17 +233,17 @@ public function test_unchanged_terms_keep_cache() {
 		$cat  = self::factory()->category->create();
 		$post = self::factory()->post->create();
 		wp_set_post_categories( $post, array( $cat ) );
-		set_transient( fqj_cache_key( $post ), 'x' );
+		set_transient( rfsd_cache_key( $post ), 'x' );
 
 		wp_set_post_categories( $post, array( $cat ) );
-		$this->assertSame( 'x', get_transient( fqj_cache_key( $post ) ) );
+		$this->assertSame( 'x', get_transient( rfsd_cache_key( $post ) ) );
 	}
 
 	public function test_faq_term_changes_do_not_clear_cache() {
 		$faq = $this->create_faq();
-		set_transient( fqj_cache_key( $faq ), 'x' );
+		set_transient( rfsd_cache_key( $faq ), 'x' );
 		wp_set_object_terms( $faq, array( 'a' ), 'post_tag' );
-		$this->assertSame( 'x', get_transient( fqj_cache_key( $faq ) ) );
+		$this->assertSame( 'x', get_transient( rfsd_cache_key( $faq ) ) );
 	}
 
 	public function test_slug_change_clears_url_mapped_cache() {
@@ -266,34 +266,34 @@ public function test_status_and_parent_change_clear_cache() {
 		$post   = self::factory()->post->create( array( 'post_type' => 'page' ) );
 		$parent = self::factory()->post->create( array( 'post_type' => 'page' ) );
 
-		set_transient( fqj_cache_key( $post ), 'x' );
+		set_transient( rfsd_cache_key( $post ), 'x' );
 		wp_update_post(
 			array(
 				'ID'          => $post,
 				'post_parent' => $parent,
 			)
 		);
-		$this->assertFalse( get_transient( fqj_cache_key( $post ) ) );
+		$this->assertFalse( get_transient( rfsd_cache_key( $post ) ) );
 
-		set_transient( fqj_cache_key( $post ), 'x' );
+		set_transient( rfsd_cache_key( $post ), 'x' );
 		wp_update_post(
 			array(
 				'ID'          => $post,
 				'post_status' => 'draft',
 			)
 		);
-		$this->assertFalse( get_transient( fqj_cache_key( $post ) ) );
+		$this->assertFalse( get_transient( rfsd_cache_key( $post ) ) );
 	}
 
 	public function test_title_change_keeps_cache() {
 		$post = self::factory()->post->create();
-		set_transient( fqj_cache_key( $post ), 'x' );
+		set_transient( rfsd_cache_key( $post ), 'x' );
 		wp_update_post(
 			array(
 				'ID'         => $post,
 				'post_title' => 'Different',
 			)
 		);
-		$this->assertSame( 'x', get_transient( fqj_cache_key( $post ) ) );
+		$this->assertSame( 'x', get_transient( rfsd_cache_key( $post ) ) );
 	}
 }
diff --git a/tests/php/test-post-type-migration.php b/tests/php/test-legacy-import.php
similarity index 58%
rename from tests/php/test-post-type-migration.php
rename to tests/php/test-legacy-import.php
index 7eaba2d..80a46c8 100644
--- a/tests/php/test-post-type-migration.php
+++ b/tests/php/test-legacy-import.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Renaming FAQ items stored under a legacy post type (faq_item) to FQJ_POST_TYPE.
+ * Renaming FAQ items stored under a legacy post type (faq_item) to RFSD_POST_TYPE.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Post type migration tests.
  */
-class Test_FQJ_Post_Type_Migration extends FQJ_TestCase {
+class Test_RFSD_Post_Type_Migration extends RFSD_TestCase {
 
 	/**
 	 * Create a FAQ stored under the legacy post type, as an older version saved it.
@@ -30,17 +30,17 @@ protected function create_legacy_faq( $payload = null, $args = array() ) {
 			)
 		);
 		if ( null !== $payload ) {
-			update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( $payload ) );
+			update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( $payload ) );
 		}
-		delete_option( FQJ_POST_TYPE_OPTION );
+		delete_option( RFSD_POST_TYPE_OPTION );
 
 		return $faq;
 	}
 
 	public function test_legacy_post_type_is_not_the_current_one() {
-		$this->assertSame( 'fqj_faq', FQJ_POST_TYPE );
-		$this->assertContains( 'faq_item', FQJ_LEGACY_POST_TYPES );
-		$this->assertNotContains( FQJ_POST_TYPE, FQJ_LEGACY_POST_TYPES );
+		$this->assertSame( 'rfsd_faq', RFSD_POST_TYPE );
+		$this->assertContains( 'faq_item', RFSD_LEGACY_POST_TYPES );
+		$this->assertNotContains( RFSD_POST_TYPE, RFSD_LEGACY_POST_TYPES );
 		$this->assertFalse( post_type_exists( 'faq_item' ) );
 	}
 
@@ -52,53 +52,53 @@ public function test_migration_renames_legacy_faqs_in_every_status() {
 		// Prime the object cache with the old post type.
 		$this->assertSame( 'faq_item', get_post( $published )->post_type );
 
-		fqj_migrate_legacy_post_types();
+		rfsd_migrate_legacy_post_types();
 
 		foreach ( array( $published, $draft, $trashed ) as $id ) {
-			$this->assertSame( FQJ_POST_TYPE, get_post( $id )->post_type, "post {$id}" );
+			$this->assertSame( RFSD_POST_TYPE, get_post( $id )->post_type, "post {$id}" );
 		}
 		$this->assertSame( 'post', get_post( $post )->post_type );
-		$this->assertSame( FQJ_POST_TYPE, get_option( FQJ_POST_TYPE_OPTION ) );
+		$this->assertSame( RFSD_POST_TYPE, get_option( RFSD_POST_TYPE_OPTION ) );
 	}
 
 	public function test_migration_runs_once_per_site() {
-		fqj_migrate_legacy_post_types();
-		$this->assertSame( FQJ_POST_TYPE, get_option( FQJ_POST_TYPE_OPTION ) );
+		rfsd_migrate_legacy_post_types();
+		$this->assertSame( RFSD_POST_TYPE, get_option( RFSD_POST_TYPE_OPTION ) );
 
 		// A legacy row added after the migration (e.g. by an import) is left alone; the option short-circuits.
 		$late = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
-		fqj_migrate_legacy_post_types();
+		rfsd_migrate_legacy_post_types();
 		$this->assertSame( 'faq_item', get_post( $late )->post_type );
 	}
 
 	public function test_migration_runs_before_the_schema_upgrade_and_data_migration() {
-		$migrate = has_action( 'plugins_loaded', 'fqj_migrate_legacy_post_types' );
+		$migrate = has_action( 'plugins_loaded', 'rfsd_migrate_legacy_post_types' );
 		$this->assertNotFalse( $migrate );
-		$this->assertLessThan( has_action( 'plugins_loaded', 'fqj_maybe_upgrade_db' ), $migrate );
-		$this->assertLessThan( has_action( 'plugins_loaded', 'fqj_maybe_schedule_data_migration' ), $migrate );
+		$this->assertLessThan( has_action( 'plugins_loaded', 'rfsd_maybe_upgrade_db' ), $migrate );
+		$this->assertLessThan( has_action( 'plugins_loaded', 'rfsd_maybe_schedule_data_migration' ), $migrate );
 	}
 
 	public function test_upgrade_from_data_version_2_reindexes_renamed_faqs() {
 		$post = self::factory()->post->create();
 		$faq  = $this->create_legacy_faq( array( 'posts' => array( $post ) ) );
-		update_option( FQJ_DATA_VERSION_OPTION, '2' );
+		update_option( RFSD_DATA_VERSION_OPTION, '2' );
 
-		fqj_migrate_legacy_post_types();
-		fqj_run_data_migration();
+		rfsd_migrate_legacy_post_types();
+		rfsd_run_data_migration();
 
-		$this->assertSame( FQJ_DATA_VERSION, get_option( FQJ_DATA_VERSION_OPTION ) );
-		$this->assertSame( array( $faq ), fqj_faq_ids_for_post( $post ) );
-		$this->assertStringContainsString( 'Legacy?', fqj_render_faq_jsonld( $post ) );
+		$this->assertSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
+		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $post ) );
+		$this->assertStringContainsString( 'Legacy?', rfsd_render_faq_jsonld( $post ) );
 	}
 
 	public function test_activation_renames_legacy_faqs_before_checking_for_faqs() {
 		$faq = $this->create_legacy_faq();
-		delete_option( FQJ_DATA_VERSION_OPTION );
+		delete_option( RFSD_DATA_VERSION_OPTION );
 
-		fqj_activate();
+		rfsd_activate();
 
-		$this->assertSame( FQJ_POST_TYPE, get_post( $faq )->post_type );
+		$this->assertSame( RFSD_POST_TYPE, get_post( $faq )->post_type );
 		// The site has FAQs, so the data migration still has to run on it.
-		$this->assertFalse( get_option( FQJ_DATA_VERSION_OPTION ) );
+		$this->assertFalse( get_option( RFSD_DATA_VERSION_OPTION ) );
 	}
 }
diff --git a/tests/php/test-multisite-uninstall.php b/tests/php/test-multisite-uninstall.php
index bfbde46..b1a88b5 100644
--- a/tests/php/test-multisite-uninstall.php
+++ b/tests/php/test-multisite-uninstall.php
@@ -2,7 +2,7 @@
 /**
  * Uninstall cleanup across a multisite network.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
@@ -15,7 +15,7 @@
  * @group multisite
  * @group uninstall
  */
-class Test_FQJ_Multisite_Uninstall extends FQJ_Multisite_TestCase {
+class Test_RFSD_Multisite_Uninstall extends RFSD_Multisite_TestCase {
 
 	/**
 	 * Sites created by the current test.
@@ -64,7 +64,7 @@ public function tear_down() {
 				wp_delete_site( $site_id );
 			}
 		}
-		fqj_activate();
+		rfsd_activate();
 		foreach ( $this->main_post_ids as $post_id ) {
 			wp_delete_post( $post_id, true );
 		}
@@ -86,19 +86,19 @@ private function create_sites_with_data( $count ) {
 		$data = array();
 		foreach ( array_merge( array( get_main_site_id() ), $this->site_ids ) as $site_id ) {
 			switch_to_blog( $site_id );
-			update_option( 'fqj_invalidation_log', array( array( 'processed' => 1 ) ) );
-			update_option( 'fqj_last_queue_run', time() );
-			update_option( 'fqj_cache_gen', 3 );
-			set_transient( fqj_cache_key( 1 ), 'x', 600 );
-			set_transient( 'fqj_rejected_urls_1_2', array( 'bad' ), 600 );
-			set_transient( 'fqj_invalidate_queue', array( 1 ) );
+			update_option( 'rfsd_invalidation_log', array( array( 'processed' => 1 ) ) );
+			update_option( 'rfsd_last_queue_run', time() );
+			update_option( 'rfsd_cache_gen', 3 );
+			set_transient( rfsd_cache_key( 1 ), 'x', 600 );
+			set_transient( 'rfsd_rejected_urls_1_2', array( 'bad' ), 600 );
+			set_transient( 'rfsd_invalidate_queue', array( 1 ) );
 			set_transient( 'keep_me', 'y', 600 );
-			wp_schedule_single_event( time() + 60, 'fqj_data_migration' );
-			fqj_queue_add_posts( array( 7 ) );
+			wp_schedule_single_event( time() + 60, 'rfsd_data_migration' );
+			rfsd_queue_add_posts( array( 7 ) );
 
 			$faq  = $this->create_faq( 'Q', 'A', array( 'global' => true ) );
 			$post = self::factory()->post->create();
-			update_post_meta( $faq, 'fqj_assoc_type', 'global' );
+			update_post_meta( $faq, 'rfsd_assoc_type', 'global' );
 			update_post_meta( $faq, 'unrelated_meta', 'keep' );
 			restore_current_blog();
 
@@ -121,9 +121,9 @@ private function run_uninstall() {
 		remove_filter( 'query', array( $this, '_create_temporary_tables' ) );
 		remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
 		if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
-			define( 'WP_UNINSTALL_PLUGIN', 'faq-jsonld/faq-jsonld.php' );
+			define( 'WP_UNINSTALL_PLUGIN', 'renderbit-faq-structured-data/renderbit-faq-structured-data.php' );
 		}
-		include FQJ_PLUGIN_DIR . 'uninstall.php';
+		include RFSD_PLUGIN_DIR . 'uninstall.php';
 	}
 
 	public function test_uninstall_cleans_every_site_and_keeps_faqs() {
@@ -143,20 +143,20 @@ public function test_uninstall_cleans_every_site_and_keeps_faqs() {
 			}
 
 			switch_to_blog( $site_id );
-			foreach ( array( FQJ_OPTION_KEY, FQJ_DB_VERSION_OPTION, FQJ_DATA_VERSION_OPTION, 'fqj_invalidation_log', 'fqj_last_queue_run', 'fqj_cache_gen' ) as $option ) {
+			foreach ( array( RFSD_OPTION_KEY, RFSD_DB_VERSION_OPTION, RFSD_DATA_VERSION_OPTION, 'rfsd_invalidation_log', 'rfsd_last_queue_run', 'rfsd_cache_gen' ) as $option ) {
 				$this->assertFalse( get_option( $option ), "{$option} on site {$site_id}" );
 			}
-			$this->assertFalse( get_transient( fqj_cache_key( 1 ) ), "site {$site_id}" );
-			$this->assertFalse( get_transient( 'fqj_rejected_urls_1_2' ), "site {$site_id}" );
-			$this->assertFalse( get_option( '_transient_timeout_fqj_rejected_urls_1_2' ), "site {$site_id}" );
-			$this->assertFalse( get_transient( 'fqj_invalidate_queue' ), "site {$site_id}" );
+			$this->assertFalse( get_transient( rfsd_cache_key( 1 ) ), "site {$site_id}" );
+			$this->assertFalse( get_transient( 'rfsd_rejected_urls_1_2' ), "site {$site_id}" );
+			$this->assertFalse( get_option( '_transient_timeout_rfsd_rejected_urls_1_2' ), "site {$site_id}" );
+			$this->assertFalse( get_transient( 'rfsd_invalidate_queue' ), "site {$site_id}" );
 			$this->assertSame( 'y', get_transient( 'keep_me' ), "site {$site_id}" );
-			$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ), "site {$site_id}" );
-			$this->assertFalse( wp_next_scheduled( 'fqj_data_migration' ), "site {$site_id}" );
+			$this->assertFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ), "site {$site_id}" );
+			$this->assertFalse( wp_next_scheduled( 'rfsd_data_migration' ), "site {$site_id}" );
 			$this->assertNotNull( get_post( $ids['faq'] ), "site {$site_id}" );
 			$this->assertNotNull( get_post( $ids['post'] ), "site {$site_id}" );
-			$this->assertSame( '', get_post_meta( $ids['faq'], 'fqj_assoc_type', true ), "site {$site_id}" );
-			$this->assertSame( '', get_post_meta( $ids['faq'], 'fqj_assoc_data_json', true ), "site {$site_id}" );
+			$this->assertSame( '', get_post_meta( $ids['faq'], 'rfsd_assoc_type', true ), "site {$site_id}" );
+			$this->assertSame( '', get_post_meta( $ids['faq'], 'rfsd_assoc_data_json', true ), "site {$site_id}" );
 			$this->assertSame( 'keep', get_post_meta( $ids['faq'], 'unrelated_meta', true ), "site {$site_id}" );
 			restore_current_blog();
 		}
@@ -164,11 +164,11 @@ public function test_uninstall_cleans_every_site_and_keeps_faqs() {
 
 	public function test_uninstall_deletes_faqs_on_every_site_when_filter_allows() {
 		$data = $this->create_sites_with_data( 2 );
-		add_filter( 'fqj_uninstall_delete_faqs', '__return_true' );
+		add_filter( 'rfsd_uninstall_delete_faqs', '__return_true' );
 
 		$this->run_uninstall();
 
-		remove_filter( 'fqj_uninstall_delete_faqs', '__return_true' );
+		remove_filter( 'rfsd_uninstall_delete_faqs', '__return_true' );
 		foreach ( $data as $site_id => $ids ) {
 			switch_to_blog( $site_id );
 			$this->assertNull( get_post( $ids['faq'] ), "site {$site_id}" );
diff --git a/tests/php/test-multisite.php b/tests/php/test-multisite.php
index 52bcf0c..61ab7cf 100644
--- a/tests/php/test-multisite.php
+++ b/tests/php/test-multisite.php
@@ -2,7 +2,7 @@
 /**
  * Network activation, new sites, network deactivation and per-site tables.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
@@ -11,16 +11,16 @@
  * @group ms-required
  * @group multisite
  */
-class Test_FQJ_Multisite extends FQJ_Multisite_TestCase {
+class Test_RFSD_Multisite extends RFSD_Multisite_TestCase {
 
 	public function test_for_each_site_switches_to_every_site_and_restores() {
 		$site_ids = self::factory()->blog->create_many( 2 );
 		$seen     = array();
 
-		fqj_for_each_site(
+		rfsd_for_each_site(
 			function () use ( &$seen ) {
 				global $wpdb;
-				$seen[ get_current_blog_id() ] = fqj_table_name() === $wpdb->prefix . 'fqj_mappings';
+				$seen[ get_current_blog_id() ] = rfsd_table_name() === $wpdb->prefix . 'rfsd_mappings';
 			}
 		);
 
@@ -38,10 +38,10 @@ public function test_network_activation_sets_up_every_site() {
 			foreach ( $this->plugin_tables( $site_id ) as $table ) {
 				$this->assertFalse( $this->table_exists( $table ), "{$table} should not exist before activation" );
 			}
-			$this->assertFalse( get_blog_option( $site_id, FQJ_OPTION_KEY ) );
+			$this->assertFalse( get_blog_option( $site_id, RFSD_OPTION_KEY ) );
 		}
 
-		fqj_activate( true );
+		rfsd_activate( true );
 
 		foreach ( array_merge( array( get_main_site_id() ), $site_ids ) as $site_id ) {
 			foreach ( $this->plugin_tables( $site_id ) as $table ) {
@@ -49,20 +49,20 @@ public function test_network_activation_sets_up_every_site() {
 			}
 
 			switch_to_blog( $site_id );
-			$opts       = get_option( FQJ_OPTION_KEY );
-			$db_version = get_option( FQJ_DB_VERSION_OPTION );
-			$data       = get_option( FQJ_DATA_VERSION_OPTION );
-			$next       = wp_next_scheduled( 'fqj_process_invalidation_queue' );
-			$schedule   = wp_get_schedule( 'fqj_process_invalidation_queue' );
+			$opts       = get_option( RFSD_OPTION_KEY );
+			$db_version = get_option( RFSD_DB_VERSION_OPTION );
+			$data       = get_option( RFSD_DATA_VERSION_OPTION );
+			$next       = wp_next_scheduled( 'rfsd_process_invalidation_queue' );
+			$schedule   = wp_get_schedule( 'rfsd_process_invalidation_queue' );
 			restore_current_blog();
 
 			$this->assertSame( 12 * HOUR_IN_SECONDS, $opts['cache_ttl'], "site {$site_id}" );
 			$this->assertSame( 500, $opts['batch_size'], "site {$site_id}" );
 			$this->assertSame( 'faqpage', $opts['output_type'], "site {$site_id}" );
-			$this->assertSame( FQJ_DB_VERSION, $db_version, "site {$site_id}" );
-			$this->assertSame( FQJ_DATA_VERSION, $data, "site {$site_id}" );
+			$this->assertSame( RFSD_DB_VERSION, $db_version, "site {$site_id}" );
+			$this->assertSame( RFSD_DATA_VERSION, $data, "site {$site_id}" );
 			$this->assertNotFalse( $next, "site {$site_id}" );
-			$this->assertSame( 'fqj_five_minutes', $schedule, "site {$site_id}" );
+			$this->assertSame( 'rfsd_five_minutes', $schedule, "site {$site_id}" );
 		}
 		$this->assertSame( get_main_site_id(), get_current_blog_id() );
 	}
@@ -70,10 +70,10 @@ public function test_network_activation_sets_up_every_site() {
 	public function test_site_activation_only_sets_up_current_site() {
 		$site_id = self::factory()->blog->create();
 
-		fqj_activate( false );
+		rfsd_activate( false );
 
-		$this->assertNotFalse( get_option( FQJ_OPTION_KEY ) );
-		$this->assertFalse( get_blog_option( $site_id, FQJ_OPTION_KEY ) );
+		$this->assertNotFalse( get_option( RFSD_OPTION_KEY ) );
+		$this->assertFalse( get_blog_option( $site_id, RFSD_OPTION_KEY ) );
 		foreach ( $this->plugin_tables( $site_id ) as $table ) {
 			$this->assertFalse( $this->table_exists( $table ) );
 		}
@@ -83,20 +83,20 @@ public function test_network_activation_keeps_each_sites_settings() {
 		$site_id = self::factory()->blog->create();
 		update_blog_option(
 			$site_id,
-			FQJ_OPTION_KEY,
+			RFSD_OPTION_KEY,
 			array(
 				'cache_ttl'   => 120,
 				'output_type' => 'FAQSection',
 			)
 		);
 
-		fqj_activate( true );
+		rfsd_activate( true );
 
-		$opts = get_blog_option( $site_id, FQJ_OPTION_KEY );
+		$opts = get_blog_option( $site_id, RFSD_OPTION_KEY );
 		$this->assertSame( 120, $opts['cache_ttl'] );
 		$this->assertSame( 500, $opts['batch_size'] );
 		$this->assertSame( 'faqpage', $opts['output_type'] );
-		$this->assertSame( 12 * HOUR_IN_SECONDS, get_option( FQJ_OPTION_KEY )['cache_ttl'] );
+		$this->assertSame( 12 * HOUR_IN_SECONDS, get_option( RFSD_OPTION_KEY )['cache_ttl'] );
 	}
 
 	public function test_network_activation_renames_legacy_faqs_on_every_site() {
@@ -105,17 +105,17 @@ public function test_network_activation_renames_legacy_faqs_on_every_site() {
 		foreach ( array( get_main_site_id(), $site_id ) as $id ) {
 			switch_to_blog( $id );
 			$faqs[ $id ] = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
-			delete_option( FQJ_POST_TYPE_OPTION );
+			delete_option( RFSD_POST_TYPE_OPTION );
 			restore_current_blog();
 		}
 
-		fqj_activate( true );
+		rfsd_activate( true );
 
 		foreach ( $faqs as $id => $faq ) {
 			switch_to_blog( $id );
 			$type = get_post( $faq )->post_type;
 			restore_current_blog();
-			$this->assertSame( FQJ_POST_TYPE, $type, "site {$id}" );
+			$this->assertSame( RFSD_POST_TYPE, $type, "site {$id}" );
 		}
 	}
 
@@ -128,29 +128,29 @@ public function test_new_site_is_set_up_when_network_active() {
 			$this->assertTrue( $this->table_exists( $table ), "{$table} should exist" );
 		}
 		switch_to_blog( $site_id );
-		$opts       = get_option( FQJ_OPTION_KEY );
-		$db_version = get_option( FQJ_DB_VERSION_OPTION );
-		$next       = wp_next_scheduled( 'fqj_process_invalidation_queue' );
+		$opts       = get_option( RFSD_OPTION_KEY );
+		$db_version = get_option( RFSD_DB_VERSION_OPTION );
+		$next       = wp_next_scheduled( 'rfsd_process_invalidation_queue' );
 		restore_current_blog();
 
 		$this->assertSame( 500, $opts['batch_size'] );
-		$this->assertSame( FQJ_DB_VERSION, $db_version );
+		$this->assertSame( RFSD_DB_VERSION, $db_version );
 		$this->assertNotFalse( $next );
 		$this->assertSame( get_main_site_id(), get_current_blog_id() );
 	}
 
 	public function test_new_site_is_left_alone_when_not_network_active() {
-		$this->assertFalse( is_plugin_active_for_network( plugin_basename( FQJ_PLUGIN_DIR . 'faq-jsonld.php' ) ) );
+		$this->assertFalse( is_plugin_active_for_network( plugin_basename( RFSD_PLUGIN_DIR . 'renderbit-faq-structured-data.php' ) ) );
 
 		$site_id = self::factory()->blog->create();
 
 		foreach ( $this->plugin_tables( $site_id ) as $table ) {
 			$this->assertFalse( $this->table_exists( $table ), "{$table} should not exist" );
 		}
-		$this->assertFalse( get_blog_option( $site_id, FQJ_OPTION_KEY ) );
-		$this->assertFalse( get_blog_option( $site_id, FQJ_DB_VERSION_OPTION ) );
+		$this->assertFalse( get_blog_option( $site_id, RFSD_OPTION_KEY ) );
+		$this->assertFalse( get_blog_option( $site_id, RFSD_DB_VERSION_OPTION ) );
 		switch_to_blog( $site_id );
-		$next = wp_next_scheduled( 'fqj_process_invalidation_queue' );
+		$next = wp_next_scheduled( 'rfsd_process_invalidation_queue' );
 		restore_current_blog();
 		$this->assertFalse( $next );
 	}
@@ -160,18 +160,18 @@ public function test_network_deactivation_clears_cron_on_every_site() {
 		$all      = array_merge( array( get_main_site_id() ), $site_ids );
 		foreach ( $all as $site_id ) {
 			switch_to_blog( $site_id );
-			wp_schedule_event( time() + 60, 'fqj_five_minutes', 'fqj_process_invalidation_queue' );
-			wp_schedule_single_event( time() + 10, 'fqj_data_migration' );
+			wp_schedule_event( time() + 60, 'rfsd_five_minutes', 'rfsd_process_invalidation_queue' );
+			wp_schedule_single_event( time() + 10, 'rfsd_data_migration' );
 			wp_schedule_single_event( time() + 10, 'unrelated_event' );
 			restore_current_blog();
 		}
 
-		fqj_deactivate( true );
+		rfsd_deactivate( true );
 
 		foreach ( $all as $site_id ) {
 			switch_to_blog( $site_id );
-			$queue     = wp_next_scheduled( 'fqj_process_invalidation_queue' );
-			$migration = wp_next_scheduled( 'fqj_data_migration' );
+			$queue     = wp_next_scheduled( 'rfsd_process_invalidation_queue' );
+			$migration = wp_next_scheduled( 'rfsd_data_migration' );
 			$unrelated = wp_next_scheduled( 'unrelated_event' );
 			restore_current_blog();
 
@@ -184,15 +184,15 @@ public function test_network_deactivation_clears_cron_on_every_site() {
 	public function test_site_deactivation_only_clears_current_site() {
 		$site_id = self::factory()->blog->create();
 		switch_to_blog( $site_id );
-		wp_schedule_event( time() + 60, 'fqj_five_minutes', 'fqj_process_invalidation_queue' );
+		wp_schedule_event( time() + 60, 'rfsd_five_minutes', 'rfsd_process_invalidation_queue' );
 		restore_current_blog();
-		wp_schedule_event( time() + 60, 'fqj_five_minutes', 'fqj_process_invalidation_queue' );
+		wp_schedule_event( time() + 60, 'rfsd_five_minutes', 'rfsd_process_invalidation_queue' );
 
-		fqj_deactivate( false );
+		rfsd_deactivate( false );
 
-		$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
+		$this->assertFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
 		switch_to_blog( $site_id );
-		$next = wp_next_scheduled( 'fqj_process_invalidation_queue' );
+		$next = wp_next_scheduled( 'rfsd_process_invalidation_queue' );
 		restore_current_blog();
 		$this->assertNotFalse( $next );
 	}
@@ -200,18 +200,18 @@ public function test_site_deactivation_only_clears_current_site() {
 	public function test_table_names_follow_switched_site() {
 		global $wpdb;
 		$site_id = self::factory()->blog->create();
-		$main    = fqj_table_name();
-		$queue   = fqj_queue_table_name();
+		$main    = rfsd_table_name();
+		$queue   = rfsd_queue_table_name();
 
 		switch_to_blog( $site_id );
-		$this->assertSame( $wpdb->get_blog_prefix( $site_id ) . 'fqj_mappings', fqj_table_name() );
-		$this->assertSame( $wpdb->get_blog_prefix( $site_id ) . 'fqj_queue', fqj_queue_table_name() );
-		$this->assertNotSame( $main, fqj_table_name() );
-		$this->assertNotSame( $queue, fqj_queue_table_name() );
+		$this->assertSame( $wpdb->get_blog_prefix( $site_id ) . 'rfsd_mappings', rfsd_table_name() );
+		$this->assertSame( $wpdb->get_blog_prefix( $site_id ) . 'rfsd_queue', rfsd_queue_table_name() );
+		$this->assertNotSame( $main, rfsd_table_name() );
+		$this->assertNotSame( $queue, rfsd_queue_table_name() );
 		restore_current_blog();
 
-		$this->assertSame( $main, fqj_table_name() );
-		$this->assertSame( $queue, fqj_queue_table_name() );
+		$this->assertSame( $main, rfsd_table_name() );
+		$this->assertSame( $queue, rfsd_queue_table_name() );
 	}
 
 	public function test_index_and_queue_writes_stay_on_switched_site() {
@@ -220,7 +220,7 @@ public function test_index_and_queue_writes_stay_on_switched_site() {
 
 		switch_to_blog( $site_id );
 		$faq = $this->create_faq( 'Q', 'A', array( 'global' => true ) );
-		fqj_queue_add_posts( array( 42 ) );
+		rfsd_queue_add_posts( array( 42 ) );
 		$site_mappings = $this->get_mappings( $faq );
 		$site_queue    = $this->get_queue();
 		restore_current_blog();
@@ -248,8 +248,8 @@ public function test_url_migration_runs_per_site_with_site_relative_urls() {
 		$post      = self::factory()->post->create( array( 'post_name' => 'about' ) );
 		$shortlink = home_url( '/?p=' . $post );
 		$faq       = $this->create_faq( 'Q', 'A' );
-		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array( 'urls' => array( $shortlink ) ) ) );
-		fqj_insert_mappings(
+		update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array( 'urls' => array( $shortlink ) ) ) );
+		rfsd_insert_mappings(
 			$faq,
 			array(
 				array(
@@ -262,13 +262,13 @@ public function test_url_migration_runs_per_site_with_site_relative_urls() {
 				),
 			)
 		);
-		update_option( FQJ_DATA_VERSION_OPTION, '2' );
-		fqj_run_data_migration();
+		update_option( RFSD_DATA_VERSION_OPTION, '2' );
+		rfsd_run_data_migration();
 
-		$site_report   = get_option( FQJ_URL_MIGRATION_REPORT_OPTION );
+		$site_report   = get_option( RFSD_URL_MIGRATION_REPORT_OPTION );
 		$site_mappings = $this->get_mappings( $faq );
-		$site_matches  = fqj_faq_ids_for_post( $post );
-		$main_url      = fqj_normalize_url( network_home_url( '/about/' ) );
+		$site_matches  = rfsd_faq_ids_for_post( $post );
+		$main_url      = rfsd_normalize_url( network_home_url( '/about/' ) );
 		$permalink     = get_permalink( $post );
 		restore_current_blog();
 
@@ -284,6 +284,6 @@ public function test_url_migration_runs_per_site_with_site_relative_urls() {
 		);
 		$this->assertSame( array( $faq ), $site_matches );
 		$this->assertSame( untrailingslashit( network_home_url( '/about/' ) ), $main_url, 'The main site is outside this site\'s root.' );
-		$this->assertFalse( get_option( FQJ_URL_MIGRATION_REPORT_OPTION ) );
+		$this->assertFalse( get_option( RFSD_URL_MIGRATION_REPORT_OPTION ) );
 	}
 }
diff --git a/tests/php/test-plugin.php b/tests/php/test-plugin.php
index 3b7cd0e..1bfb728 100644
--- a/tests/php/test-plugin.php
+++ b/tests/php/test-plugin.php
@@ -2,38 +2,38 @@
 /**
  * Plugin bootstrap, CPT, activation and deactivation.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Plugin-level tests.
  */
-class Test_FQJ_Plugin extends FQJ_TestCase {
+class Test_RFSD_Plugin extends RFSD_TestCase {
 
 	public function test_constants_are_defined() {
 		global $wpdb;
-		$this->assertSame( $wpdb->prefix . 'fqj_mappings', fqj_table_name() );
-		$this->assertSame( 'fqj_settings', FQJ_OPTION_KEY );
-		$this->assertStringEndsWith( '/', FQJ_PLUGIN_DIR );
-		$this->assertFileExists( FQJ_PLUGIN_DIR . 'faq-jsonld.php' );
+		$this->assertSame( $wpdb->prefix . 'rfsd_mappings', rfsd_table_name() );
+		$this->assertSame( 'rfsd_settings', RFSD_OPTION_KEY );
+		$this->assertStringEndsWith( '/', RFSD_PLUGIN_DIR );
+		$this->assertFileExists( RFSD_PLUGIN_DIR . 'renderbit-faq-structured-data.php' );
 	}
 
 	public function test_faq_post_type_is_registered() {
-		$this->assertTrue( post_type_exists( 'fqj_faq' ) );
+		$this->assertTrue( post_type_exists( 'rfsd_faq' ) );
 
-		$pt = get_post_type_object( 'fqj_faq' );
+		$pt = get_post_type_object( 'rfsd_faq' );
 		$this->assertFalse( $pt->public );
 		$this->assertTrue( $pt->show_ui );
 		$this->assertFalse( $pt->hierarchical );
 		$this->assertFalse( $pt->has_archive );
 		$this->assertSame( 'FAQ Items', $pt->labels->name );
-		$this->assertTrue( post_type_supports( 'fqj_faq', 'title' ) );
-		$this->assertTrue( post_type_supports( 'fqj_faq', 'editor' ) );
+		$this->assertTrue( post_type_supports( 'rfsd_faq', 'title' ) );
+		$this->assertTrue( post_type_supports( 'rfsd_faq', 'editor' ) );
 	}
 
 	public function test_activation_creates_table() {
 		global $wpdb;
-		$table = fqj_table_name();
+		$table = rfsd_table_name();
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
 		$this->assertSame( $table, $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $table ) ) );
 
@@ -43,10 +43,10 @@ public function test_activation_creates_table() {
 	}
 
 	public function test_activation_sets_default_options() {
-		delete_option( FQJ_OPTION_KEY );
-		fqj_activate();
+		delete_option( RFSD_OPTION_KEY );
+		rfsd_activate();
 
-		$opts = get_option( FQJ_OPTION_KEY );
+		$opts = get_option( RFSD_OPTION_KEY );
 		$this->assertSame( 12 * HOUR_IN_SECONDS, $opts['cache_ttl'] );
 		$this->assertSame( 500, $opts['batch_size'] );
 		$this->assertSame( 'faqpage', $opts['output_type'] );
@@ -54,9 +54,15 @@ public function test_activation_sets_default_options() {
 	}
 
 	public function test_version_constant_matches_plugin_header() {
-		$data = get_file_data( FQJ_PLUGIN_DIR . 'faq-jsonld.php', array( 'Version' => 'Version', 'TextDomain' => 'Text Domain' ) );
-		$this->assertSame( $data['Version'], FQJ_VERSION );
-		$this->assertSame( 'faq-jsonld', $data['TextDomain'] );
+		$data = get_file_data(
+			RFSD_PLUGIN_DIR . 'renderbit-faq-structured-data.php',
+			array(
+				'Version'    => 'Version',
+				'TextDomain' => 'Text Domain',
+			)
+		);
+		$this->assertSame( $data['Version'], RFSD_VERSION );
+		$this->assertSame( 'renderbit-faq-structured-data', $data['TextDomain'] );
 	}
 
 	public function test_activation_migrates_legacy_transient_queue() {
@@ -66,55 +72,55 @@ public function test_activation_migrates_legacy_transient_queue() {
 		$legacy = function () {
 			return array( 5, 6 );
 		};
-		add_filter( 'pre_transient_fqj_invalidate_queue', $legacy );
-		fqj_activate();
-		remove_filter( 'pre_transient_fqj_invalidate_queue', $legacy );
+		add_filter( 'pre_transient_rfsd_invalidate_queue', $legacy );
+		rfsd_activate();
+		remove_filter( 'pre_transient_rfsd_invalidate_queue', $legacy );
 		$this->assertSame( array( 5, 6 ), $this->get_queue() );
 	}
 
 	public function test_activation_keeps_existing_options() {
 		update_option(
-			FQJ_OPTION_KEY,
+			RFSD_OPTION_KEY,
 			array(
 				'cache_ttl'   => 120,
 				'output_type' => 'faqpage',
 			)
 		);
-		fqj_activate();
+		rfsd_activate();
 
-		$opts = get_option( FQJ_OPTION_KEY );
+		$opts = get_option( RFSD_OPTION_KEY );
 		$this->assertSame( 120, $opts['cache_ttl'] );
 		$this->assertSame( 'faqpage', $opts['output_type'] );
 		$this->assertSame( 500, $opts['batch_size'] );
 	}
 
 	public function test_activation_schedules_queue_cron_once() {
-		wp_clear_scheduled_hook( 'fqj_process_invalidation_queue' );
-		fqj_activate();
+		wp_clear_scheduled_hook( 'rfsd_process_invalidation_queue' );
+		rfsd_activate();
 
-		$first = wp_next_scheduled( 'fqj_process_invalidation_queue' );
+		$first = wp_next_scheduled( 'rfsd_process_invalidation_queue' );
 		$this->assertNotFalse( $first );
-		$this->assertSame( 'fqj_five_minutes', wp_get_schedule( 'fqj_process_invalidation_queue' ) );
+		$this->assertSame( 'rfsd_five_minutes', wp_get_schedule( 'rfsd_process_invalidation_queue' ) );
 
-		fqj_activate();
-		$this->assertSame( $first, wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
+		rfsd_activate();
+		$this->assertSame( $first, wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
 	}
 
 	public function test_deactivation_clears_cron() {
-		fqj_activate();
-		fqj_deactivate();
-		$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
+		rfsd_activate();
+		rfsd_deactivate();
+		$this->assertFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
 	}
 
 	public function test_deactivation_clears_duplicate_and_migration_events() {
-		wp_schedule_event( time() + 60, 'fqj_five_minutes', 'fqj_process_invalidation_queue' );
-		wp_schedule_event( time() + 120, 'hourly', 'fqj_process_invalidation_queue' );
-		wp_schedule_single_event( time() + 10, 'fqj_data_migration' );
+		wp_schedule_event( time() + 60, 'rfsd_five_minutes', 'rfsd_process_invalidation_queue' );
+		wp_schedule_event( time() + 120, 'hourly', 'rfsd_process_invalidation_queue' );
+		wp_schedule_single_event( time() + 10, 'rfsd_data_migration' );
 
-		fqj_deactivate();
+		rfsd_deactivate();
 
-		$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
-		$this->assertFalse( wp_next_scheduled( 'fqj_data_migration' ) );
+		$this->assertFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
+		$this->assertFalse( wp_next_scheduled( 'rfsd_data_migration' ) );
 	}
 
 	/**
@@ -124,11 +130,11 @@ public function test_network_wide_flag_is_harmless_on_single_site() {
 		if ( is_multisite() ) {
 			$this->markTestSkipped( 'Single-site behaviour.' );
 		}
-		wp_clear_scheduled_hook( 'fqj_process_invalidation_queue' );
-		fqj_activate( true );
-		$this->assertNotFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
-		fqj_deactivate( true );
-		$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
+		wp_clear_scheduled_hook( 'rfsd_process_invalidation_queue' );
+		rfsd_activate( true );
+		$this->assertNotFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
+		rfsd_deactivate( true );
+		$this->assertFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
 	}
 
 	/**
@@ -139,7 +145,7 @@ public function test_for_each_site_runs_once_on_single_site() {
 			$this->markTestSkipped( 'Single-site behaviour.' );
 		}
 		$calls = 0;
-		fqj_for_each_site(
+		rfsd_for_each_site(
 			function () use ( &$calls ) {
 				++$calls;
 			}
@@ -148,41 +154,41 @@ function () use ( &$calls ) {
 	}
 
 	public function test_new_site_is_ignored_when_not_network_active() {
-		$this->assertNotFalse( has_action( 'wp_initialize_site', 'fqj_on_initialize_site' ) );
-		wp_clear_scheduled_hook( 'fqj_process_invalidation_queue' );
-		fqj_on_initialize_site( (object) array( 'blog_id' => get_current_blog_id() ) );
-		$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
+		$this->assertNotFalse( has_action( 'wp_initialize_site', 'rfsd_on_initialize_site' ) );
+		wp_clear_scheduled_hook( 'rfsd_process_invalidation_queue' );
+		rfsd_on_initialize_site( (object) array( 'blog_id' => get_current_blog_id() ) );
+		$this->assertFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
 	}
 
 	public function test_table_name_follows_current_blog_prefix() {
 		global $wpdb;
 		$original     = $wpdb->prefix;
 		$wpdb->prefix = 'other_'; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-		$name         = fqj_table_name();
+		$name         = rfsd_table_name();
 		$wpdb->prefix = $original; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
-		$this->assertSame( 'other_fqj_mappings', $name );
+		$this->assertSame( 'other_rfsd_mappings', $name );
 	}
 
 	public function test_deactivation_without_scheduled_event_is_safe() {
-		wp_clear_scheduled_hook( 'fqj_process_invalidation_queue' );
-		fqj_deactivate();
-		$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
+		wp_clear_scheduled_hook( 'rfsd_process_invalidation_queue' );
+		rfsd_deactivate();
+		$this->assertFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
 	}
 
 	public function test_five_minute_cron_interval_is_registered() {
 		$schedules = wp_get_schedules();
-		$this->assertArrayHasKey( 'fqj_five_minutes', $schedules );
-		$this->assertSame( 300, $schedules['fqj_five_minutes']['interval'] );
+		$this->assertArrayHasKey( 'rfsd_five_minutes', $schedules );
+		$this->assertSame( 300, $schedules['rfsd_five_minutes']['interval'] );
 	}
 
 	public function test_cron_interval_filter_keeps_existing_definition() {
 		$existing = array(
-			'fqj_five_minutes' => array(
+			'rfsd_five_minutes' => array(
 				'interval' => 42,
 				'display'  => 'Custom',
 			),
 		);
-		$this->assertSame( $existing, fqj_add_cron_interval( $existing ) );
+		$this->assertSame( $existing, rfsd_add_cron_interval( $existing ) );
 	}
 
 	/**
@@ -197,31 +203,31 @@ public function test_hooks_are_registered( $hook, $callback ) {
 
 	public function hook_provider() {
 		return array(
-			array( 'init', 'fqj_register_cpt_faq_item' ),
-			array( 'wp_head', 'fqj_maybe_print_faq_jsonld' ),
-			array( 'save_post', 'fqj_save_meta_handler' ),
-			array( 'add_meta_boxes', 'fqj_add_meta_boxes' ),
-			array( 'admin_enqueue_scripts', 'fqj_admin_assets' ),
-			array( 'admin_enqueue_scripts', 'fqj_health_admin_assets' ),
-			array( 'admin_menu', 'fqj_register_settings_page' ),
-			array( 'admin_menu', 'fqj_register_health_page' ),
-			array( 'admin_notices', 'fqj_admin_queue_notice' ),
-			array( 'fqj_process_invalidation_queue', 'fqj_process_invalidation_queue_cron' ),
-			array( 'wp_ajax_fqj_search_posts', 'fqj_ajax_search_posts' ),
-			array( 'wp_ajax_fqj_search_terms', 'fqj_ajax_search_terms' ),
-			array( 'wp_ajax_fqj_get_post_types', 'fqj_ajax_get_post_types' ),
-			array( 'wp_ajax_fqj_process_queue_now', 'fqj_ajax_process_queue_now' ),
-			array( 'wp_ajax_fqj_purge_transients', 'fqj_ajax_purge_transients' ),
-			array( 'wp_ajax_fqj_clear_invalidation_log', 'fqj_ajax_clear_invalidation_log' ),
+			array( 'init', 'rfsd_register_cpt_faq_item' ),
+			array( 'wp_head', 'rfsd_maybe_print_faq_jsonld' ),
+			array( 'save_post', 'rfsd_save_meta_handler' ),
+			array( 'add_meta_boxes', 'rfsd_add_meta_boxes' ),
+			array( 'admin_enqueue_scripts', 'rfsd_admin_assets' ),
+			array( 'admin_enqueue_scripts', 'rfsd_health_admin_assets' ),
+			array( 'admin_menu', 'rfsd_register_settings_page' ),
+			array( 'admin_menu', 'rfsd_register_health_page' ),
+			array( 'admin_notices', 'rfsd_admin_queue_notice' ),
+			array( 'rfsd_process_invalidation_queue', 'rfsd_process_invalidation_queue_cron' ),
+			array( 'wp_ajax_rfsd_search_posts', 'rfsd_ajax_search_posts' ),
+			array( 'wp_ajax_rfsd_search_terms', 'rfsd_ajax_search_terms' ),
+			array( 'wp_ajax_rfsd_get_post_types', 'rfsd_ajax_get_post_types' ),
+			array( 'wp_ajax_rfsd_process_queue_now', 'rfsd_ajax_process_queue_now' ),
+			array( 'wp_ajax_rfsd_purge_transients', 'rfsd_ajax_purge_transients' ),
+			array( 'wp_ajax_rfsd_clear_invalidation_log', 'rfsd_ajax_clear_invalidation_log' ),
 		);
 	}
 
 	public function test_wp_head_priority_is_early() {
-		$this->assertSame( 1, has_action( 'wp_head', 'fqj_maybe_print_faq_jsonld' ) );
+		$this->assertSame( 1, has_action( 'wp_head', 'rfsd_maybe_print_faq_jsonld' ) );
 	}
 
 	public function test_ajax_actions_are_not_public() {
-		foreach ( array( 'fqj_search_posts', 'fqj_search_terms', 'fqj_get_post_types', 'fqj_process_queue_now', 'fqj_purge_transients', 'fqj_clear_invalidation_log' ) as $action ) {
+		foreach ( array( 'rfsd_search_posts', 'rfsd_search_terms', 'rfsd_get_post_types', 'rfsd_process_queue_now', 'rfsd_purge_transients', 'rfsd_clear_invalidation_log' ) as $action ) {
 			$this->assertFalse( has_action( 'wp_ajax_nopriv_' . $action ), $action );
 		}
 	}
diff --git a/tests/php/test-queue.php b/tests/php/test-queue.php
index 4601c85..d089365 100644
--- a/tests/php/test-queue.php
+++ b/tests/php/test-queue.php
@@ -2,195 +2,195 @@
 /**
  * Invalidation queue, worker and run log.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Queue tests.
  */
-class Test_FQJ_Queue extends FQJ_TestCase {
+class Test_RFSD_Queue extends RFSD_TestCase {
 
 	public function set_up() {
 		parent::set_up();
-		delete_option( 'fqj_invalidation_log' );
-		delete_option( 'fqj_last_queue_run' );
+		delete_option( 'rfsd_invalidation_log' );
+		delete_option( 'rfsd_last_queue_run' );
 	}
 
 	public function test_add_rejects_empty_input() {
-		$this->assertFalse( fqj_queue_add_posts( array() ) );
-		$this->assertFalse( fqj_queue_add_posts( array( 0, '0', 'abc', null ) ) );
-		$this->assertSame( 0, fqj_queue_length() );
+		$this->assertFalse( rfsd_queue_add_posts( array() ) );
+		$this->assertFalse( rfsd_queue_add_posts( array( 0, '0', 'abc', null ) ) );
+		$this->assertSame( 0, rfsd_queue_length() );
 	}
 
 	public function test_add_casts_and_skips_already_queued_ids() {
-		$this->assertTrue( fqj_queue_add_posts( array( '3', 1, 0, '2' ) ) );
-		$this->assertTrue( fqj_queue_add_posts( array( 2, '4', 3 ) ) );
+		$this->assertTrue( rfsd_queue_add_posts( array( '3', 1, 0, '2' ) ) );
+		$this->assertTrue( rfsd_queue_add_posts( array( 2, '4', 3 ) ) );
 
 		$this->assertSame( array( 3, 1, 2, 4 ), $this->get_queue() );
 	}
 
 	public function test_add_dedupes_ids_within_one_call() {
-		$this->assertTrue( fqj_queue_add_posts( array( 3, 1, 3 ) ) );
+		$this->assertTrue( rfsd_queue_add_posts( array( 3, 1, 3 ) ) );
 
 		$this->assertSame( array( 3, 1 ), $this->get_queue() );
 	}
 
 	public function test_add_items_rejects_unknown_type_and_sanitizes_values() {
-		$this->assertFalse( fqj_queue_add_items( 'bogus', array( 1 ) ) );
-		$this->assertTrue( fqj_queue_add_items( 'post_type', array( "pa'ge; DROP", 'Page' ) ) );
+		$this->assertFalse( rfsd_queue_add_items( 'bogus', array( 1 ) ) );
+		$this->assertTrue( rfsd_queue_add_items( 'post_type', array( "pa'ge; DROP", 'Page' ) ) );
 		$this->assertSame( 'pagedrop', $this->get_queue_jobs()[0]['item_value'] );
 		$this->assertCount( 2, $this->get_queue_jobs() );
 	}
 
 	public function test_add_handles_large_batches() {
-		fqj_queue_add_posts( range( 1, 450 ) );
-		$this->assertSame( 450, fqj_queue_length() );
+		rfsd_queue_add_posts( range( 1, 450 ) );
+		$this->assertSame( 450, rfsd_queue_length() );
 	}
 
 	public function test_readding_a_job_restarts_its_cursor() {
 		global $wpdb;
-		fqj_queue_add_items( 'post_type', array( 'page' ) );
-		$table = fqj_queue_table_name();
+		rfsd_queue_add_items( 'post_type', array( 'page' ) );
+		$table = rfsd_queue_table_name();
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
 		$wpdb->query( "UPDATE {$table} SET job_cursor = 50" ); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-		fqj_queue_add_items( 'post_type', array( 'page' ) );
+		rfsd_queue_add_items( 'post_type', array( 'page' ) );
 		$jobs = $this->get_queue_jobs();
 		$this->assertCount( 1, $jobs );
 		$this->assertSame( '0', $jobs[0]['job_cursor'] );
 	}
 
 	public function test_post_pop_ignores_jobs_and_items_added_meanwhile_survive() {
-		fqj_queue_add_items( 'term', array( 5 ) );
-		fqj_queue_add_posts( array( 1, 2 ) );
-		$this->assertSame( array( 1, 2 ), fqj_queue_pop_posts() );
-		$this->assertSame( 1, fqj_queue_length(), 'The job is still queued.' );
-		$this->assertSame( array(), fqj_queue_pop_posts( 0 ) );
+		rfsd_queue_add_items( 'term', array( 5 ) );
+		rfsd_queue_add_posts( array( 1, 2 ) );
+		$this->assertSame( array( 1, 2 ), rfsd_queue_pop_posts() );
+		$this->assertSame( 1, rfsd_queue_length(), 'The job is still queued.' );
+		$this->assertSame( array(), rfsd_queue_pop_posts( 0 ) );
 	}
 
 	public function test_legacy_transient_queue_is_migrated_on_upgrade() {
-		set_transient( 'fqj_invalidate_queue', array( 4, 5, 4 ), DAY_IN_SECONDS );
-		update_option( FQJ_DB_VERSION_OPTION, '1' );
-		update_option( 'fqj_invalidation_log', array( array( 'ts' => 1 ) ), true );
+		set_transient( 'rfsd_invalidate_queue', array( 4, 5, 4 ), DAY_IN_SECONDS );
+		update_option( RFSD_DB_VERSION_OPTION, '1' );
+		update_option( 'rfsd_invalidation_log', array( array( 'ts' => 1 ) ), true );
 
-		fqj_maybe_upgrade_db();
+		rfsd_maybe_upgrade_db();
 
 		$this->assertSame( array( 4, 5 ), $this->get_queue() );
-		$this->assertFalse( get_transient( 'fqj_invalidate_queue' ) );
-		$this->assertSame( FQJ_DB_VERSION, get_option( FQJ_DB_VERSION_OPTION ) );
-		$this->assertNotContains( 'fqj_invalidation_log', array_keys( wp_load_alloptions( true ) ) );
+		$this->assertFalse( get_transient( 'rfsd_invalidate_queue' ) );
+		$this->assertSame( RFSD_DB_VERSION, get_option( RFSD_DB_VERSION_OPTION ) );
+		$this->assertNotContains( 'rfsd_invalidation_log', array_keys( wp_load_alloptions( true ) ) );
 	}
 
 	public function test_corrupt_legacy_transient_is_discarded() {
-		set_transient( 'fqj_invalidate_queue', 'garbage' );
-		fqj_migrate_legacy_queue();
-		$this->assertSame( 0, fqj_queue_length() );
-		$this->assertFalse( get_transient( 'fqj_invalidate_queue' ) );
+		set_transient( 'rfsd_invalidate_queue', 'garbage' );
+		rfsd_migrate_legacy_queue();
+		$this->assertSame( 0, rfsd_queue_length() );
+		$this->assertFalse( get_transient( 'rfsd_invalidate_queue' ) );
 	}
 
 	public function test_cron_event_is_rescheduled_when_missing() {
-		wp_clear_scheduled_hook( 'fqj_process_invalidation_queue' );
+		wp_clear_scheduled_hook( 'rfsd_process_invalidation_queue' );
 		do_action( 'init' );
-		$this->assertNotFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
+		$this->assertNotFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
 	}
 
 	public function test_length() {
-		$this->assertSame( 0, fqj_queue_length() );
-		fqj_queue_add_posts( array( 1, 2, 3 ) );
-		$this->assertSame( 3, fqj_queue_length() );
+		$this->assertSame( 0, rfsd_queue_length() );
+		rfsd_queue_add_posts( array( 1, 2, 3 ) );
+		$this->assertSame( 3, rfsd_queue_length() );
 	}
 
 	public function test_pop_is_fifo_and_respects_limit() {
-		fqj_queue_add_posts( array( 10, 20, 30, 40, 50 ) );
+		rfsd_queue_add_posts( array( 10, 20, 30, 40, 50 ) );
 
-		$this->assertSame( array( 10, 20 ), fqj_queue_pop_posts( 2 ) );
+		$this->assertSame( array( 10, 20 ), rfsd_queue_pop_posts( 2 ) );
 		$this->assertSame( array( 30, 40, 50 ), $this->get_queue() );
-		$this->assertSame( array( 30, 40, 50 ), fqj_queue_pop_posts( 100 ) );
-		$this->assertSame( 0, fqj_queue_length() );
+		$this->assertSame( array( 30, 40, 50 ), rfsd_queue_pop_posts( 100 ) );
+		$this->assertSame( 0, rfsd_queue_length() );
 	}
 
 	public function test_pop_default_limit_is_100() {
-		fqj_queue_add_posts( range( 1, 150 ) );
-		$this->assertCount( 100, fqj_queue_pop_posts() );
-		$this->assertSame( 50, fqj_queue_length() );
+		rfsd_queue_add_posts( range( 1, 150 ) );
+		$this->assertCount( 100, rfsd_queue_pop_posts() );
+		$this->assertSame( 50, rfsd_queue_length() );
 	}
 
 	public function test_pop_on_empty_queue() {
-		$this->assertSame( array(), fqj_queue_pop_posts() );
+		$this->assertSame( array(), rfsd_queue_pop_posts() );
 	}
 
 	public function test_log_run_records_newest_first() {
-		fqj_log_invalidation_run( 3, array( 1, 2, 3 ) );
-		fqj_log_invalidation_run( 1, array( '7' ) );
+		rfsd_log_invalidation_run( 3, array( 1, 2, 3 ) );
+		rfsd_log_invalidation_run( 1, array( '7' ) );
 
-		$log = get_option( 'fqj_invalidation_log' );
+		$log = get_option( 'rfsd_invalidation_log' );
 		$this->assertCount( 2, $log );
 		$this->assertSame( 1, $log[0]['processed'] );
 		$this->assertSame( array( 7 ), $log[0]['sample'] );
 		$this->assertSame( 3, $log[1]['processed'] );
 		$this->assertEqualsWithDelta( time(), $log[0]['ts'], 5 );
-		$this->assertEqualsWithDelta( time(), (int) get_option( 'fqj_last_queue_run' ), 5 );
+		$this->assertEqualsWithDelta( time(), (int) get_option( 'rfsd_last_queue_run' ), 5 );
 	}
 
 	public function test_log_run_caps_sample_and_length() {
-		fqj_log_invalidation_run( 50, range( 1, 50 ) );
-		$log = get_option( 'fqj_invalidation_log' );
+		rfsd_log_invalidation_run( 50, range( 1, 50 ) );
+		$log = get_option( 'rfsd_invalidation_log' );
 		$this->assertSame( range( 1, 20 ), $log[0]['sample'] );
 
-		update_option( 'fqj_invalidation_log', array_fill( 0, 200, array( 'ts' => 1 ) ) );
-		fqj_log_invalidation_run( 1 );
-		$log = get_option( 'fqj_invalidation_log' );
+		update_option( 'rfsd_invalidation_log', array_fill( 0, 200, array( 'ts' => 1 ) ) );
+		rfsd_log_invalidation_run( 1 );
+		$log = get_option( 'rfsd_invalidation_log' );
 		$this->assertCount( 200, $log );
 		$this->assertSame( 1, $log[0]['processed'] );
 	}
 
 	public function test_log_run_recovers_from_corrupt_log() {
-		update_option( 'fqj_invalidation_log', 'garbage' );
-		fqj_log_invalidation_run( 2 );
-		$this->assertCount( 1, get_option( 'fqj_invalidation_log' ) );
+		update_option( 'rfsd_invalidation_log', 'garbage' );
+		rfsd_log_invalidation_run( 2 );
+		$this->assertCount( 1, get_option( 'rfsd_invalidation_log' ) );
 	}
 
 	public function test_cron_worker_deletes_transients_in_batches() {
-		update_option( FQJ_OPTION_KEY, array( 'batch_size' => 2 ) );
+		update_option( RFSD_OPTION_KEY, array( 'batch_size' => 2 ) );
 		foreach ( array( 1, 2, 3 ) as $id ) {
-			set_transient( fqj_cache_key( $id ), 'cached' );
+			set_transient( rfsd_cache_key( $id ), 'cached' );
 		}
-		fqj_queue_add_posts( array( 1, 2, 3 ) );
+		rfsd_queue_add_posts( array( 1, 2, 3 ) );
 
-		do_action( 'fqj_process_invalidation_queue' );
+		do_action( 'rfsd_process_invalidation_queue' );
 
-		$this->assertFalse( get_transient( fqj_cache_key( 1 ) ) );
-		$this->assertFalse( get_transient( fqj_cache_key( 2 ) ) );
-		$this->assertSame( 'cached', get_transient( fqj_cache_key( 3 ) ) );
+		$this->assertFalse( get_transient( rfsd_cache_key( 1 ) ) );
+		$this->assertFalse( get_transient( rfsd_cache_key( 2 ) ) );
+		$this->assertSame( 'cached', get_transient( rfsd_cache_key( 3 ) ) );
 		$this->assertSame( array( 3 ), $this->get_queue() );
 
-		$log = get_option( 'fqj_invalidation_log' );
+		$log = get_option( 'rfsd_invalidation_log' );
 		$this->assertSame( 2, $log[0]['processed'] );
 		$this->assertSame( array( 1, 2 ), $log[0]['sample'] );
 	}
 
 	public function test_empty_run_updates_last_run_but_not_the_log() {
-		fqj_process_invalidation_queue_cron();
-		$this->assertFalse( get_option( 'fqj_invalidation_log' ) );
-		$this->assertNotEmpty( get_option( 'fqj_last_queue_run' ) );
+		rfsd_process_invalidation_queue_cron();
+		$this->assertFalse( get_option( 'rfsd_invalidation_log' ) );
+		$this->assertNotEmpty( get_option( 'rfsd_last_queue_run' ) );
 
-		fqj_process_invalidation_queue_now();
-		$this->assertFalse( get_option( 'fqj_invalidation_log' ) );
+		rfsd_process_invalidation_queue_now();
+		$this->assertFalse( get_option( 'rfsd_invalidation_log' ) );
 	}
 
 	public function test_log_options_are_not_autoloaded() {
-		fqj_log_invalidation_run( 1, array( 1 ) );
+		rfsd_log_invalidation_run( 1, array( 1 ) );
 		$autoloaded = wp_load_alloptions( true );
-		$this->assertArrayNotHasKey( 'fqj_invalidation_log', $autoloaded );
-		$this->assertArrayNotHasKey( 'fqj_last_queue_run', $autoloaded );
+		$this->assertArrayNotHasKey( 'rfsd_invalidation_log', $autoloaded );
+		$this->assertArrayNotHasKey( 'rfsd_last_queue_run', $autoloaded );
 
-		fqj_log_invalidation_run( 2, array( 1 ) );
+		rfsd_log_invalidation_run( 2, array( 1 ) );
 		$autoloaded = wp_load_alloptions( true );
-		$this->assertArrayNotHasKey( 'fqj_invalidation_log', $autoloaded );
-		$this->assertArrayNotHasKey( 'fqj_last_queue_run', $autoloaded );
+		$this->assertArrayNotHasKey( 'rfsd_invalidation_log', $autoloaded );
+		$this->assertArrayNotHasKey( 'rfsd_last_queue_run', $autoloaded );
 	}
 
 	public function test_post_type_job_expands_incrementally_with_cursor() {
-		update_option( FQJ_OPTION_KEY, array( 'batch_size' => 2 ) );
+		update_option( RFSD_OPTION_KEY, array( 'batch_size' => 2 ) );
 		$pages = self::factory()->post->create_many( 5, array( 'post_type' => 'page' ) );
 		$draft = self::factory()->post->create(
 			array(
@@ -200,25 +200,25 @@ public function test_post_type_job_expands_incrementally_with_cursor() {
 		);
 		$other = self::factory()->post->create();
 		foreach ( array_merge( $pages, array( $draft, $other ) ) as $id ) {
-			set_transient( fqj_cache_key( $id ), 'cached' );
+			set_transient( rfsd_cache_key( $id ), 'cached' );
 		}
-		fqj_queue_add_items( 'post_type', array( 'page' ) );
+		rfsd_queue_add_items( 'post_type', array( 'page' ) );
 
-		$this->assertSame( 2, fqj_process_invalidation_queue_now() );
-		$this->assertFalse( get_transient( fqj_cache_key( $pages[0] ) ) );
-		$this->assertFalse( get_transient( fqj_cache_key( $pages[1] ) ) );
-		$this->assertSame( 'cached', get_transient( fqj_cache_key( $pages[2] ) ) );
+		$this->assertSame( 2, rfsd_process_invalidation_queue_now() );
+		$this->assertFalse( get_transient( rfsd_cache_key( $pages[0] ) ) );
+		$this->assertFalse( get_transient( rfsd_cache_key( $pages[1] ) ) );
+		$this->assertSame( 'cached', get_transient( rfsd_cache_key( $pages[2] ) ) );
 		$this->assertSame( (string) $pages[1], $this->get_queue_jobs()[0]['job_cursor'] );
 
-		$this->assertSame( 2, fqj_process_invalidation_queue_now() );
-		$this->assertSame( 1, fqj_process_invalidation_queue_now() );
-		$this->assertSame( 0, fqj_queue_length(), 'A short batch means the job is exhausted and removed.' );
-		$this->assertSame( 'cached', get_transient( fqj_cache_key( $draft ) ) );
-		$this->assertSame( 'cached', get_transient( fqj_cache_key( $other ) ) );
+		$this->assertSame( 2, rfsd_process_invalidation_queue_now() );
+		$this->assertSame( 1, rfsd_process_invalidation_queue_now() );
+		$this->assertSame( 0, rfsd_queue_length(), 'A short batch means the job is exhausted and removed.' );
+		$this->assertSame( 'cached', get_transient( rfsd_cache_key( $draft ) ) );
+		$this->assertSame( 'cached', get_transient( rfsd_cache_key( $other ) ) );
 	}
 
 	public function test_term_job_expands_published_tagged_posts_and_finishes() {
-		update_option( FQJ_OPTION_KEY, array( 'batch_size' => 10 ) );
+		update_option( RFSD_OPTION_KEY, array( 'batch_size' => 10 ) );
 		$term   = self::factory()->category->create();
 		$tagged = self::factory()->post->create_many( 3 );
 		$draft  = self::factory()->post->create( array( 'post_status' => 'draft' ) );
@@ -227,73 +227,73 @@ public function test_term_job_expands_published_tagged_posts_and_finishes() {
 			wp_set_post_categories( $id, array( $term ) );
 		}
 		foreach ( array_merge( $tagged, array( $draft, $other ) ) as $id ) {
-			set_transient( fqj_cache_key( $id ), 'cached' );
+			set_transient( rfsd_cache_key( $id ), 'cached' );
 		}
-		fqj_queue_add_items( 'term', array( $term, 999999 ) );
+		rfsd_queue_add_items( 'term', array( $term, 999999 ) );
 
-		$this->assertSame( 3, fqj_process_invalidation_queue_now() );
+		$this->assertSame( 3, rfsd_process_invalidation_queue_now() );
 
 		foreach ( $tagged as $id ) {
-			$this->assertFalse( get_transient( fqj_cache_key( $id ) ) );
+			$this->assertFalse( get_transient( rfsd_cache_key( $id ) ) );
 		}
-		$this->assertSame( 'cached', get_transient( fqj_cache_key( $draft ) ) );
-		$this->assertSame( 'cached', get_transient( fqj_cache_key( $other ) ) );
-		$this->assertSame( 0, fqj_queue_length(), 'Finished and missing-term jobs are removed.' );
-		$this->assertSame( 3, get_option( 'fqj_invalidation_log' )[0]['processed'] );
+		$this->assertSame( 'cached', get_transient( rfsd_cache_key( $draft ) ) );
+		$this->assertSame( 'cached', get_transient( rfsd_cache_key( $other ) ) );
+		$this->assertSame( 0, rfsd_queue_length(), 'Finished and missing-term jobs are removed.' );
+		$this->assertSame( 3, get_option( 'rfsd_invalidation_log' )[0]['processed'] );
 	}
 
 	public function test_posts_are_processed_before_jobs_within_budget() {
-		update_option( FQJ_OPTION_KEY, array( 'batch_size' => 3 ) );
+		update_option( RFSD_OPTION_KEY, array( 'batch_size' => 3 ) );
 		$pages = self::factory()->post->create_many( 4, array( 'post_type' => 'page' ) );
-		fqj_queue_add_items( 'post_type', array( 'page' ) );
-		fqj_queue_add_posts( array( 900, 901 ) );
+		rfsd_queue_add_items( 'post_type', array( 'page' ) );
+		rfsd_queue_add_posts( array( 900, 901 ) );
 
-		$this->assertSame( 3, fqj_process_invalidation_queue_now() );
+		$this->assertSame( 3, rfsd_process_invalidation_queue_now() );
 		$this->assertSame( (string) $pages[0], $this->get_queue_jobs()[0]['job_cursor'] );
 		$this->assertSame( array(), $this->get_queue() );
 	}
 
 	public function test_cron_worker_defaults_batch_size_without_settings() {
-		delete_option( FQJ_OPTION_KEY );
-		fqj_queue_add_posts( range( 1, 600 ) );
-		fqj_process_invalidation_queue_cron();
-		$this->assertSame( 100, fqj_queue_length() );
+		delete_option( RFSD_OPTION_KEY );
+		rfsd_queue_add_posts( range( 1, 600 ) );
+		rfsd_process_invalidation_queue_cron();
+		$this->assertSame( 100, rfsd_queue_length() );
 	}
 
 	public function test_process_now_with_limit() {
-		set_transient( fqj_cache_key( 5 ), 'x' );
-		set_transient( fqj_cache_key( 6 ), 'y' );
-		fqj_queue_add_posts( array( 5, 6 ) );
+		set_transient( rfsd_cache_key( 5 ), 'x' );
+		set_transient( rfsd_cache_key( 6 ), 'y' );
+		rfsd_queue_add_posts( array( 5, 6 ) );
 
-		$this->assertSame( 1, fqj_process_invalidation_queue_now( 1 ) );
-		$this->assertFalse( get_transient( fqj_cache_key( 5 ) ) );
-		$this->assertSame( 'y', get_transient( fqj_cache_key( 6 ) ) );
+		$this->assertSame( 1, rfsd_process_invalidation_queue_now( 1 ) );
+		$this->assertFalse( get_transient( rfsd_cache_key( 5 ) ) );
+		$this->assertSame( 'y', get_transient( rfsd_cache_key( 6 ) ) );
 
-		$this->assertSame( 1, fqj_process_invalidation_queue_now() );
-		$this->assertSame( 0, fqj_process_invalidation_queue_now() );
+		$this->assertSame( 1, rfsd_process_invalidation_queue_now() );
+		$this->assertSame( 0, rfsd_process_invalidation_queue_now() );
 
-		$log = get_option( 'fqj_invalidation_log' );
+		$log = get_option( 'rfsd_invalidation_log' );
 		$this->assertCount( 2, $log, 'The empty run is not logged.' );
 	}
 
 	public function test_process_now_uses_batch_size_when_no_limit() {
-		update_option( FQJ_OPTION_KEY, array( 'batch_size' => 3 ) );
-		fqj_queue_add_posts( range( 1, 10 ) );
-		$this->assertSame( 3, fqj_process_invalidation_queue_now() );
-		$this->assertSame( 7, fqj_queue_length() );
+		update_option( RFSD_OPTION_KEY, array( 'batch_size' => 3 ) );
+		rfsd_queue_add_posts( range( 1, 10 ) );
+		$this->assertSame( 3, rfsd_process_invalidation_queue_now() );
+		$this->assertSame( 7, rfsd_queue_length() );
 	}
 
 	public function test_admin_notice_shows_for_admins_with_pending_items() {
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
-		set_current_screen( 'edit-' . FQJ_POST_TYPE );
+		set_current_screen( 'edit-' . RFSD_POST_TYPE );
 
 		ob_start();
-		fqj_admin_queue_notice();
+		rfsd_admin_queue_notice();
 		$this->assertSame( '', ob_get_clean(), 'No notice when queue is empty.' );
 
-		fqj_queue_add_posts( array( 1, 2 ) );
+		rfsd_queue_add_posts( array( 1, 2 ) );
 		ob_start();
-		fqj_admin_queue_notice();
+		rfsd_admin_queue_notice();
 		$out = ob_get_clean();
 		$this->assertStringContainsString( 'notice-info', $out );
 		$this->assertStringContainsString( '<strong>2</strong>', $out );
@@ -301,10 +301,10 @@ public function test_admin_notice_shows_for_admins_with_pending_items() {
 
 	public function test_admin_notice_hidden_for_non_admins() {
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
-		fqj_queue_add_posts( array( 1 ) );
+		rfsd_queue_add_posts( array( 1 ) );
 
 		ob_start();
-		fqj_admin_queue_notice();
+		rfsd_admin_queue_notice();
 		$this->assertSame( '', ob_get_clean() );
 	}
 
@@ -318,11 +318,11 @@ public function test_admin_notice_hidden_for_non_admins() {
 	 */
 	public function test_admin_notice_only_on_plugin_screens( $screen, $expected ) {
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
-		fqj_queue_add_posts( array( 1 ) );
+		rfsd_queue_add_posts( array( 1 ) );
 		set_current_screen( $screen );
 
 		ob_start();
-		fqj_admin_queue_notice();
+		rfsd_admin_queue_notice();
 		$out = ob_get_clean();
 		set_current_screen( 'front' );
 
@@ -335,10 +335,10 @@ public function test_admin_notice_only_on_plugin_screens( $screen, $expected ) {
 
 	public function notice_screen_provider() {
 		return array(
-			'FAQ list'      => array( 'edit-fqj_faq', true ),
-			'FAQ editor'    => array( 'fqj_faq', true ),
-			'Health page'   => array( 'fqj_faq_page_fqj-health', true ),
-			'Settings page' => array( 'fqj_faq_page_fqj-settings', true ),
+			'FAQ list'      => array( 'edit-rfsd_faq', true ),
+			'FAQ editor'    => array( 'rfsd_faq', true ),
+			'Health page'   => array( 'rfsd_faq_page_rfsd-health', true ),
+			'Settings page' => array( 'rfsd_faq_page_rfsd-settings', true ),
 			'dashboard'     => array( 'dashboard', false ),
 			'posts list'    => array( 'edit-post', false ),
 			'plugins'       => array( 'plugins', false ),
diff --git a/tests/php/test-settings.php b/tests/php/test-settings.php
index a46fad7..2f77b5c 100644
--- a/tests/php/test-settings.php
+++ b/tests/php/test-settings.php
@@ -2,13 +2,13 @@
 /**
  * Settings page and transient purge helper.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * Settings tests.
  */
-class Test_FQJ_Settings extends FQJ_TestCase {
+class Test_RFSD_Settings extends RFSD_TestCase {
 
 	public function set_up() {
 		parent::set_up();
@@ -22,7 +22,7 @@ public function set_up() {
 	 */
 	protected function render() {
 		ob_start();
-		fqj_render_settings_page();
+		rfsd_render_settings_page();
 
 		return ob_get_clean();
 	}
@@ -35,7 +35,7 @@ protected function render() {
 	 */
 	protected function save( $fields ) {
 		$_POST = array_merge(
-			array( 'fqj_settings_nonce' => wp_create_nonce( 'fqj_save_settings' ) ),
+			array( 'rfsd_settings_nonce' => wp_create_nonce( 'rfsd_save_settings' ) ),
 			$fields
 		);
 
@@ -44,14 +44,14 @@ protected function save( $fields ) {
 
 	public function test_submenu_is_registered() {
 		global $submenu;
-		fqj_register_settings_page();
-		$slugs = wp_list_pluck( $submenu['edit.php?post_type=fqj_faq'], 2 );
-		$this->assertContains( 'fqj-settings', $slugs );
+		rfsd_register_settings_page();
+		$slugs = wp_list_pluck( $submenu['edit.php?post_type=rfsd_faq'], 2 );
+		$this->assertContains( 'rfsd-settings', $slugs );
 	}
 
 	public function test_render_shows_current_values() {
 		update_option(
-			FQJ_OPTION_KEY,
+			RFSD_OPTION_KEY,
 			array(
 				'cache_ttl'   => 900,
 				'batch_size'  => 50,
@@ -63,12 +63,12 @@ public function test_render_shows_current_values() {
 		$this->assertStringContainsString( 'value="900"', $html );
 		$this->assertStringContainsString( 'value="50"', $html );
 		$this->assertMatchesRegularExpression( '/<option value="faqpage"\s+selected=\'selected\'>/', $html );
-		$this->assertStringContainsString( 'name="fqj_settings_nonce"', $html );
+		$this->assertStringContainsString( 'name="rfsd_settings_nonce"', $html );
 		$this->assertStringNotContainsString( 'Settings saved', $html );
 	}
 
 	public function test_render_uses_defaults_when_option_missing() {
-		delete_option( FQJ_OPTION_KEY );
+		delete_option( RFSD_OPTION_KEY );
 		$html = $this->render();
 		$this->assertStringContainsString( 'value="43200"', $html );
 		$this->assertStringContainsString( 'value="500"', $html );
@@ -85,7 +85,7 @@ public function test_save_valid_settings() {
 		);
 
 		$this->assertStringContainsString( 'Settings saved', $html );
-		$opts = get_option( FQJ_OPTION_KEY );
+		$opts = get_option( RFSD_OPTION_KEY );
 		$this->assertSame( 3600, $opts['cache_ttl'] );
 		$this->assertSame( 250, $opts['batch_size'] );
 		$this->assertSame( 'faqpage', $opts['output_type'] );
@@ -100,7 +100,7 @@ public function test_save_clamps_and_sanitizes() {
 			)
 		);
 
-		$opts = get_option( FQJ_OPTION_KEY );
+		$opts = get_option( RFSD_OPTION_KEY );
 		$this->assertSame( 60, $opts['cache_ttl'] );
 		$this->assertSame( 10, $opts['batch_size'] );
 		$this->assertSame( 'faqpage', $opts['output_type'] );
@@ -108,48 +108,48 @@ public function test_save_clamps_and_sanitizes() {
 
 	public function test_save_with_missing_fields_uses_minimums() {
 		$this->save( array() );
-		$opts = get_option( FQJ_OPTION_KEY );
+		$opts = get_option( RFSD_OPTION_KEY );
 		$this->assertSame( 60, $opts['cache_ttl'] );
 		$this->assertSame( 10, $opts['batch_size'] );
 		$this->assertSame( 'faqpage', $opts['output_type'] );
 	}
 
 	public function test_save_keeps_other_option_keys() {
-		update_option( FQJ_OPTION_KEY, array( 'queue_cron_interval' => 'fqj_five_minutes' ) );
+		update_option( RFSD_OPTION_KEY, array( 'queue_cron_interval' => 'rfsd_five_minutes' ) );
 		$this->save( array( 'cache_ttl' => '120' ) );
-		$this->assertSame( 'fqj_five_minutes', get_option( FQJ_OPTION_KEY )['queue_cron_interval'] );
+		$this->assertSame( 'rfsd_five_minutes', get_option( RFSD_OPTION_KEY )['queue_cron_interval'] );
 	}
 
 	public function test_save_caps_batch_size() {
 		$this->save( array( 'batch_size' => '999999' ) );
-		$this->assertSame( FQJ_MAX_BATCH_SIZE, get_option( FQJ_OPTION_KEY )['batch_size'] );
-		$this->assertSame( 5000, FQJ_MAX_BATCH_SIZE );
+		$this->assertSame( RFSD_MAX_BATCH_SIZE, get_option( RFSD_OPTION_KEY )['batch_size'] );
+		$this->assertSame( 5000, RFSD_MAX_BATCH_SIZE );
 	}
 
 	public function test_save_ignored_with_bad_nonce() {
-		update_option( FQJ_OPTION_KEY, array( 'cache_ttl' => 999 ) );
+		update_option( RFSD_OPTION_KEY, array( 'cache_ttl' => 999 ) );
 		$_POST = array(
-			'fqj_settings_nonce' => 'bad',
-			'cache_ttl'          => '120',
+			'rfsd_settings_nonce' => 'bad',
+			'cache_ttl'           => '120',
 		);
 		$this->assertStringNotContainsString( 'Settings saved', $this->render() );
-		$this->assertSame( 999, get_option( FQJ_OPTION_KEY )['cache_ttl'] );
+		$this->assertSame( 999, get_option( RFSD_OPTION_KEY )['cache_ttl'] );
 	}
 
 	public function test_non_admin_sees_nothing_and_cannot_save() {
 		wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
-		update_option( FQJ_OPTION_KEY, array( 'cache_ttl' => 999 ) );
+		update_option( RFSD_OPTION_KEY, array( 'cache_ttl' => 999 ) );
 
 		$this->assertSame( '', $this->save( array( 'cache_ttl' => '120' ) ) );
-		$this->assertSame( 999, get_option( FQJ_OPTION_KEY )['cache_ttl'] );
+		$this->assertSame( 999, get_option( RFSD_OPTION_KEY )['cache_ttl'] );
 	}
 
 	public function test_purge_action_from_settings_page() {
-		$key = fqj_cache_key( 7 );
+		$key = rfsd_cache_key( 7 );
 		set_transient( $key, 'x' );
 		$_POST = array(
-			'fqj_action'                => 'purge_all',
-			'fqj_purge_all_nonce_field' => wp_create_nonce( 'fqj_purge_all_nonce' ),
+			'rfsd_action'                => 'purge_all',
+			'rfsd_purge_all_nonce_field' => wp_create_nonce( 'rfsd_purge_all_nonce' ),
 		);
 
 		$this->assertStringContainsString( 'All FAQ transients purged', $this->render() );
@@ -157,25 +157,25 @@ public function test_purge_action_from_settings_page() {
 	}
 
 	public function test_purge_action_requires_valid_nonce() {
-		set_transient( fqj_cache_key( 7 ), 'x' );
+		set_transient( rfsd_cache_key( 7 ), 'x' );
 		$_POST = array(
-			'fqj_action'                => 'purge_all',
-			'fqj_purge_all_nonce_field' => 'bad',
+			'rfsd_action'                => 'purge_all',
+			'rfsd_purge_all_nonce_field' => 'bad',
 		);
 
 		$this->assertStringNotContainsString( 'All FAQ transients purged', $this->render() );
-		$this->assertSame( 'x', get_transient( fqj_cache_key( 7 ) ) );
+		$this->assertSame( 'x', get_transient( rfsd_cache_key( 7 ) ) );
 	}
 
 	public function test_purge_helper_removes_only_faq_transients() {
-		$key_1  = fqj_cache_key( 1 );
-		$key_22 = fqj_cache_key( 22 );
+		$key_1  = rfsd_cache_key( 1 );
+		$key_22 = rfsd_cache_key( 22 );
 		set_transient( $key_1, 'a', 600 );
 		set_transient( $key_22, 'b' );
-		fqj_queue_add_posts( array( 1 ) );
+		rfsd_queue_add_posts( array( 1 ) );
 		set_transient( 'other_plugin_cache', 'c' );
 
-		fqj_purge_all_faq_transients();
+		rfsd_purge_all_faq_transients();
 
 		$this->assertFalse( get_transient( $key_1 ) );
 		$this->assertFalse( get_option( '_transient_timeout_' . $key_1 ) );
@@ -185,26 +185,26 @@ public function test_purge_helper_removes_only_faq_transients() {
 	}
 
 	public function test_purge_helper_with_nothing_to_purge() {
-		$before = fqj_cache_generation();
-		$this->assertSame( $before + 1, fqj_purge_all_faq_transients() );
-		$this->assertFalse( get_transient( fqj_cache_key( 1 ) ) );
+		$before = rfsd_cache_generation();
+		$this->assertSame( $before + 1, rfsd_purge_all_faq_transients() );
+		$this->assertFalse( get_transient( rfsd_cache_key( 1 ) ) );
 	}
 
 	public function test_cache_key_includes_generation_and_post_id() {
-		update_option( 'fqj_cache_gen', 4 );
-		$this->assertSame( 'fqj_faq_json_4_9', fqj_cache_key( 9 ) );
+		update_option( 'rfsd_cache_gen', 4 );
+		$this->assertSame( 'rfsd_faq_json_4_9', rfsd_cache_key( 9 ) );
 	}
 
 	public function test_missing_generation_is_seeded_from_time_and_stored() {
-		delete_option( 'fqj_cache_gen' );
+		delete_option( 'rfsd_cache_gen' );
 		$before = time();
-		$key    = fqj_cache_key( 9 );
-		$gen    = (int) get_option( 'fqj_cache_gen' );
+		$key    = rfsd_cache_key( 9 );
+		$gen    = (int) get_option( 'rfsd_cache_gen' );
 
 		// A reinstall must not reuse a low generation that an object cache may still hold output for.
 		$this->assertGreaterThanOrEqual( $before, $gen );
-		$this->assertSame( 'fqj_faq_json_' . $gen . '_9', $key );
-		$this->assertSame( $gen, fqj_cache_generation() );
+		$this->assertSame( 'rfsd_faq_json_' . $gen . '_9', $key );
+		$this->assertSame( $gen, rfsd_cache_generation() );
 	}
 
 	public function test_purge_makes_cached_output_unreachable_with_external_object_cache() {
@@ -213,44 +213,44 @@ public function test_purge_makes_cached_output_unreachable_with_external_object_
 		$wp_using_ext_object_cache = true; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 
 		try {
-			$old_key = fqj_cache_key( 3 );
+			$old_key = rfsd_cache_key( 3 );
 			set_transient( $old_key, 'stale', 600 );
 			$this->assertSame( 'stale', get_transient( $old_key ) );
 
-			fqj_purge_all_faq_transients();
+			rfsd_purge_all_faq_transients();
 
-			$this->assertNotSame( $old_key, fqj_cache_key( 3 ) );
-			$this->assertFalse( get_transient( fqj_cache_key( 3 ) ) );
+			$this->assertNotSame( $old_key, rfsd_cache_key( 3 ) );
+			$this->assertFalse( get_transient( rfsd_cache_key( 3 ) ) );
 		} finally {
 			$wp_using_ext_object_cache = $previous; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 		}
 	}
 
 	public function test_purge_sweeps_dead_rows_and_escapes_like_wildcards() {
-		$old_key = fqj_cache_key( 3 );
+		$old_key = rfsd_cache_key( 3 );
 		set_transient( $old_key, 'x', 600 );
 		// "_" must not act as a wildcard: this unrelated option must survive.
-		update_option( '_transient_fqjXfaqXjson_1', 'keep' );
+		update_option( '_transient_rfsdXfaqXjson_1', 'keep' );
 
-		fqj_purge_all_faq_transients();
+		rfsd_purge_all_faq_transients();
 
 		$this->assertFalse( get_option( '_transient_' . $old_key ) );
 		$this->assertFalse( get_option( '_transient_timeout_' . $old_key ) );
-		$this->assertSame( 'keep', get_option( '_transient_fqjXfaqXjson_1' ) );
+		$this->assertSame( 'keep', get_option( '_transient_rfsdXfaqXjson_1' ) );
 	}
 
 	public function test_equivalent_output_types_do_not_purge_cache() {
-		update_option( FQJ_OPTION_KEY, array( 'output_type' => 'faqsection' ) );
-		$gen = fqj_cache_generation();
+		update_option( RFSD_OPTION_KEY, array( 'output_type' => 'faqsection' ) );
+		$gen = rfsd_cache_generation();
 
 		update_option(
-			FQJ_OPTION_KEY,
+			RFSD_OPTION_KEY,
 			array(
 				'output_type' => 'faqpage',
 				'cache_ttl'   => 100,
 			)
 		);
-		$this->assertSame( $gen, fqj_cache_generation() );
+		$this->assertSame( $gen, rfsd_cache_generation() );
 	}
 
 	public function test_settings_page_offers_only_faqpage() {
@@ -261,6 +261,6 @@ public function test_settings_page_offers_only_faqpage() {
 
 	public function test_posted_faqsection_is_stored_as_faqpage() {
 		$this->save( array( 'output_type' => 'faqsection' ) );
-		$this->assertSame( 'faqpage', get_option( FQJ_OPTION_KEY )['output_type'] );
+		$this->assertSame( 'faqpage', get_option( RFSD_OPTION_KEY )['output_type'] );
 	}
 }
diff --git a/tests/php/test-uninstall.php b/tests/php/test-uninstall.php
index 67eb3f2..09ad356 100644
--- a/tests/php/test-uninstall.php
+++ b/tests/php/test-uninstall.php
@@ -2,7 +2,7 @@
 /**
  * Uninstall cleanup.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  *
  * @group uninstall
  */
@@ -13,7 +13,7 @@
  * Uninstall must drop the real tables, so the DROP TABLE statements commit the test transaction. Everything a test
  * creates is therefore removed explicitly in tear_down() and committed.
  */
-class Test_FQJ_Uninstall extends FQJ_TestCase {
+class Test_RFSD_Uninstall extends RFSD_TestCase {
 
 	/**
 	 * Posts created by the current test that uninstall keeps.
@@ -45,7 +45,7 @@ public function tear_down() {
 		}
 		delete_transient( 'keep_me' );
 		// Uninstall clears every site of a network.
-		fqj_activate( true );
+		rfsd_activate( true );
 		$wpdb->query( 'COMMIT' );
 		self::flush_cache();
 	}
@@ -55,90 +55,99 @@ public function tear_down() {
 	 */
 	private function run_uninstall() {
 		if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
-			define( 'WP_UNINSTALL_PLUGIN', 'faq-jsonld/faq-jsonld.php' );
+			define( 'WP_UNINSTALL_PLUGIN', 'renderbit-faq-structured-data/renderbit-faq-structured-data.php' );
 		}
-		include FQJ_PLUGIN_DIR . 'uninstall.php';
+		include RFSD_PLUGIN_DIR . 'uninstall.php';
 	}
 
 	public function test_uninstall_removes_options_table_and_transients() {
 		global $wpdb;
 
-		update_option( FQJ_OPTION_KEY, array( 'cache_ttl' => 60 ) );
-		update_option( FQJ_POST_TYPE_OPTION, FQJ_POST_TYPE );
-		fqj_update_option_no_autoload( FQJ_URL_MIGRATION_REPORT_OPTION, array( array( 'faq_id' => 1, 'old' => '', 'new' => '/x' ) ) );
-		set_transient( 'fqj_unmatched_urls_1_2', array( 'x' ), 600 );
-		$key = fqj_cache_key( 1 );
+		update_option( RFSD_OPTION_KEY, array( 'cache_ttl' => 60 ) );
+		update_option( RFSD_POST_TYPE_OPTION, RFSD_POST_TYPE );
+		rfsd_update_option_no_autoload(
+			RFSD_URL_MIGRATION_REPORT_OPTION,
+			array(
+				array(
+					'faq_id' => 1,
+					'old'    => '',
+					'new'    => '/x',
+				),
+			)
+		);
+		set_transient( 'rfsd_unmatched_urls_1_2', array( 'x' ), 600 );
+		$key = rfsd_cache_key( 1 );
 		set_transient( $key, 'x', 600 );
 		set_transient( 'keep_me', 'y' );
 
 		$this->run_uninstall();
 
-		$this->assertFalse( get_option( FQJ_OPTION_KEY ) );
+		$this->assertFalse( get_option( RFSD_OPTION_KEY ) );
 		$this->assertFalse( get_transient( $key ) );
 		$this->assertFalse( get_option( '_transient_timeout_' . $key ) );
-		$this->assertFalse( get_option( 'fqj_cache_gen' ) );
-		$this->assertFalse( get_option( FQJ_URL_MIGRATION_REPORT_OPTION ) );
-		$this->assertFalse( get_option( FQJ_POST_TYPE_OPTION ) );
-		$this->assertFalse( get_transient( 'fqj_unmatched_urls_1_2' ) );
+		$this->assertFalse( get_option( 'rfsd_cache_gen' ) );
+		$this->assertFalse( get_option( RFSD_URL_MIGRATION_REPORT_OPTION ) );
+		$this->assertFalse( get_option( RFSD_POST_TYPE_OPTION ) );
+		$this->assertFalse( get_transient( 'rfsd_unmatched_urls_1_2' ) );
 		$this->assertSame( 'y', get_transient( 'keep_me' ) );
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
-		$this->assertNull( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', fqj_table_name() ) ) );
+		$this->assertNull( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', rfsd_table_name() ) ) );
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
-		$this->assertNull( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', fqj_queue_table_name() ) ) );
+		$this->assertNull( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', rfsd_queue_table_name() ) ) );
 	}
 
 	public function test_uninstall_removes_log_queue_events_and_meta_but_keeps_faqs() {
-		update_option( 'fqj_invalidation_log', array( array( 'processed' => 1 ) ) );
-		update_option( 'fqj_last_queue_run', time() );
-		set_transient( 'fqj_invalidate_queue', array( 1 ) );
-		fqj_queue_add_posts( array( 1 ) );
-		set_transient( 'fqj_rejected_urls_1_2', array( 'bad' ), 600 );
-		wp_schedule_event( time() + 60, 'hourly', 'fqj_process_invalidation_queue' );
-		wp_schedule_single_event( time() + 60, 'fqj_data_migration' );
-		$faq              = self::factory()->post->create( array( 'post_type' => 'fqj_faq' ) );
+		update_option( 'rfsd_invalidation_log', array( array( 'processed' => 1 ) ) );
+		update_option( 'rfsd_last_queue_run', time() );
+		set_transient( 'rfsd_invalidate_queue', array( 1 ) );
+		rfsd_queue_add_posts( array( 1 ) );
+		set_transient( 'rfsd_rejected_urls_1_2', array( 'bad' ), 600 );
+		wp_schedule_event( time() + 60, 'hourly', 'rfsd_process_invalidation_queue' );
+		wp_schedule_single_event( time() + 60, 'rfsd_data_migration' );
+		$faq              = self::factory()->post->create( array( 'post_type' => 'rfsd_faq' ) );
 		$this->post_ids[] = $faq;
-		update_post_meta( $faq, 'fqj_assoc_type', 'urls' );
-		update_post_meta( $faq, 'fqj_assoc_data_json', '{}' );
+		update_post_meta( $faq, 'rfsd_assoc_type', 'urls' );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', '{}' );
 		update_post_meta( $faq, 'unrelated_meta', 'keep' );
 
 		$this->run_uninstall();
 
-		$this->assertFalse( get_option( 'fqj_invalidation_log' ) );
-		$this->assertFalse( get_option( 'fqj_last_queue_run' ) );
-		$this->assertFalse( get_transient( 'fqj_invalidate_queue' ) );
-		$this->assertFalse( get_transient( 'fqj_rejected_urls_1_2' ) );
-		$this->assertFalse( get_option( '_transient_timeout_fqj_rejected_urls_1_2' ) );
-		$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
-		$this->assertFalse( wp_next_scheduled( 'fqj_data_migration' ) );
+		$this->assertFalse( get_option( 'rfsd_invalidation_log' ) );
+		$this->assertFalse( get_option( 'rfsd_last_queue_run' ) );
+		$this->assertFalse( get_transient( 'rfsd_invalidate_queue' ) );
+		$this->assertFalse( get_transient( 'rfsd_rejected_urls_1_2' ) );
+		$this->assertFalse( get_option( '_transient_timeout_rfsd_rejected_urls_1_2' ) );
+		$this->assertFalse( wp_next_scheduled( 'rfsd_process_invalidation_queue' ) );
+		$this->assertFalse( wp_next_scheduled( 'rfsd_data_migration' ) );
 		$this->assertNotNull( get_post( $faq ) );
-		$this->assertSame( '', get_post_meta( $faq, 'fqj_assoc_type', true ) );
-		$this->assertSame( '', get_post_meta( $faq, 'fqj_assoc_data_json', true ) );
+		$this->assertSame( '', get_post_meta( $faq, 'rfsd_assoc_type', true ) );
+		$this->assertSame( '', get_post_meta( $faq, 'rfsd_assoc_data_json', true ) );
 		$this->assertSame( 'keep', get_post_meta( $faq, 'unrelated_meta', true ) );
 	}
 
 	public function test_uninstall_deletes_faqs_when_filter_allows() {
-		$faq   = self::factory()->post->create( array( 'post_type' => 'fqj_faq' ) );
-		$draft = self::factory()->post->create(
+		$faq              = self::factory()->post->create( array( 'post_type' => 'rfsd_faq' ) );
+		$draft            = self::factory()->post->create(
 			array(
-				'post_type'   => 'fqj_faq',
+				'post_type'   => 'rfsd_faq',
 				'post_status' => 'draft',
 			)
 		);
-		$trashed = self::factory()->post->create(
+		$trashed          = self::factory()->post->create(
 			array(
-				'post_type'   => 'fqj_faq',
+				'post_type'   => 'rfsd_faq',
 				'post_status' => 'trash',
 			)
 		);
-		$legacy  = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
-		$post    = self::factory()->post->create();
+		$legacy           = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
+		$post             = self::factory()->post->create();
 		$this->post_ids[] = $post;
-		update_post_meta( $faq, 'fqj_assoc_type', 'urls' );
-		add_filter( 'fqj_uninstall_delete_faqs', '__return_true' );
+		update_post_meta( $faq, 'rfsd_assoc_type', 'urls' );
+		add_filter( 'rfsd_uninstall_delete_faqs', '__return_true' );
 
 		$this->run_uninstall();
 
-		remove_filter( 'fqj_uninstall_delete_faqs', '__return_true' );
+		remove_filter( 'rfsd_uninstall_delete_faqs', '__return_true' );
 		$this->assertNull( get_post( $faq ) );
 		$this->assertNull( get_post( $draft ) );
 		$this->assertNull( get_post( $trashed ) );
diff --git a/tests/php/test-url-migration.php b/tests/php/test-url-migration.php
index 196cc0e..897016e 100644
--- a/tests/php/test-url-migration.php
+++ b/tests/php/test-url-migration.php
@@ -2,13 +2,13 @@
 /**
  * Data migration 3: URL associations that only matched through the old `post` row.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
  * URL migration tests.
  */
-class Test_FQJ_URL_Migration extends FQJ_TestCase {
+class Test_RFSD_URL_Migration extends RFSD_TestCase {
 
 	/**
 	 * Create a FAQ saved before data version 3: its URLs plus the absolute `url` rows and the `post` rows
@@ -21,7 +21,7 @@ class Test_FQJ_URL_Migration extends FQJ_TestCase {
 	 */
 	protected function create_legacy_faq( $urls, $post_ids, $extra = array() ) {
 		$faq = $this->create_faq( 'Legacy?', 'Yes.' );
-		update_post_meta( $faq, 'fqj_assoc_data_json', wp_json_encode( array_merge( $extra, array( 'urls' => $urls ) ) ) );
+		update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( array_merge( $extra, array( 'urls' => $urls ) ) ) );
 
 		$rows = array();
 		foreach ( $urls as $url ) {
@@ -36,7 +36,7 @@ protected function create_legacy_faq( $urls, $post_ids, $extra = array() ) {
 				'value' => $post_id,
 			);
 		}
-		fqj_insert_mappings( $faq, $rows );
+		rfsd_insert_mappings( $faq, $rows );
 
 		return $faq;
 	}
@@ -45,9 +45,9 @@ protected function create_legacy_faq( $urls, $post_ids, $extra = array() ) {
 	 * Run the migration from data version 2 to completion.
 	 */
 	protected function migrate() {
-		update_option( FQJ_DATA_VERSION_OPTION, '2' );
-		fqj_run_data_migration();
-		$this->assertSame( FQJ_DATA_VERSION, get_option( FQJ_DATA_VERSION_OPTION ) );
+		update_option( RFSD_DATA_VERSION_OPTION, '2' );
+		rfsd_run_data_migration();
+		$this->assertSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
 	}
 
 	/**
@@ -57,7 +57,7 @@ protected function migrate() {
 	 * @return string[]
 	 */
 	protected function saved_urls( $faq_id ) {
-		$payload = json_decode( get_post_meta( $faq_id, 'fqj_assoc_data_json', true ), true );
+		$payload = json_decode( get_post_meta( $faq_id, 'rfsd_assoc_data_json', true ), true );
 
 		return $payload['urls'];
 	}
@@ -68,7 +68,7 @@ protected function saved_urls( $faq_id ) {
 	 * @return array
 	 */
 	protected function report() {
-		return get_option( FQJ_URL_MIGRATION_REPORT_OPTION, array() );
+		return get_option( RFSD_URL_MIGRATION_REPORT_OPTION, array() );
 	}
 
 	public function test_shortlink_is_rewritten_to_permalink() {
@@ -79,7 +79,7 @@ public function test_shortlink_is_rewritten_to_permalink() {
 		$this->migrate();
 
 		$this->assertSame( array( get_permalink( $post ) ), $this->saved_urls( $faq ) );
-		$this->assertSame( array( $faq ), fqj_faq_ids_for_post( $post ) );
+		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $post ) );
 		$this->assertSame(
 			array(
 				array(
@@ -105,11 +105,11 @@ public function test_front_page_slug_url_is_rewritten_to_home() {
 		$slug_url = home_url( '/welcome/' );
 		$faq      = $this->create_legacy_faq( array( $slug_url ), array( $page ) );
 
-		$this->assertSame( 0, fqj_post_for_url( $slug_url ) );
+		$this->assertSame( 0, rfsd_post_for_url( $slug_url ) );
 		$this->migrate();
 
 		$this->assertSame( array( home_url( '/' ) ), $this->saved_urls( $faq ) );
-		$this->assertSame( array( $faq ), fqj_faq_ids_for_post( $page ) );
+		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $page ) );
 	}
 
 	public function test_renamed_post_replaces_the_single_dead_url() {
@@ -121,8 +121,8 @@ public function test_renamed_post_replaces_the_single_dead_url() {
 		$this->migrate();
 
 		$this->assertSame( array( get_permalink( $post ), get_permalink( $live ) ), $this->saved_urls( $faq ) );
-		$this->assertSame( array( $faq ), fqj_faq_ids_for_post( $post ) );
-		$this->assertSame( array( $faq ), fqj_faq_ids_for_post( $live ) );
+		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $post ) );
+		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $live ) );
 		$this->assertSame( $dead, $this->report()[0]['old'] );
 		$this->assertSame( get_permalink( $post ), $this->report()[0]['new'] );
 	}
@@ -137,8 +137,8 @@ public function test_ambiguous_renames_keep_dead_urls_and_add_permalinks() {
 		$this->migrate();
 
 		$this->assertSame( array( $dead1, $dead2, get_permalink( $a ), get_permalink( $b ) ), $this->saved_urls( $faq ) );
-		$this->assertSame( array( $faq ), fqj_faq_ids_for_post( $a ) );
-		$this->assertSame( array( $faq ), fqj_faq_ids_for_post( $b ) );
+		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $a ) );
+		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $b ) );
 		$this->assertSame( array( '', '' ), wp_list_pluck( $this->report(), 'old' ) );
 	}
 
@@ -186,7 +186,7 @@ public function test_url_routing_to_a_post_it_never_covered_is_not_rewritten() {
 
 		$this->assertSame( array( $shortlink ), $this->saved_urls( $faq ) );
 		$this->assertSame( array(), $this->report() );
-		$this->assertSame( array(), fqj_faq_ids_for_post( $post ) );
+		$this->assertSame( array(), rfsd_faq_ids_for_post( $post ) );
 	}
 
 	public function test_plain_permalinks_keep_query_urls_and_rewrite_old_pretty_ones() {
@@ -201,7 +201,7 @@ public function test_plain_permalinks_keep_query_urls_and_rewrite_old_pretty_one
 
 		$this->assertSame( array( $plain ), $this->saved_urls( $faq ) );
 		$this->assertSame( array( $plain ), $this->saved_urls( $old ) );
-		$this->assertSame( array( $faq, $old ), fqj_faq_ids_for_post( $post ) );
+		$this->assertSame( array( $faq, $old ), rfsd_faq_ids_for_post( $post ) );
 		$this->assertCount( 1, $this->report() );
 	}
 
@@ -209,9 +209,9 @@ public function test_migration_from_current_version_does_not_rewrite() {
 		$post = self::factory()->post->create( array( 'post_name' => 'hello' ) );
 		$url  = home_url( '/?p=' . $post );
 		$faq  = $this->create_legacy_faq( array( $url ), array( $post ) );
-		update_option( FQJ_DATA_VERSION_OPTION, '3' );
+		update_option( RFSD_DATA_VERSION_OPTION, '3' );
 
-		fqj_run_data_migration();
+		rfsd_run_data_migration();
 
 		$this->assertSame( array( $url ), $this->saved_urls( $faq ) );
 	}
@@ -223,37 +223,37 @@ public function test_report_notice_shows_on_faq_list_until_dismissed() {
 		$this->create_legacy_faq( array( home_url( '/?p=' . $post ) ), array( $post ) );
 		$this->migrate();
 
-		set_current_screen( 'edit-fqj_faq' );
+		set_current_screen( 'edit-rfsd_faq' );
 		wp_set_current_user( $author );
 		ob_start();
-		fqj_url_migration_report_notice();
+		rfsd_url_migration_report_notice();
 		$this->assertSame( '', ob_get_clean(), 'Hidden from users who cannot edit others\' posts.' );
 
 		wp_set_current_user( $editor );
 		ob_start();
-		fqj_url_migration_report_notice();
+		rfsd_url_migration_report_notice();
 		$html = ob_get_clean();
 		$this->assertStringContainsString( esc_html( home_url( '/?p=' . $post ) ), $html );
-		$this->assertStringContainsString( 'fqj_dismiss_url_migration_report', $html );
+		$this->assertStringContainsString( 'rfsd_dismiss_url_migration_report', $html );
 
 		set_current_screen( 'edit-post' );
 		ob_start();
-		fqj_url_migration_report_notice();
+		rfsd_url_migration_report_notice();
 		$this->assertSame( '', ob_get_clean(), 'Only on the FAQ list screen.' );
 
 		wp_set_current_user( $author );
-		$_REQUEST['_wpnonce'] = wp_create_nonce( 'fqj_dismiss_url_migration_report' );
+		$_REQUEST['_wpnonce'] = wp_create_nonce( 'rfsd_dismiss_url_migration_report' );
 		try {
-			fqj_dismiss_url_migration_report();
+			rfsd_dismiss_url_migration_report();
 			$this->fail( 'Authors cannot dismiss the report.' );
 		} catch ( WPDieException $e ) {
-			$this->assertNotEmpty( get_option( FQJ_URL_MIGRATION_REPORT_OPTION ) );
+			$this->assertNotEmpty( get_option( RFSD_URL_MIGRATION_REPORT_OPTION ) );
 		}
 
 		wp_set_current_user( $editor );
-		$_REQUEST['_wpnonce'] = wp_create_nonce( 'fqj_dismiss_url_migration_report' );
-		fqj_dismiss_url_migration_report();
-		$this->assertFalse( get_option( FQJ_URL_MIGRATION_REPORT_OPTION ) );
+		$_REQUEST['_wpnonce'] = wp_create_nonce( 'rfsd_dismiss_url_migration_report' );
+		rfsd_dismiss_url_migration_report();
+		$this->assertFalse( get_option( RFSD_URL_MIGRATION_REPORT_OPTION ) );
 		set_current_screen( 'front' );
 	}
 
@@ -264,7 +264,7 @@ public function test_report_is_not_autoloaded() {
 
 		global $wpdb;
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
-		$autoload = $wpdb->get_var( $wpdb->prepare( "SELECT autoload FROM {$wpdb->options} WHERE option_name = %s", FQJ_URL_MIGRATION_REPORT_OPTION ) );
+		$autoload = $wpdb->get_var( $wpdb->prepare( "SELECT autoload FROM {$wpdb->options} WHERE option_name = %s", RFSD_URL_MIGRATION_REPORT_OPTION ) );
 		$this->assertContains( $autoload, array( 'no', 'off' ) );
 	}
 }
diff --git a/tests/php/wp-tests-config.php b/tests/php/wp-tests-config.php
index c2a9444..c2701ae 100644
--- a/tests/php/wp-tests-config.php
+++ b/tests/php/wp-tests-config.php
@@ -3,7 +3,7 @@
  * WordPress test suite config. Database settings come from the environment so the
  * same file works locally and in CI.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 // phpcs:disable WordPress.WP.GlobalVariablesOverride.Prohibited
diff --git a/uninstall.php b/uninstall.php
index bfecec2..00d68ac 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Uninstall script for FAQ JSON-LD Manager.
+ * Uninstall script for Renderbit FAQ Structured Data.
  *
  * WARNING: This removes plugin options, scheduled events, transients, post meta and the mapping table
  * permanently, on every site of a multisite network. FAQ posts are kept unless the
- * `fqj_uninstall_delete_faqs` filter returns true.
+ * `rfsd_uninstall_delete_faqs` filter returns true.
  *
  * Plugin functions are not loaded during uninstall, so everything here is self-contained.
  *
- * @package FAQ_JSON_LD
+ * @package Renderbit_FAQ_Structured_Data
  */
 
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
@@ -18,21 +18,21 @@
 /**
  * Remove all plugin data for the current site.
  */
-$fqj_uninstall_site = function () {
+$rfsd_uninstall_site = function () {
 	global $wpdb;
 
 	// Options.
-	foreach ( array( 'fqj_settings', 'fqj_db_version', 'fqj_data_version', 'fqj_data_migration_cursor', 'fqj_invalidation_log', 'fqj_last_queue_run', 'fqj_cache_gen', 'fqj_url_migration_report', 'fqj_post_type' ) as $option ) {
+	foreach ( array( 'rfsd_settings', 'rfsd_db_version', 'rfsd_data_version', 'rfsd_data_migration_cursor', 'rfsd_invalidation_log', 'rfsd_last_queue_run', 'rfsd_cache_gen', 'rfsd_url_migration_report', 'rfsd_post_type' ) as $option ) {
 		delete_option( $option );
 	}
 
 	// Scheduled events.
-	wp_clear_scheduled_hook( 'fqj_process_invalidation_queue' );
-	wp_clear_scheduled_hook( 'fqj_data_migration' );
+	wp_clear_scheduled_hook( 'rfsd_process_invalidation_queue' );
+	wp_clear_scheduled_hook( 'rfsd_data_migration' );
 
 	// Transients. Cached output held only in an external object cache cannot be enumerated and expires on its own.
-	delete_transient( 'fqj_invalidate_queue' );
-	foreach ( array( 'fqj_faq_json_', 'fqj_rejected_urls_', 'fqj_unmatched_urls_' ) as $prefix ) {
+	delete_transient( 'rfsd_invalidate_queue' );
+	foreach ( array( 'rfsd_faq_json_', 'rfsd_rejected_urls_', 'rfsd_unmatched_urls_' ) as $prefix ) {
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 		$rows = $wpdb->get_col(
 			$wpdb->prepare(
@@ -47,11 +47,11 @@
 	}
 
 	// FAQ items (opt-in) and their meta.
-	if ( apply_filters( 'fqj_uninstall_delete_faqs', false ) ) {
+	if ( apply_filters( 'rfsd_uninstall_delete_faqs', false ) ) {
 		do {
 			$faq_ids = get_posts(
 				array(
-					'post_type'              => array( 'fqj_faq', 'faq_item' ),
+					'post_type'              => array( 'rfsd_faq', 'faq_item' ),
 					// 'any' skips statuses excluded from search, such as trash.
 					'post_status'            => array_keys( get_post_stati() ),
 					'posts_per_page'         => 100,
@@ -66,28 +66,28 @@
 			}
 		} while ( ! empty( $faq_ids ) );
 	}
-	delete_post_meta_by_key( 'fqj_assoc_type' );
-	delete_post_meta_by_key( 'fqj_assoc_data_json' );
+	delete_post_meta_by_key( 'rfsd_assoc_type' );
+	delete_post_meta_by_key( 'rfsd_assoc_data_json' );
 
 	// Drop tables.
-	foreach ( array( 'fqj_mappings', 'fqj_queue' ) as $fqj_table ) {
+	foreach ( array( 'rfsd_mappings', 'rfsd_queue' ) as $rfsd_table ) {
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.DirectDatabaseQuery.SchemaChange
-		$wpdb->query( $wpdb->prepare( 'DROP TABLE IF EXISTS %i', $wpdb->prefix . $fqj_table ) );
+		$wpdb->query( $wpdb->prepare( 'DROP TABLE IF EXISTS %i', $wpdb->prefix . $rfsd_table ) );
 	}
 };
 
 if ( is_multisite() ) {
-	$fqj_site_ids = get_sites(
+	$rfsd_site_ids = get_sites(
 		array(
 			'fields' => 'ids',
 			'number' => 0,
 		)
 	);
-	foreach ( $fqj_site_ids as $fqj_site_id ) {
-		switch_to_blog( $fqj_site_id );
-		$fqj_uninstall_site();
+	foreach ( $rfsd_site_ids as $rfsd_site_id ) {
+		switch_to_blog( $rfsd_site_id );
+		$rfsd_uninstall_site();
 		restore_current_blog();
 	}
 } else {
-	$fqj_uninstall_site();
+	$rfsd_uninstall_site();
 }

From e5b9ffc5f43636384c465ec88cc128a24c0ecea9 Mon Sep 17 00:00:00 2001
From: Soham Banerjee <soham@renderbit.com>
Date: Fri, 23 Oct 2026 15:31:59 +0530
Subject: [PATCH 3/6] Import FAQs and settings from the old faq-jsonld plugin

The new slug makes this a separate plugin, so sites switch by installing
it next to FAQ JSON-LD Manager. rfsd_import_legacy_data() runs once per
site (plugins_loaded priority 5 and activation) and:
- moves faq_item posts and their association meta to rfsd_faq, so the old
  plugin stops printing duplicate FAQPage output and its uninstall cannot
  delete them;
- copies settings, the URL migration report and the mapping rows (with the
  data version only when rows were copied, so migration 3 still sees the
  old post rows; otherwise the data migration reindexes everything);
- clears the old plugin's cron events.
Uninstall no longer deletes faq_item posts, which belong to the old plugin.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 renderbit-faq-structured-data.php | 108 ++++++++++++++---
 tests/php/test-legacy-import.php  | 189 ++++++++++++++++++++++--------
 tests/php/test-multisite.php      |   4 +-
 tests/php/test-uninstall.php      |   7 +-
 uninstall.php                     |   4 +-
 5 files changed, 238 insertions(+), 74 deletions(-)

diff --git a/renderbit-faq-structured-data.php b/renderbit-faq-structured-data.php
index 504520b..759d893 100644
--- a/renderbit-faq-structured-data.php
+++ b/renderbit-faq-structured-data.php
@@ -37,10 +37,9 @@
 // URL associations rewritten by data migration 3, shown on the FAQ list screen until dismissed.
 define( 'RFSD_URL_MIGRATION_REPORT_OPTION', 'rfsd_url_migration_report' );
 
-// Post type of FAQ items. Older post type names in RFSD_LEGACY_POST_TYPES are renamed to it on existing sites.
 define( 'RFSD_POST_TYPE', 'rfsd_faq' );
-define( 'RFSD_LEGACY_POST_TYPES', array( 'faq_item' ) );
-define( 'RFSD_POST_TYPE_OPTION', 'rfsd_post_type' );
+// Set once a site's data from the earlier FAQ JSON-LD Manager plugin (faq-jsonld) has been imported.
+define( 'RFSD_LEGACY_IMPORT_OPTION', 'rfsd_legacy_import' );
 
 /**
  * Autoload includes
@@ -86,32 +85,105 @@ function rfsd_register_cpt_faq_item() {
 add_action( 'init', 'rfsd_register_cpt_faq_item' );
 
 /**
- * Rename FAQ items stored under a legacy post type to RFSD_POST_TYPE, once per site.
+ * Storage names of the earlier FAQ JSON-LD Manager plugin (slug faq-jsonld), which this plugin replaces.
  *
- * Runs before the schema upgrade and the data migration, which only look at RFSD_POST_TYPE.
+ * Only read by rfsd_import_legacy_data(); this plugin never registers or writes any of them.
+ *
+ * @return array
+ */
+function rfsd_legacy_storage_names() {
+	global $wpdb;
+
+	return array(
+		'post_type'           => 'faq_item',
+		// Legacy meta key => this plugin's meta key.
+		'meta'                => array(
+			'fqj_assoc_data_json' => 'rfsd_assoc_data_json',
+			'fqj_assoc_type'      => 'rfsd_assoc_type',
+		),
+		// Legacy option => this plugin's option, copied when this plugin's option is absent.
+		'options'             => array(
+			'fqj_settings'             => RFSD_OPTION_KEY,
+			'fqj_url_migration_report' => RFSD_URL_MIGRATION_REPORT_OPTION,
+		),
+		'data_version_option' => 'fqj_data_version',
+		'mappings_table'      => $wpdb->prefix . 'fqj_mappings',
+		'cron_hooks'          => array( 'fqj_process_invalidation_queue', 'fqj_data_migration' ),
+	);
+}
+
+/**
+ * Import the current site's FAQs from the earlier FAQ JSON-LD Manager plugin, once per site.
+ *
+ * FAQ posts and their association meta are moved, so the old plugin stops printing them (no duplicate
+ * FAQPage output) and deleting it afterwards cannot remove them. Settings, the mapping rows and the data
+ * version are copied, so data migration 3 still finds the old `post` rows on sites below data version 3.
+ * Runs before the data migration is scheduled and before activation checks for FAQs.
  */
-function rfsd_migrate_legacy_post_types() {
+function rfsd_import_legacy_data() {
 	global $wpdb;
 
-	if ( RFSD_POST_TYPE === get_option( RFSD_POST_TYPE_OPTION ) ) {
+	if ( get_option( RFSD_LEGACY_IMPORT_OPTION ) ) {
 		return;
 	}
 
-	foreach ( RFSD_LEGACY_POST_TYPES as $legacy ) {
-		// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
-		$ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s", $legacy ) );
-		if ( $ids ) {
-			$wpdb->update( $wpdb->posts, array( 'post_type' => RFSD_POST_TYPE ), array( 'post_type' => $legacy ) );
+	$legacy = rfsd_legacy_storage_names();
+	rfsd_maybe_upgrade_db();
+
+	// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.SlowDBQuery.slow_db_query_meta_key
+	$ids = array_map( 'intval', $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s", $legacy['post_type'] ) ) );
+	if ( $ids ) {
+		$wpdb->update( $wpdb->posts, array( 'post_type' => RFSD_POST_TYPE ), array( 'post_type' => $legacy['post_type'] ) );
+	}
+	foreach ( $legacy['meta'] as $old_key => $new_key ) {
+		$ids = array_merge( $ids, array_map( 'intval', $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM {$wpdb->postmeta} WHERE meta_key = %s", $old_key ) ) ) );
+		$wpdb->update( $wpdb->postmeta, array( 'meta_key' => $new_key ), array( 'meta_key' => $old_key ) );
+	}
+
+	$copied   = false;
+	$suppress = $wpdb->suppress_errors( true );
+	// Fails quietly when the old table does not exist.
+	$has_old = false !== $wpdb->query( $wpdb->prepare( 'SELECT 1 FROM %i LIMIT 0', $legacy['mappings_table'] ) );
+	$wpdb->suppress_errors( $suppress );
+	if ( $has_old && ! (int) $wpdb->get_var( $wpdb->prepare( 'SELECT COUNT(*) FROM %i', rfsd_table_name() ) ) ) {
+		$copied = 0 < (int) $wpdb->query(
+			$wpdb->prepare(
+				'INSERT INTO %i (faq_id, mapping_type, mapping_value) SELECT faq_id, mapping_type, mapping_value FROM %i ORDER BY id',
+				rfsd_table_name(),
+				$legacy['mappings_table']
+			)
+		);
+	}
+	// phpcs:enable
+
+	foreach ( array_unique( $ids ) as $id ) {
+		clean_post_cache( $id );
+	}
+
+	foreach ( $legacy['options'] as $old_name => $new_name ) {
+		$value = get_option( $old_name );
+		if ( false === $value || false !== get_option( $new_name ) ) {
+			continue;
 		}
-		// phpcs:enable
-		foreach ( $ids as $id ) {
-			clean_post_cache( (int) $id );
+		if ( RFSD_URL_MIGRATION_REPORT_OPTION === $new_name ) {
+			rfsd_update_option_no_autoload( $new_name, $value );
+		} else {
+			update_option( $new_name, $value );
 		}
 	}
+	// Without copied rows the index has to be rebuilt, which a missing data version triggers.
+	$data_version = get_option( $legacy['data_version_option'] );
+	if ( $copied && false !== $data_version && false === get_option( RFSD_DATA_VERSION_OPTION ) ) {
+		update_option( RFSD_DATA_VERSION_OPTION, $data_version );
+	}
+
+	foreach ( $legacy['cron_hooks'] as $hook ) {
+		wp_clear_scheduled_hook( $hook );
+	}
 
-	update_option( RFSD_POST_TYPE_OPTION, RFSD_POST_TYPE );
+	update_option( RFSD_LEGACY_IMPORT_OPTION, '1' );
 }
-add_action( 'plugins_loaded', 'rfsd_migrate_legacy_post_types', 5 );
+add_action( 'plugins_loaded', 'rfsd_import_legacy_data', 5 );
 
 /**
  * Run a callback for every site of the network, or once when the install is single-site.
@@ -141,7 +213,7 @@ function rfsd_for_each_site( $callback ) {
  * Activate the plugin for the current site: create DB table, defaults, schedule cron.
  */
 function rfsd_activate_site() {
-	rfsd_migrate_legacy_post_types();
+	rfsd_import_legacy_data();
 
 	// A site with no FAQs yet has nothing to migrate.
 	if ( false === get_option( RFSD_DATA_VERSION_OPTION ) && ! rfsd_has_faq_items() ) {
diff --git a/tests/php/test-legacy-import.php b/tests/php/test-legacy-import.php
index 80a46c8..c776cb9 100644
--- a/tests/php/test-legacy-import.php
+++ b/tests/php/test-legacy-import.php
@@ -1,27 +1,71 @@
 <?php
 /**
- * Renaming FAQ items stored under a legacy post type (faq_item) to RFSD_POST_TYPE.
+ * Importing a site's data from the earlier FAQ JSON-LD Manager plugin (slug faq-jsonld).
  *
  * @package Renderbit_FAQ_Structured_Data
  */
 
 /**
- * Post type migration tests.
+ * Legacy import tests.
  */
-class Test_RFSD_Post_Type_Migration extends RFSD_TestCase {
+class Test_RFSD_Legacy_Import extends RFSD_TestCase {
 
 	/**
-	 * Create a FAQ stored under the legacy post type, as an older version saved it.
+	 * Legacy names, as the old plugin stored them.
 	 *
-	 * @param array $payload Association payload stored as JSON meta.
+	 * @var array
+	 */
+	private $legacy;
+
+	public function set_up() {
+		parent::set_up();
+		$this->legacy = rfsd_legacy_storage_names();
+		delete_option( RFSD_LEGACY_IMPORT_OPTION );
+	}
+
+	public function tear_down() {
+		global $wpdb;
+		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
+		$wpdb->query( $wpdb->prepare( 'DROP TABLE IF EXISTS %i', $this->legacy['mappings_table'] ) );
+		parent::tear_down();
+	}
+
+	/**
+	 * Create the old plugin's mapping table with the given rows.
+	 *
+	 * @param array $rows Arrays of faq_id, mapping_type, mapping_value.
+	 */
+	private function create_legacy_table( $rows ) {
+		global $wpdb;
+		$table = $this->legacy['mappings_table'];
+		// phpcs:disable WordPress.DB.DirectDatabaseQuery, WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+		$wpdb->query(
+			"CREATE TABLE {$table} (
+				id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+				faq_id bigint(20) unsigned NOT NULL,
+				mapping_type VARCHAR(32) NOT NULL,
+				mapping_value TEXT NOT NULL,
+				PRIMARY KEY  (id)
+			)"
+		);
+		foreach ( $rows as $row ) {
+			$wpdb->insert( $table, array_combine( array( 'faq_id', 'mapping_type', 'mapping_value' ), $row ) );
+		}
+		// phpcs:enable
+	}
+
+	/**
+	 * Create a FAQ the way the old plugin saved it.
+	 *
+	 * @param array $payload Association payload.
 	 * @param array $args    Extra post fields.
 	 * @return int FAQ ID.
 	 */
-	protected function create_legacy_faq( $payload = null, $args = array() ) {
+	private function create_legacy_faq( $payload = array(), $args = array() ) {
 		$faq = self::factory()->post->create(
 			array_merge(
 				array(
-					'post_type'    => 'faq_item',
+					'post_type'    => $this->legacy['post_type'],
 					'post_status'  => 'publish',
 					'post_title'   => 'Legacy?',
 					'post_content' => 'Yes.',
@@ -29,69 +73,116 @@ protected function create_legacy_faq( $payload = null, $args = array() ) {
 				$args
 			)
 		);
-		if ( null !== $payload ) {
-			update_post_meta( $faq, 'rfsd_assoc_data_json', wp_json_encode( $payload ) );
-		}
-		delete_option( RFSD_POST_TYPE_OPTION );
+		update_post_meta( $faq, 'fqj_assoc_data_json', wp_slash( wp_json_encode( $payload ) ) );
+		update_post_meta( $faq, 'fqj_assoc_type', 'urls' );
 
 		return $faq;
 	}
 
-	public function test_legacy_post_type_is_not_the_current_one() {
-		$this->assertSame( 'rfsd_faq', RFSD_POST_TYPE );
-		$this->assertContains( 'faq_item', RFSD_LEGACY_POST_TYPES );
-		$this->assertNotContains( RFSD_POST_TYPE, RFSD_LEGACY_POST_TYPES );
-		$this->assertFalse( post_type_exists( 'faq_item' ) );
+	/**
+	 * Number of rows still stored under the old plugin's names, which its uninstall would delete.
+	 *
+	 * @return int
+	 */
+	private function legacy_rows_left() {
+		global $wpdb;
+		// phpcs:disable WordPress.DB.DirectDatabaseQuery
+		$posts = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->posts} WHERE post_type = %s", $this->legacy['post_type'] ) );
+		$meta  = (int) $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->postmeta} WHERE meta_key IN ('fqj_assoc_data_json', 'fqj_assoc_type')" );
+		// phpcs:enable
+
+		return $posts + $meta;
 	}
 
-	public function test_migration_renames_legacy_faqs_in_every_status() {
-		$published = $this->create_legacy_faq();
-		$draft     = $this->create_legacy_faq( null, array( 'post_status' => 'draft' ) );
-		$trashed   = $this->create_legacy_faq( null, array( 'post_status' => 'trash' ) );
-		$post      = self::factory()->post->create();
-		// Prime the object cache with the old post type.
-		$this->assertSame( 'faq_item', get_post( $published )->post_type );
+	public function test_fresh_site_only_records_the_import() {
+		$data_version = get_option( RFSD_DATA_VERSION_OPTION );
 
-		rfsd_migrate_legacy_post_types();
+		rfsd_import_legacy_data();
 
-		foreach ( array( $published, $draft, $trashed ) as $id ) {
-			$this->assertSame( RFSD_POST_TYPE, get_post( $id )->post_type, "post {$id}" );
-		}
-		$this->assertSame( 'post', get_post( $post )->post_type );
-		$this->assertSame( RFSD_POST_TYPE, get_option( RFSD_POST_TYPE_OPTION ) );
+		$this->assertSame( '1', get_option( RFSD_LEGACY_IMPORT_OPTION ) );
+		$this->assertSame( $data_version, get_option( RFSD_DATA_VERSION_OPTION ) );
+		$this->assertFalse( rfsd_has_faq_items() );
 	}
 
-	public function test_migration_runs_once_per_site() {
-		rfsd_migrate_legacy_post_types();
-		$this->assertSame( RFSD_POST_TYPE, get_option( RFSD_POST_TYPE_OPTION ) );
+	public function test_import_from_data_version_2_keeps_url_associations() {
+		$post      = self::factory()->post->create( array( 'post_name' => 'hello' ) );
+		$shortlink = home_url( '/?p=' . $post );
+		$draft     = $this->create_legacy_faq( array(), array( 'post_status' => 'draft' ) );
+		$faq       = $this->create_legacy_faq( array( 'urls' => array( $shortlink ) ) );
+		// Version 2 indexing: the absolute URL plus the post it resolved to.
+		$this->create_legacy_table(
+			array(
+				array( $faq, 'url', $shortlink ),
+				array( $faq, 'post', (string) $post ),
+			)
+		);
+		delete_option( RFSD_OPTION_KEY );
+		delete_option( RFSD_DATA_VERSION_OPTION );
+		update_option( 'fqj_settings', array( 'cache_ttl' => 60 ) );
+		update_option( 'fqj_data_version', '2' );
+		wp_schedule_event( time() + 60, 'hourly', 'fqj_process_invalidation_queue' );
+		// Prime the caches with the old post type.
+		$this->assertSame( $this->legacy['post_type'], get_post( $faq )->post_type );
+
+		rfsd_import_legacy_data();
 
-		// A legacy row added after the migration (e.g. by an import) is left alone; the option short-circuits.
-		$late = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
-		rfsd_migrate_legacy_post_types();
-		$this->assertSame( 'faq_item', get_post( $late )->post_type );
-	}
+		$this->assertSame( RFSD_POST_TYPE, get_post( $faq )->post_type );
+		$this->assertSame( RFSD_POST_TYPE, get_post( $draft )->post_type );
+		$this->assertSame( 'urls', get_post_meta( $faq, 'rfsd_assoc_type', true ) );
+		$this->assertSame( 0, $this->legacy_rows_left(), 'Nothing is left for the old plugin to print or uninstall.' );
+		$this->assertSame( array( 'cache_ttl' => 60 ), get_option( RFSD_OPTION_KEY ) );
+		$this->assertSame( '2', get_option( RFSD_DATA_VERSION_OPTION ) );
+		$this->assertCount( 2, $this->get_mappings( $faq ) );
+		$this->assertFalse( wp_next_scheduled( 'fqj_process_invalidation_queue' ) );
 
-	public function test_migration_runs_before_the_schema_upgrade_and_data_migration() {
-		$migrate = has_action( 'plugins_loaded', 'rfsd_migrate_legacy_post_types' );
-		$this->assertNotFalse( $migrate );
-		$this->assertLessThan( has_action( 'plugins_loaded', 'rfsd_maybe_upgrade_db' ), $migrate );
-		$this->assertLessThan( has_action( 'plugins_loaded', 'rfsd_maybe_schedule_data_migration' ), $migrate );
+		rfsd_run_data_migration();
+
+		$this->assertSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
+		$this->assertSame( array( get_permalink( $post ) ), json_decode( get_post_meta( $faq, 'rfsd_assoc_data_json', true ), true )['urls'] );
+		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $post ) );
+		$this->assertStringContainsString( 'Legacy?', rfsd_render_faq_jsonld( $post ) );
 	}
 
-	public function test_upgrade_from_data_version_2_reindexes_renamed_faqs() {
+	public function test_import_without_the_old_table_rebuilds_the_index() {
 		$post = self::factory()->post->create();
 		$faq  = $this->create_legacy_faq( array( 'posts' => array( $post ) ) );
-		update_option( RFSD_DATA_VERSION_OPTION, '2' );
+		delete_option( RFSD_DATA_VERSION_OPTION );
+		update_option( 'fqj_data_version', '3' );
 
-		rfsd_migrate_legacy_post_types();
-		rfsd_run_data_migration();
+		rfsd_import_legacy_data();
 
-		$this->assertSame( RFSD_DATA_VERSION, get_option( RFSD_DATA_VERSION_OPTION ) );
+		// No copied rows, so the data version stays unset and the data migration reindexes every FAQ.
+		$this->assertFalse( get_option( RFSD_DATA_VERSION_OPTION ) );
+		rfsd_run_data_migration();
 		$this->assertSame( array( $faq ), rfsd_faq_ids_for_post( $post ) );
-		$this->assertStringContainsString( 'Legacy?', rfsd_render_faq_jsonld( $post ) );
 	}
 
-	public function test_activation_renames_legacy_faqs_before_checking_for_faqs() {
+	public function test_import_keeps_this_plugins_own_settings() {
+		update_option( RFSD_OPTION_KEY, array( 'cache_ttl' => 120 ) );
+		update_option( 'fqj_settings', array( 'cache_ttl' => 60 ) );
+
+		rfsd_import_legacy_data();
+
+		$this->assertSame( array( 'cache_ttl' => 120 ), get_option( RFSD_OPTION_KEY ) );
+	}
+
+	public function test_import_runs_once_per_site() {
+		rfsd_import_legacy_data();
+
+		// FAQs the old plugin creates later (while it is still active) are its own.
+		$late = $this->create_legacy_faq();
+		rfsd_import_legacy_data();
+		$this->assertSame( $this->legacy['post_type'], get_post( $late )->post_type );
+	}
+
+	public function test_import_runs_before_the_schema_upgrade_and_data_migration() {
+		$import = has_action( 'plugins_loaded', 'rfsd_import_legacy_data' );
+		$this->assertNotFalse( $import );
+		$this->assertLessThan( has_action( 'plugins_loaded', 'rfsd_maybe_upgrade_db' ), $import );
+		$this->assertLessThan( has_action( 'plugins_loaded', 'rfsd_maybe_schedule_data_migration' ), $import );
+	}
+
+	public function test_activation_imports_before_checking_for_faqs() {
 		$faq = $this->create_legacy_faq();
 		delete_option( RFSD_DATA_VERSION_OPTION );
 
diff --git a/tests/php/test-multisite.php b/tests/php/test-multisite.php
index 61ab7cf..50d1c24 100644
--- a/tests/php/test-multisite.php
+++ b/tests/php/test-multisite.php
@@ -99,13 +99,13 @@ public function test_network_activation_keeps_each_sites_settings() {
 		$this->assertSame( 12 * HOUR_IN_SECONDS, get_option( RFSD_OPTION_KEY )['cache_ttl'] );
 	}
 
-	public function test_network_activation_renames_legacy_faqs_on_every_site() {
+	public function test_network_activation_imports_legacy_faqs_on_every_site() {
 		$site_id = self::factory()->blog->create();
 		$faqs    = array();
 		foreach ( array( get_main_site_id(), $site_id ) as $id ) {
 			switch_to_blog( $id );
 			$faqs[ $id ] = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
-			delete_option( RFSD_POST_TYPE_OPTION );
+			delete_option( RFSD_LEGACY_IMPORT_OPTION );
 			restore_current_blog();
 		}
 
diff --git a/tests/php/test-uninstall.php b/tests/php/test-uninstall.php
index 09ad356..19a5acc 100644
--- a/tests/php/test-uninstall.php
+++ b/tests/php/test-uninstall.php
@@ -64,7 +64,7 @@ public function test_uninstall_removes_options_table_and_transients() {
 		global $wpdb;
 
 		update_option( RFSD_OPTION_KEY, array( 'cache_ttl' => 60 ) );
-		update_option( RFSD_POST_TYPE_OPTION, RFSD_POST_TYPE );
+		update_option( RFSD_LEGACY_IMPORT_OPTION, '1' );
 		rfsd_update_option_no_autoload(
 			RFSD_URL_MIGRATION_REPORT_OPTION,
 			array(
@@ -87,7 +87,7 @@ public function test_uninstall_removes_options_table_and_transients() {
 		$this->assertFalse( get_option( '_transient_timeout_' . $key ) );
 		$this->assertFalse( get_option( 'rfsd_cache_gen' ) );
 		$this->assertFalse( get_option( RFSD_URL_MIGRATION_REPORT_OPTION ) );
-		$this->assertFalse( get_option( RFSD_POST_TYPE_OPTION ) );
+		$this->assertFalse( get_option( RFSD_LEGACY_IMPORT_OPTION ) );
 		$this->assertFalse( get_transient( 'rfsd_unmatched_urls_1_2' ) );
 		$this->assertSame( 'y', get_transient( 'keep_me' ) );
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
@@ -142,6 +142,7 @@ public function test_uninstall_deletes_faqs_when_filter_allows() {
 		$legacy           = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
 		$post             = self::factory()->post->create();
 		$this->post_ids[] = $post;
+		$this->post_ids[] = $legacy;
 		update_post_meta( $faq, 'rfsd_assoc_type', 'urls' );
 		add_filter( 'rfsd_uninstall_delete_faqs', '__return_true' );
 
@@ -151,7 +152,7 @@ public function test_uninstall_deletes_faqs_when_filter_allows() {
 		$this->assertNull( get_post( $faq ) );
 		$this->assertNull( get_post( $draft ) );
 		$this->assertNull( get_post( $trashed ) );
-		$this->assertNull( get_post( $legacy ), 'FAQs never migrated off the legacy post type are deleted too.' );
+		$this->assertNotNull( get_post( $legacy ), 'Posts of the old faq-jsonld plugin are left to that plugin.' );
 		$this->assertNotNull( get_post( $post ) );
 	}
 }
diff --git a/uninstall.php b/uninstall.php
index 00d68ac..f406375 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -22,7 +22,7 @@
 	global $wpdb;
 
 	// Options.
-	foreach ( array( 'rfsd_settings', 'rfsd_db_version', 'rfsd_data_version', 'rfsd_data_migration_cursor', 'rfsd_invalidation_log', 'rfsd_last_queue_run', 'rfsd_cache_gen', 'rfsd_url_migration_report', 'rfsd_post_type' ) as $option ) {
+	foreach ( array( 'rfsd_settings', 'rfsd_db_version', 'rfsd_data_version', 'rfsd_data_migration_cursor', 'rfsd_invalidation_log', 'rfsd_last_queue_run', 'rfsd_cache_gen', 'rfsd_url_migration_report', 'rfsd_legacy_import' ) as $option ) {
 		delete_option( $option );
 	}
 
@@ -51,7 +51,7 @@
 		do {
 			$faq_ids = get_posts(
 				array(
-					'post_type'              => array( 'rfsd_faq', 'faq_item' ),
+					'post_type'              => 'rfsd_faq',
 					// 'any' skips statuses excluded from search, such as trash.
 					'post_status'            => array_keys( get_post_stati() ),
 					'posts_per_page'         => 100,

From fe06ad6e90fdfb3d21d537b46a5c48f26aa42eef Mon Sep 17 00:00:00 2001
From: Soham Banerjee <soham@renderbit.com>
Date: Fri, 23 Oct 2026 15:33:13 +0530
Subject: [PATCH 4/6] Release 4.0.0: changelog, switching FAQ, docs for the
 rename

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .github/copilot-instructions.md   |  2 +-
 AGENTS.md                         |  2 +-
 CLAUDE.md                         |  4 ++--
 README.md                         |  2 +-
 composer.json                     |  2 +-
 composer.lock                     |  2 +-
 readme.txt                        | 15 ++++++++++-----
 renderbit-faq-structured-data.php |  4 ++--
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 1346777..6f70709 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -6,7 +6,7 @@ This plugin manages FAQ items as a custom post type (CPT) and injects FAQ JSON-L
 
 ## Architecture & Key Components
 
-- **Custom Post Type:** `rfsd_faq` (formerly `faq_item`) is registered for FAQ entries.
+- **Custom Post Type:** `rfsd_faq` is registered for FAQ entries.
 - **Mapping Table:** MySQL table (`rfsd_mappings`) links FAQ items to posts, post types, terms, URLs, or global context. See `includes/indexer.php`.
 - **JSON-LD Output:** Injected on the frontend using `includes/frontend.php`, with per-post transient caching for performance.
 - **Cache Invalidation:** Uses a background queue (`includes/queue.php`) processed by WP-Cron or WP-CLI. Queue state and logs are visible in the Health admin page.
diff --git a/AGENTS.md b/AGENTS.md
index b5e3f0a..9822920 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,6 +1,6 @@
 # AGENTS.md
 
-WordPress plugin `renderbit-faq-structured-data`: FAQs as a `rfsd_faq` CPT (`RFSD_POST_TYPE`; renamed from `faq_item` on upgrade), schema.org `FAQPage` JSON-LD printed on singular posts/pages. Procedural PHP, every function prefixed `rfsd_`, no build step, no runtime Composer deps.
+WordPress plugin `renderbit-faq-structured-data`: FAQs as a `rfsd_faq` CPT (`RFSD_POST_TYPE`; FAQs from the old `faq-jsonld` plugin are imported on activation), schema.org `FAQPage` JSON-LD printed on singular posts/pages. Procedural PHP, every function prefixed `rfsd_`, no build step, no runtime Composer deps.
 
 **PHP ceiling is 7.2 for shipped code** — `composer.json` pins platform 7.4, so syntax up to 7.4 passes locally while CI's `php -l` matrix (7.2–8.4) fails. Write 7.2-compatible syntax in `renderbit-faq-structured-data.php`, `uninstall.php`, `includes/`.
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 1c3a788..3fcf28c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -25,7 +25,7 @@ PHPUnit runs against a real MySQL/MariaDB database that the suite **wipes on eve
 
 ## Architecture
 
-`renderbit-faq-structured-data.php` defines constants, requires every file in `includes/`, registers the CPT (renaming FAQs stored under a post type in `RFSD_LEGACY_POST_TYPES` once per site, on `plugins_loaded` priority 5 and on activation, before the schema upgrade and data migration), and handles activation/deactivation (looping over all sites via `rfsd_for_each_site()` on network activation and setting up new sites on `wp_initialize_site`).
+`renderbit-faq-structured-data.php` defines constants, requires every file in `includes/`, registers the CPT, imports a site's data from the old FAQ JSON-LD Manager plugin (`faq-jsonld`, `fqj_` names listed in `rfsd_legacy_storage_names()`) once per site in `rfsd_import_legacy_data()` (on `plugins_loaded` priority 5 and on activation, before the schema upgrade, the data migration and activation's has-FAQs check), and handles activation/deactivation (looping over all sites via `rfsd_for_each_site()` on network activation and setting up new sites on `wp_initialize_site`).
 
 Data flow:
 
@@ -42,7 +42,7 @@ Schema and data versioning (constants in `renderbit-faq-structured-data.php`):
 - `RFSD_DB_VERSION`: bump whenever the `CREATE TABLE` SQL in `rfsd_create_table()` changes. `rfsd_maybe_upgrade_db()` reruns `dbDelta` on `plugins_loaded`. dbDelta needs a strict format (no `IF NOT EXISTS`, two spaces after `PRIMARY KEY`, `KEY` not `INDEX`, no inline comments).
 - `RFSD_DATA_VERSION`: bump to force a one-time reindex of every FAQ plus a cache purge on existing sites. `rfsd_run_data_migration()` processes FAQs in batches through a cron event, keeping its place in a cursor option. Version 3 (`rfsd_migrate_url_associations()`) reads each FAQ's old `post` rows before reindexing and rewrites URL associations that only matched through them, recording each change in the non-autoloaded `rfsd_url_migration_report` option shown on the FAQ list screen until dismissed.
 
-`uninstall.php` removes options, transients, cron events, post meta and both tables on every site. FAQ posts (`rfsd_faq`, plus any left under the legacy `faq_item`) are kept unless the `rfsd_uninstall_delete_faqs` filter returns true.
+`uninstall.php` removes options, transients, cron events, post meta and both tables on every site. `rfsd_faq` posts are kept unless the `rfsd_uninstall_delete_faqs` filter returns true.
 
 Admin JS (`assets/js/rfsd-admin.js`, `rfsd-health.js`) uses jQuery and a bundled Select2 (`assets/vendor/select2`, not a CDN). It talks to `wp_ajax_rfsd_*` handlers protected by the `rfsd_admin_nonce` nonce, and gets its strings through `wp_localize_script`.
 
diff --git a/README.md b/README.md
index 45d2562..52521a5 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ A WordPress plugin to manage FAQ items as a custom post type (CPT) and inject FA
 
 ## Features
 
-- **Custom Post Type:** Manage FAQ items via the `rfsd_faq` CPT (named `faq_item` before 3.1.1; existing FAQs are renamed on upgrade).
+- **Custom Post Type:** Manage FAQ items via the `rfsd_faq` CPT (the old FAQ JSON-LD Manager plugin used `faq_item`; its FAQs are imported on activation).
 - **Mapping Table:** Fast MySQL table (`rfsd_mappings`) links FAQ items to posts, post types, terms, URLs, or global context.
 - **JSON-LD Output:** Injects FAQ schema on the frontend, with per-post transient caching.
 - **Cache Invalidation:** Background queue (WP-Cron or WP-CLI) for efficient cache purging.
diff --git a/composer.json b/composer.json
index 13a6f58..e05d991 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "WordPress plugin to manage FAQ items as CPT and inject FAQ JSON-LD with advanced caching and queueing.",
   "type": "wordpress-plugin",
   "license": "GPL-2.0-or-later",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "keywords": ["wordpress", "plugin", "faq", "json-ld", "schema", "cpt"],
   "authors": [
     {
diff --git a/composer.lock b/composer.lock
index aba209e..f0709c3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1a98d2968cfaafd77725584d0a4cd16a",
+    "content-hash": "4c1c9b4fe890c4c9b999ed09c23222e8",
     "packages": [
         {
             "name": "composer/installers",
diff --git a/readme.txt b/readme.txt
index a175692..ce2a948 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: faq, schema, json-ld, structured data, seo
 Requires at least: 6.5
 Tested up to: 7.1
 Requires PHP: 7.2
-Stable tag: 3.1.1
+Stable tag: 4.0.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 
@@ -63,14 +63,19 @@ Yes. Write answers in the editor as usual; blocks and shortcodes are rendered an
 
 Yes. "Purge all" bumps a cache generation number instead of deleting transients one by one, so it works with persistent object caches.
 
+= I used FAQ JSON-LD Manager. How do I switch? =
+
+Install and activate Renderbit FAQ Structured Data while the old plugin is still installed. On activation (and on each site of a network) it moves the FAQ items and their associations over and copies the settings. Then deactivate and delete FAQ JSON-LD Manager. Do not delete the old plugin first: its uninstall removes the FAQ associations.
+
 = What happens when I delete the plugin? =
 
 Its options, transients, scheduled events, post meta and mapping table are removed. FAQ item posts are kept unless you enable the `rfsd_uninstall_delete_faqs` filter.
 
 == Changelog ==
 
-= 3.1.1 =
-* FAQ items now use the prefixed post type `rfsd_faq` instead of `faq_item`, so they cannot collide with another plugin's FAQ post type. Existing FAQs are moved over automatically on upgrade; links or code that use `post_type=faq_item` need updating.
+= 4.0.0 =
+* Renamed from FAQ JSON-LD Manager (`faq-jsonld`) to Renderbit FAQ Structured Data (`renderbit-faq-structured-data`). Install and activate this plugin first: it imports the FAQs, their associations and the settings of FAQ JSON-LD Manager on every site. Then deactivate and delete the old plugin. Deleting the old plugin first removes the FAQ associations.
+* Every name now uses the `rfsd_` prefix. The FAQ post type is `rfsd_faq` (was `faq_item`), the filters are `rfsd_question_text`, `rfsd_answer_text` and `rfsd_uninstall_delete_faqs` (were `fqj_*`), and the WP-CLI command is `wp rfsd` (was `wp fqj`). Update any custom code, bookmarks or scripts that use the old names.
 * The invalidation queue notice only appears on the plugin's own screens (FAQ list and editor, Health, Settings) instead of on every admin page, and can be translated.
 * Updated the bundled Select2 to 4.1.0.
 
@@ -97,8 +102,8 @@ Its options, transients, scheduled events, post meta and mapping table are remov
 
 == Upgrade Notice ==
 
-= 3.1.1 =
-FAQ items move to the prefixed post type `rfsd_faq` automatically. Update any bookmarks or custom code that use `post_type=faq_item`.
+= 4.0.0 =
+Replaces FAQ JSON-LD Manager. Activate this plugin before deleting the old one so your FAQs and settings are imported. Filters, the post type and the WP-CLI command now use the `rfsd` prefix.
 
 = 3.1.0 =
 URL associations now match the URL itself. The upgrade rewrites URLs that only matched the old way and lists every change on the FAQ list screen.
diff --git a/renderbit-faq-structured-data.php b/renderbit-faq-structured-data.php
index 759d893..ed38d4f 100644
--- a/renderbit-faq-structured-data.php
+++ b/renderbit-faq-structured-data.php
@@ -3,7 +3,7 @@
  * Plugin Name: Renderbit FAQ Structured Data
  * Plugin URI:  https://github.com/renderbit-technologies/faq-jsonld-wordpress-plugin
  * Description: Manage FAQ items as a custom post type and output FAQPage JSON-LD on the posts and pages they apply to.
- * Version:     3.1.1
+ * Version:     4.0.0
  * Requires at least: 6.5
  * Requires PHP: 7.2
  * Author:      Renderbit Technologies
@@ -21,7 +21,7 @@
 // phpcs:disable PSR1.Files.SideEffects
 
 // Keep in sync with the Version header above; used to version the plugin's own assets.
-define( 'RFSD_VERSION', '3.1.1' );
+define( 'RFSD_VERSION', '4.0.0' );
 // Upper bound for the invalidation batch size setting.
 define( 'RFSD_MAX_BATCH_SIZE', 5000 );
 define( 'RFSD_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

From b0a82bc69dc192c0fb3898a29c6dd908f5bf206f Mon Sep 17 00:00:00 2001
From: Soham Banerjee <soham@renderbit.com>
Date: Fri, 23 Oct 2026 15:37:12 +0530
Subject: [PATCH 5/6] Only import faq_item posts on sites the old plugin set
 up; keep Select2 4.0 result styles

- rfsd_import_legacy_data() now requires fqj_db_version or fqj_settings,
  which only FAQ JSON-LD Manager writes, so another plugin's faq_item posts
  are never taken over.
- When a reused Select2 script has no known stylesheet, the bundled 4.1 CSS
  gets the 4.0 aria-selected result rules inline, so the highlighted and
  selected results stay visible.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 includes/admin.php                |  8 ++++++++
 renderbit-faq-structured-data.php | 14 +++++++++++++-
 tests/php/test-admin.php          |  2 ++
 tests/php/test-legacy-import.php  | 11 +++++++++++
 tests/php/test-multisite.php      |  1 +
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/includes/admin.php b/includes/admin.php
index 75b3460..fbddc9c 100644
--- a/includes/admin.php
+++ b/includes/admin.php
@@ -73,6 +73,14 @@ function rfsd_admin_assets( $hook ) {
 				array(),
 				'4.1.0'
 			);
+			// The reused script may be Select2 4.0 (or selectWoo), which marks results with aria-selected instead
+			// of the 4.1 state classes the bundled stylesheet targets.
+			wp_add_inline_style(
+				'rfsd-select2-css',
+				'.select2-results__option[aria-selected]{cursor:pointer}'
+				. '.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}'
+				. '.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:#fff}'
+			);
 		}
 	}
 
diff --git a/renderbit-faq-structured-data.php b/renderbit-faq-structured-data.php
index ed38d4f..f685231 100644
--- a/renderbit-faq-structured-data.php
+++ b/renderbit-faq-structured-data.php
@@ -106,6 +106,8 @@ function rfsd_legacy_storage_names() {
 			'fqj_settings'             => RFSD_OPTION_KEY,
 			'fqj_url_migration_report' => RFSD_URL_MIGRATION_REPORT_OPTION,
 		),
+		// Options only the old plugin writes; without one of them a faq_item post belongs to some other plugin.
+		'evidence_options'    => array( 'fqj_db_version', 'fqj_settings' ),
 		'data_version_option' => 'fqj_data_version',
 		'mappings_table'      => $wpdb->prefix . 'fqj_mappings',
 		'cron_hooks'          => array( 'fqj_process_invalidation_queue', 'fqj_data_migration' ),
@@ -115,6 +117,8 @@ function rfsd_legacy_storage_names() {
 /**
  * Import the current site's FAQs from the earlier FAQ JSON-LD Manager plugin, once per site.
  *
+ * Only sites the old plugin was set up on are touched, so another plugin's `faq_item` posts stay its own.
+ *
  * FAQ posts and their association meta are moved, so the old plugin stops printing them (no duplicate
  * FAQPage output) and deleting it afterwards cannot remove them. Settings, the mapping rows and the data
  * version are copied, so data migration 3 still finds the old `post` rows on sites below data version 3.
@@ -127,7 +131,15 @@ function rfsd_import_legacy_data() {
 		return;
 	}
 
-	$legacy = rfsd_legacy_storage_names();
+	$legacy    = rfsd_legacy_storage_names();
+	$installed = false;
+	foreach ( $legacy['evidence_options'] as $name ) {
+		$installed = $installed || false !== get_option( $name );
+	}
+	if ( ! $installed ) {
+		update_option( RFSD_LEGACY_IMPORT_OPTION, '1' );
+		return;
+	}
 	rfsd_maybe_upgrade_db();
 
 	// phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.SlowDBQuery.slow_db_query_meta_key
diff --git a/tests/php/test-admin.php b/tests/php/test-admin.php
index c6f6f7f..43c5e0b 100644
--- a/tests/php/test-admin.php
+++ b/tests/php/test-admin.php
@@ -507,6 +507,8 @@ public function test_admin_assets_fall_back_to_bundled_css_for_reused_script() {
 
 		$this->assertTrue( wp_style_is( 'rfsd-select2-css', 'enqueued' ) );
 		$this->assertFalse( wp_script_is( 'rfsd-select2-js', 'enqueued' ) );
+		$inline = implode( '', (array) wp_styles()->get_data( 'rfsd-select2-css', 'after' ) );
+		$this->assertStringContainsString( '.select2-results__option--highlighted[aria-selected]', $inline, 'Select2 4.0 result states stay styled.' );
 		wp_dequeue_script( 'selectWoo' );
 		wp_deregister_script( 'selectWoo' );
 	}
diff --git a/tests/php/test-legacy-import.php b/tests/php/test-legacy-import.php
index c776cb9..b63b937 100644
--- a/tests/php/test-legacy-import.php
+++ b/tests/php/test-legacy-import.php
@@ -75,6 +75,8 @@ private function create_legacy_faq( $payload = array(), $args = array() ) {
 		);
 		update_post_meta( $faq, 'fqj_assoc_data_json', wp_slash( wp_json_encode( $payload ) ) );
 		update_post_meta( $faq, 'fqj_assoc_type', 'urls' );
+		// The old plugin's activation records its schema version.
+		update_option( 'fqj_db_version', '3' );
 
 		return $faq;
 	}
@@ -104,6 +106,15 @@ public function test_fresh_site_only_records_the_import() {
 		$this->assertFalse( rfsd_has_faq_items() );
 	}
 
+	public function test_another_plugins_faq_item_posts_are_left_alone() {
+		$other = self::factory()->post->create( array( 'post_type' => $this->legacy['post_type'] ) );
+
+		rfsd_import_legacy_data();
+
+		$this->assertSame( $this->legacy['post_type'], get_post( $other )->post_type );
+		$this->assertSame( '1', get_option( RFSD_LEGACY_IMPORT_OPTION ) );
+	}
+
 	public function test_import_from_data_version_2_keeps_url_associations() {
 		$post      = self::factory()->post->create( array( 'post_name' => 'hello' ) );
 		$shortlink = home_url( '/?p=' . $post );
diff --git a/tests/php/test-multisite.php b/tests/php/test-multisite.php
index 50d1c24..41db0fc 100644
--- a/tests/php/test-multisite.php
+++ b/tests/php/test-multisite.php
@@ -106,6 +106,7 @@ public function test_network_activation_imports_legacy_faqs_on_every_site() {
 			switch_to_blog( $id );
 			$faqs[ $id ] = self::factory()->post->create( array( 'post_type' => 'faq_item' ) );
 			delete_option( RFSD_LEGACY_IMPORT_OPTION );
+			update_option( 'fqj_db_version', '3' );
 			restore_current_blog();
 		}
 

From 43d3c3132d81a3831a2a37fc732a4bfac29bbac3 Mon Sep 17 00:00:00 2001
From: Soham Banerjee <soham@renderbit.com>
Date: Fri, 23 Oct 2026 15:38:58 +0530
Subject: [PATCH 6/6] Declare localized JS globals and drop a redeclared var
 (Codacy ESLint)

The JS file renames made Codacy report the existing no-undef (rfsdAdmin,
rfsdHealth from wp_localize_script) and no-redeclare (select) findings as
new.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 assets/js/rfsd-admin.js  | 7 ++++---
 assets/js/rfsd-health.js | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/assets/js/rfsd-admin.js b/assets/js/rfsd-admin.js
index 0ed1c9d..224cb7b 100644
--- a/assets/js/rfsd-admin.js
+++ b/assets/js/rfsd-admin.js
@@ -1,3 +1,4 @@
+/* global rfsdAdmin */
 jQuery(document).ready(function ($) {
   var $assocType = $("#rfsd_assoc_type");
   var $container = $("#rfsd_assoc_container");
@@ -161,12 +162,12 @@ jQuery(document).ready(function ($) {
         }
       });
       if (data.terms && data.terms.length) {
-        var select = $("#rfsd_assoc_terms_select");
+        var termsSelect = $("#rfsd_assoc_terms_select");
         data.terms.forEach(function (t) {
           var option = new Option(t.text, t.id, true, true);
-          select.append(option);
+          termsSelect.append(option);
         });
-        select.trigger("change");
+        termsSelect.trigger("change");
       }
     } else if (type === "global") {
       $container.append(el("p").text(i18n.globalHelp));
diff --git a/assets/js/rfsd-health.js b/assets/js/rfsd-health.js
index 8093157..9f58cd2 100644
--- a/assets/js/rfsd-health.js
+++ b/assets/js/rfsd-health.js
@@ -1,3 +1,4 @@
+/* global rfsdHealth */
 jQuery(document).ready(function ($) {
   // Strings come from wp_localize_script (rfsdHealth.i18n); English is the fallback.
   var i18n = $.extend(