diff --git a/built-in-ai-task-apis-polyfills/README.md b/built-in-ai-task-apis-polyfills/README.md
index 9e0815e..80bbcc5 100644
--- a/built-in-ai-task-apis-polyfills/README.md
+++ b/built-in-ai-task-apis-polyfills/README.md
@@ -9,7 +9,7 @@ specifically:
 - **Rewriter API**
 - **Language Detector API**
 - **Translator API**
-- **Taxonomizer API**
+- **Classifier API**
 
 These polyfills are backed by the
 [`prompt-api-polyfill`](https://github.com/GoogleChromeLabs/web-ai-demos/tree/main/prompt-api-polyfill),
@@ -25,7 +25,7 @@ window.Writer;
 window.Rewriter;
 window.LanguageDetector;
 window.Translator;
-window.Taxonomizer;
+window.Classifier;
 ```
 
 so you can use these Task APIs even in environments where they are not yet
@@ -70,8 +70,8 @@ defensive dynamic import strategy:
   if (!('Translator' in window)) {
     polyfills.push(import('built-in-ai-task-apis-polyfills/translator'));
   }
-  if (!('Taxonomizer' in window)) {
-    polyfills.push(import('built-in-ai-task-apis-polyfills/taxonomizer'));
+  if (!('Classifier' in window)) {
+    polyfills.push(import('built-in-ai-task-apis-polyfills/classifier'));
   }
   await Promise.all(polyfills);
 
@@ -146,16 +146,14 @@ const translator = await Translator.create({
 const result = await translator.translate('Hello world');
 ```
 
-#### Taxonomizer API
+#### Classifier API
 
 ```js
-const taxonomizer = await Taxonomizer.create();
-const results = await taxonomizer.categorize('A story about a cat');
+const classifier = await Classifier.create();
+const results = await classifier.classify('A story about a cat');
 
 for (const { id, confidence } of results) {
-  console.log(
-    `${Taxonomizer.getCategoryName(id)} (${(confidence * 100).toFixed(1)}%)`
-  );
+  console.log(`${id} (${(confidence * 100).toFixed(1)}%)`);
 }
 ```
 
@@ -196,7 +194,7 @@ For complete examples, see:
 - [`demo_rewriter.html`](demo_rewriter.html)
 - [`demo_language_detector.html`](demo_language_detector.html)
 - [`demo_translator.html`](demo_translator.html)
-- [`demo_taxonomizer.html`](demo_taxonomizer.html)
+- [`demo_classifier.html`](demo_classifier.html)
 
 ---
 
diff --git a/built-in-ai-task-apis-polyfills/taxonomizer-api-polyfill.js b/built-in-ai-task-apis-polyfills/classifier-api-polyfill.js
similarity index 80%
rename from built-in-ai-task-apis-polyfills/taxonomizer-api-polyfill.js
rename to built-in-ai-task-apis-polyfills/classifier-api-polyfill.js
index 61983b1..f902bb8 100644
--- a/built-in-ai-task-apis-polyfills/taxonomizer-api-polyfill.js
+++ b/built-in-ai-task-apis-polyfills/classifier-api-polyfill.js
@@ -4,14 +4,14 @@
  */
 
 import { BaseTaskModel } from './base-task-model.js';
-import { TaxonomizerPromptBuilder } from './taxonomizer-prompt-builder.js';
+import { ClassifierPromptBuilder } from './classifier-prompt-builder.js';
 
 /**
- * Taxonomizer API Polyfill
+ * Classifier API Polyfill
  * Backed by Prompt API Polyfill (LanguageModel)
  */
 
-export class Taxonomizer extends BaseTaskModel {
+export class Classifier extends BaseTaskModel {
   #options;
 
   constructor(session, builder, options) {
@@ -30,7 +30,7 @@ export class Taxonomizer extends BaseTaskModel {
     await this.ensureLanguageModel();
     this._checkContext();
 
-    const builder = new TaxonomizerPromptBuilder();
+    const builder = new ClassifierPromptBuilder();
     const { systemPrompt, initialPrompts } = builder.buildPrompt('');
 
     const sessionOptions = {
@@ -44,22 +44,22 @@ export class Taxonomizer extends BaseTaskModel {
 
     const win = this.__window || globalThis;
     const session = await win.LanguageModel.create(sessionOptions);
-    const taxonomizer = new this(session, builder, options);
+    const classifier = new this(session, builder, options);
 
     if (options.signal) {
       options.signal.addEventListener(
         'abort',
         () => {
-          taxonomizer.destroy(options.signal.reason);
+          classifier.destroy(options.signal.reason);
         },
         { once: true }
       );
     }
 
-    return taxonomizer;
+    return classifier;
   }
 
-  async categorize(input, options = {}) {
+  async classify(input, options = {}) {
     this._checkContext();
 
     if (typeof input !== 'string') {
@@ -81,8 +81,8 @@ export class Taxonomizer extends BaseTaskModel {
       } catch (e2) {
         const win = this.constructor.__window || globalThis;
         const EX = win.DOMException || globalThis.DOMException || Error;
-        console.error('Failed to parse Taxonomizer results:', resultString);
-        throw new EX('Failed to parse categorization results.', 'UnknownError');
+        console.error('Failed to parse Classifier results:', resultString);
+        throw new EX('Failed to parse classification results.', 'UnknownError');
       }
     }
   }
@@ -90,7 +90,7 @@ export class Taxonomizer extends BaseTaskModel {
   #parseResults(jsonString) {
     let results = JSON.parse(jsonString);
     if (!Array.isArray(results)) {
-      throw new Error('Categorization results must be an array.');
+      throw new Error('Classification results must be an array.');
     }
 
     // 1. Basic cleaning and validation
@@ -143,16 +143,11 @@ export class Taxonomizer extends BaseTaskModel {
 
     return finalResults;
   }
-
-  // Static helper as requested by the user
-  static getCategoryName(id) {
-    return TaxonomizerPromptBuilder.getCategoryName(id);
-  }
 }
 
 // Global exposure if in browser
 BaseTaskModel.exposeAPIGlobally(
-  'Taxonomizer',
-  Taxonomizer,
-  '__FORCE_TAXONOMIZER_POLYFILL__'
+  'Classifier',
+  Classifier,
+  '__FORCE_CLASSIFIER_POLYFILL__'
 );
diff --git a/built-in-ai-task-apis-polyfills/taxonomizer-prompt-builder.js b/built-in-ai-task-apis-polyfills/classifier-prompt-builder.js
similarity index 98%
rename from built-in-ai-task-apis-polyfills/taxonomizer-prompt-builder.js
rename to built-in-ai-task-apis-polyfills/classifier-prompt-builder.js
index d375fc2..596c212 100644
--- a/built-in-ai-task-apis-polyfills/taxonomizer-prompt-builder.js
+++ b/built-in-ai-task-apis-polyfills/classifier-prompt-builder.js
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export class TaxonomizerPromptBuilder {
-  static #systemPromptTemplate = `You are an expert in content categorization using the IAB Content Taxonomy v3.1.
+export class ClassifierPromptBuilder {
+  static #systemPromptTemplate = `You are an expert in content classification using the IAB Content Taxonomy v3.1.
 Your task is to analyze the provided text and predict the most relevant categories.
 The taxonomy categories are provided as a flat list of Unique IDs and their corresponding Tiered Category paths.
 
@@ -749,23 +749,14 @@ JSON Schema for output:
     return this.#taxonomyData;
   }
 
-  static getCategoryName(id) {
-    // This is part of the requirement: helper to lookup category name based on ID.
-    const data = this.#taxonomyData;
-    if (!data || Object.keys(data).length === 0) {
-      return id;
-    }
-    return data[id] || id;
-  }
-
   buildPrompt(inputText) {
-    const taxonomyMap = TaxonomizerPromptBuilder.getTaxonomy();
+    const taxonomyMap = ClassifierPromptBuilder.getTaxonomy();
     const taxonomyList = Object.entries(taxonomyMap)
       .map(([id, path]) => `${id}: ${path}`)
       .join('\n');
 
     return {
-      systemPrompt: TaxonomizerPromptBuilder.#systemPromptTemplate.replace(
+      systemPrompt: ClassifierPromptBuilder.#systemPromptTemplate.replace(
         '{{taxonomy}}',
         taxonomyList
       ),
@@ -785,7 +776,7 @@ JSON Schema for output:
           ]),
         },
       ],
-      userPrompt: `TEXT TO CATEGORIZE:\n${inputText}`,
+      userPrompt: `TEXT TO CLASSIFY:\n${inputText}`,
     };
   }
 }
diff --git a/built-in-ai-task-apis-polyfills/demo_taxonomizer.html b/built-in-ai-task-apis-polyfills/demo_classifier.html
similarity index 70%
rename from built-in-ai-task-apis-polyfills/demo_taxonomizer.html
rename to built-in-ai-task-apis-polyfills/demo_classifier.html
index efaf03a..6a8e358 100644
--- a/built-in-ai-task-apis-polyfills/demo_taxonomizer.html
+++ b/built-in-ai-task-apis-polyfills/demo_classifier.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Taxonomizer API Polyfill Demo</title>
+    <title>Classifier API Polyfill Demo</title>
     <style>
       :root {
         color-scheme: dark light;
@@ -99,14 +99,14 @@
   </head>
 
   <body>
-    <h1>Taxonomizer API Polyfill Demo</h1>
+    <h1>Classifier API Polyfill Demo</h1>
 
     <textarea id="input">
 The new experimental fusion reactor at the ITER site in France has successfully sustained a stable plasma for 10 minutes, a new world record. This milestone brings us closer to clean, limitless energy. The complex tokamak device uses superconducting magnets to confine the 150 million degree Celsius fuel. Scientists from around the globe are collaborating on this massive physics project, which could revolutionize how we power our world.</textarea
     >
 
     <div id="controls">
-      <button id="categorizeBtn">Categorize Text</button>
+      <button id="classifyBtn">Classify Text</button>
       <progress
         id="progress"
         value="0"
@@ -117,9 +117,7 @@ <h1>Taxonomizer API Polyfill Demo</h1>
     </div>
 
     <h2>Predicted Categories</h2>
-    <div id="output" class="output">
-      Click "Categorize Text" to see results.
-    </div>
+    <div id="output" class="output">Click "Classify Text" to see results.</div>
 
     <script type="module">
       // Import Firebase config if present (standard pattern for this project)
@@ -135,31 +133,63 @@ <h2>Predicted Categories</h2>
       window.FIREBASE_CONFIG = firebaseConfig;
 
       // Import the polyfill
-      import { Taxonomizer } from './taxonomizer-api-polyfill.js';
+      import { Classifier } from './classifier-api-polyfill.js';
 
       const input = document.getElementById('input');
-      const categorizeBtn = document.getElementById('categorizeBtn');
+      const classifyBtn = document.getElementById('classifyBtn');
       const output = document.getElementById('output');
       const progress = document.getElementById('progress');
       const status = document.getElementById('status');
 
-      let taxonomizer = null;
+      const TAXONOMY_URL =
+        'https://raw.githubusercontent.com/InteractiveAdvertisingBureau/Taxonomies/develop/Content%20Taxonomies/Content%20Taxonomy%203.1.tsv';
+      let taxonomyMap = {};
+
+      async function fetchTaxonomy() {
+        status.textContent = 'Fetching taxonomy...';
+        const response = await fetch(TAXONOMY_URL);
+        if (!response.ok) {
+          throw new Error(`Failed to fetch taxonomy: ${response.statusText}`);
+        }
+        const tsv = await response.text();
+        return parseTSV(tsv);
+      }
+
+      function parseTSV(tsv) {
+        const lines = tsv.trim().split('\n');
+        const dataLines = lines.slice(1);
+        const taxonomy = {};
+
+        for (const line of dataLines) {
+          const [id, parent, name, t1, t2, t3, t4] = line.split('\t');
+          if (!id) {
+            continue;
+          }
+
+          const tiers = [t1, t2, t3, t4].filter((t) => t && t.trim() !== '');
+          taxonomy[id] = tiers.map((t) => t.trim()).join(' > ');
+        }
+        return taxonomy;
+      }
+
+      let classifier = null;
 
       async function init() {
         try {
-          status.textContent = 'Checking availability...';
-          const availability = await Taxonomizer.availability();
+          status.textContent = 'Initializing...';
+          taxonomyMap = await fetchTaxonomy();
+          const availability = await Classifier.availability();
 
           if (availability === 'unavailable') {
             status.textContent =
               'Error: Built-in AI (LanguageModel) not available in this browser.';
-            categorizeBtn.disabled = true;
+            classifyBtn.disabled = true;
             return;
           }
 
           status.textContent =
-            'Creating Taxonomizer instance (this may involve downloading a model)...';
-          taxonomizer = await Taxonomizer.create({
+            'Creating Classifier instance (this may involve downloading a model)...';
+          classifier = await Classifier.create({
             monitor: (m) => {
               progress.style.display = 'block';
               m.addEventListener('downloadprogress', (e) => {
@@ -180,24 +210,24 @@ <h2>Predicted Categories</h2>
         }
       }
 
-      categorizeBtn.onclick = async () => {
-        if (!taxonomizer) {
-          status.textContent = 'Taxonomizer not ready.';
+      classifyBtn.onclick = async () => {
+        if (!classifier) {
+          status.textContent = 'Classifier not ready.';
           return;
         }
 
         const text = input.value.trim();
         if (!text) {
-          alert('Please enter some text to categorize.');
+          alert('Please enter some text to classify.');
           return;
         }
 
         output.textContent = 'Analyzing content...';
-        categorizeBtn.disabled = true;
+        classifyBtn.disabled = true;
 
         try {
           const startTime = performance.now();
-          const results = await taxonomizer.categorize(text);
+          const results = await classifier.classify(text);
           const endTime = performance.now();
           const duration = ((endTime - startTime) / 1000).toFixed(1);
 
@@ -206,7 +236,7 @@ <h2>Predicted Categories</h2>
           } else {
             output.innerHTML = '';
             results.forEach((res) => {
-              const categoryPath = Taxonomizer.getCategoryName(res.id);
+              const categoryPath = taxonomyMap[res.id] || res.id;
               const item = document.createElement('div');
               item.className = 'result-item';
               item.innerHTML = `
@@ -219,12 +249,12 @@ <h2>Predicted Categories</h2>
               output.appendChild(item);
             });
           }
-          status.textContent = `Categorization complete in ${duration}s.`;
+          status.textContent = `Classification complete in ${duration}s.`;
         } catch (err) {
           output.textContent = 'Error: ' + err.message;
-          status.textContent = 'An error occurred during categorization.';
+          status.textContent = 'An error occurred during classification.';
         } finally {
-          categorizeBtn.disabled = false;
+          classifyBtn.disabled = false;
         }
       };
 
diff --git a/built-in-ai-task-apis-polyfills/index.js b/built-in-ai-task-apis-polyfills/index.js
index b1783bb..8bb0dc8 100644
--- a/built-in-ai-task-apis-polyfills/index.js
+++ b/built-in-ai-task-apis-polyfills/index.js
@@ -8,11 +8,11 @@ import './writer-api-polyfill.js';
 import './rewriter-api-polyfill.js';
 import './language-detector-api-polyfill.js';
 import './translator-api-polyfill.js';
-import './taxonomizer-api-polyfill.js';
+import './classifier-api-polyfill.js';
 
 export { Summarizer } from './summarizer-api-polyfill.js';
 export { Writer } from './writer-api-polyfill.js';
 export { Rewriter } from './rewriter-api-polyfill.js';
 export { LanguageDetector } from './language-detector-api-polyfill.js';
 export { Translator } from './translator-api-polyfill.js';
-export { Taxonomizer } from './taxonomizer-api-polyfill.js';
+export { Classifier } from './classifier-api-polyfill.js';
diff --git a/built-in-ai-task-apis-polyfills/package.json b/built-in-ai-task-apis-polyfills/package.json
index 1785ca6..6ecf6a4 100644
--- a/built-in-ai-task-apis-polyfills/package.json
+++ b/built-in-ai-task-apis-polyfills/package.json
@@ -11,7 +11,7 @@
     "./rewriter": "./dist/rewriter.js",
     "./language-detector": "./dist/language-detector.js",
     "./translator": "./dist/translator.js",
-    "./taxonomizer": "./dist/taxonomizer.js"
+    "./classifier": "./dist/classifier.js"
   },
   "files": [
     "dist/",
@@ -48,7 +48,7 @@
     "rewriter",
     "translator",
     "language-detector",
-    "taxonomizer",
+    "classifier",
     "web-ai"
   ],
   "homepage": "https://github.com/GoogleChromeLabs/web-ai-demos/tree/main/built-in-ai-task-apis-polyfills#readme",
diff --git a/built-in-ai-task-apis-polyfills/scripts/taxonomizer-taxonomy-extractor.js b/built-in-ai-task-apis-polyfills/scripts/classifier-taxonomy-extractor.js
similarity index 90%
rename from built-in-ai-task-apis-polyfills/scripts/taxonomizer-taxonomy-extractor.js
rename to built-in-ai-task-apis-polyfills/scripts/classifier-taxonomy-extractor.js
index 5b62c62..dbee7b3 100644
--- a/built-in-ai-task-apis-polyfills/scripts/taxonomizer-taxonomy-extractor.js
+++ b/built-in-ai-task-apis-polyfills/scripts/classifier-taxonomy-extractor.js
@@ -8,7 +8,7 @@ import path from 'node:path';
 
 const TAXONOMY_URL =
   'https://raw.githubusercontent.com/InteractiveAdvertisingBureau/Taxonomies/develop/Content%20Taxonomies/Content%20Taxonomy%203.1.tsv';
-const OUTPUT_FILE = path.join(process.cwd(), 'taxonomizer-prompt-builder.js');
+const OUTPUT_FILE = path.join(process.cwd(), 'classifier-prompt-builder.js');
 
 async function fetchTaxonomy() {
   console.log(`Fetching taxonomy from ${TAXONOMY_URL}...`);
@@ -58,7 +58,7 @@ function updateBuilder(taxonomyData) {
       );
     } else {
       throw new Error(
-        'Could not find #taxonomyData in taxonomizer-prompt-builder.js'
+        'Could not find #taxonomyData in classifier-prompt-builder.js'
       );
     }
   } else {
@@ -71,7 +71,7 @@ function updateBuilder(taxonomyData) {
 
   fs.writeFileSync(OUTPUT_FILE, content);
   console.log(
-    'Successfully updated taxonomizer-prompt-builder.js with the latest taxonomy data.'
+    'Successfully updated classifier-prompt-builder.js with the latest taxonomy data.'
   );
 }
 
diff --git a/built-in-ai-task-apis-polyfills/vite.config.js b/built-in-ai-task-apis-polyfills/vite.config.js
index 3bb120f..9ad0a11 100644
--- a/built-in-ai-task-apis-polyfills/vite.config.js
+++ b/built-in-ai-task-apis-polyfills/vite.config.js
@@ -28,7 +28,7 @@ export default defineConfig({
           'language-detector-api-polyfill.js'
         ),
         translator: resolve(__dirname, 'translator-api-polyfill.js'),
-        taxonomizer: resolve(__dirname, 'taxonomizer-api-polyfill.js'),
+        classifier: resolve(__dirname, 'classifier-api-polyfill.js'),
       },
       formats: ['es'],
       fileName: (format, entryName) => `${entryName}.js`,