diff --git a/README.md b/README.md
index a4e9872..39ee928 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
# ChromaDB.AgentFramework.Sample
-[Microsoft Agent Framework](https://learn.microsoft.com/agent-framework/) samples that use [Chroma](https://www.trychroma.com/) as the vector store through [ChromaDotNet.VectorData](https://www.nuget.org/packages/ChromaDotNet.VectorData).
+[Microsoft Agent Framework](https://learn.microsoft.com/agent-framework/) samples that use [Chroma](https://www.trychroma.com/) as the vector store through [CommunityToolkit.VectorData.Chroma](https://www.nuget.org/packages/CommunityToolkit.VectorData.Chroma). It is the Chroma provider of the [AI Community Toolkit](https://github.com/CommunityToolkit/AI).
They follow the form of the [Agent Framework .NET samples](https://github.com/microsoft/agent-framework/tree/main/dotnet/samples/02-agents). Chroma takes the place of the vector store that the original sample uses. Each sample also comes in a variant with models that run locally in Ollama.
diff --git a/samples/AgentWithMemory_Step10_MemoryUsingChroma/AgentWithMemory_Step10_MemoryUsingChroma.csproj b/samples/AgentWithMemory_Step10_MemoryUsingChroma/AgentWithMemory_Step10_MemoryUsingChroma.csproj
index bfa6897..2b14231 100644
--- a/samples/AgentWithMemory_Step10_MemoryUsingChroma/AgentWithMemory_Step10_MemoryUsingChroma.csproj
+++ b/samples/AgentWithMemory_Step10_MemoryUsingChroma/AgentWithMemory_Step10_MemoryUsingChroma.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/samples/AgentWithMemory_Step10_MemoryUsingChroma/Program.cs b/samples/AgentWithMemory_Step10_MemoryUsingChroma/Program.cs
index fd66de4..7284e32 100644
--- a/samples/AgentWithMemory_Step10_MemoryUsingChroma/Program.cs
+++ b/samples/AgentWithMemory_Step10_MemoryUsingChroma/Program.cs
@@ -7,7 +7,7 @@
using Azure.AI.Projects;
using Azure.Identity;
using ChromaDB.Client;
-using ChromaDB.VectorData;
+using CommunityToolkit.VectorData.Chroma;
using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
using Microsoft.Extensions.VectorData;
diff --git a/samples/AgentWithMemory_Step10_MemoryUsingChroma/README.md b/samples/AgentWithMemory_Step10_MemoryUsingChroma/README.md
index bfcd9b4..d78c0a9 100644
--- a/samples/AgentWithMemory_Step10_MemoryUsingChroma/README.md
+++ b/samples/AgentWithMemory_Step10_MemoryUsingChroma/README.md
@@ -1,6 +1,6 @@
# Agent with Memory Using Chroma
-This sample persists chat history in [Chroma](https://www.trychroma.com/) and recalls relevant messages in a new agent session. It uses `ChatHistoryMemoryProvider` with `ChromaVectorStore` from [ChromaDotNet.VectorData](https://www.nuget.org/packages/ChromaDotNet.VectorData).
+This sample persists chat history in [Chroma](https://www.trychroma.com/) and recalls relevant messages in a new agent session. It uses `ChatHistoryMemoryProvider` with `ChromaVectorStore` from [CommunityToolkit.VectorData.Chroma](https://www.nuget.org/packages/CommunityToolkit.VectorData.Chroma).
## Features Demonstrated
diff --git a/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/AgentWithMemory_Step10_MemoryUsingChroma_Ollama.csproj b/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/AgentWithMemory_Step10_MemoryUsingChroma_Ollama.csproj
index fb903c3..ecc2944 100644
--- a/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/AgentWithMemory_Step10_MemoryUsingChroma_Ollama.csproj
+++ b/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/AgentWithMemory_Step10_MemoryUsingChroma_Ollama.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/Program.cs b/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/Program.cs
index caf42df..43c1403 100644
--- a/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/Program.cs
+++ b/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/Program.cs
@@ -5,7 +5,7 @@
// The agent can then use chat history from prior conversations to inform responses in new conversations.
using ChromaDB.Client;
-using ChromaDB.VectorData;
+using CommunityToolkit.VectorData.Chroma;
using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
using Microsoft.Extensions.VectorData;
diff --git a/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/README.md b/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/README.md
index 5f40f8e..3c8c0ca 100644
--- a/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/README.md
+++ b/samples/AgentWithMemory_Step10_MemoryUsingChroma_Ollama/README.md
@@ -2,7 +2,7 @@
This sample is [Agent with Memory Using Chroma](../AgentWithMemory_Step10_MemoryUsingChroma/) with models that run locally in [Ollama](https://ollama.com/) instead of Microsoft Foundry.
-It persists chat history in [Chroma](https://www.trychroma.com/) and recalls relevant messages in a new agent session. It uses `ChatHistoryMemoryProvider` with `ChromaVectorStore` from [ChromaDotNet.VectorData](https://www.nuget.org/packages/ChromaDotNet.VectorData).
+It persists chat history in [Chroma](https://www.trychroma.com/) and recalls relevant messages in a new agent session. It uses `ChatHistoryMemoryProvider` with `ChromaVectorStore` from [CommunityToolkit.VectorData.Chroma](https://www.nuget.org/packages/CommunityToolkit.VectorData.Chroma).
## Features Demonstrated
diff --git a/samples/AgentWithRAG_Step06_ChromaRAG/AgentWithRAG_Step06_ChromaRAG.csproj b/samples/AgentWithRAG_Step06_ChromaRAG/AgentWithRAG_Step06_ChromaRAG.csproj
index b75017b..3b83805 100644
--- a/samples/AgentWithRAG_Step06_ChromaRAG/AgentWithRAG_Step06_ChromaRAG.csproj
+++ b/samples/AgentWithRAG_Step06_ChromaRAG/AgentWithRAG_Step06_ChromaRAG.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/samples/AgentWithRAG_Step06_ChromaRAG/Program.cs b/samples/AgentWithRAG_Step06_ChromaRAG/Program.cs
index 521da71..9924ac9 100644
--- a/samples/AgentWithRAG_Step06_ChromaRAG/Program.cs
+++ b/samples/AgentWithRAG_Step06_ChromaRAG/Program.cs
@@ -7,7 +7,7 @@
using Azure.AI.Projects;
using Azure.Identity;
using ChromaDB.Client;
-using ChromaDB.VectorData;
+using CommunityToolkit.VectorData.Chroma;
using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
using Microsoft.Extensions.VectorData;
diff --git a/samples/AgentWithRAG_Step06_ChromaRAG/README.md b/samples/AgentWithRAG_Step06_ChromaRAG/README.md
index 1476e9c..fbb32fe 100644
--- a/samples/AgentWithRAG_Step06_ChromaRAG/README.md
+++ b/samples/AgentWithRAG_Step06_ChromaRAG/README.md
@@ -1,6 +1,6 @@
# Agent Framework Retrieval Augmented Generation (RAG) with Chroma and a custom schema
-This sample demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with [Chroma](https://www.trychroma.com/) as the vector store. It connects to Chroma through `ChromaVectorStore` from [ChromaDotNet.VectorData](https://www.nuget.org/packages/ChromaDotNet.VectorData).
+This sample demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with [Chroma](https://www.trychroma.com/) as the vector store. It connects to Chroma through `ChromaVectorStore` from [CommunityToolkit.VectorData.Chroma](https://www.nuget.org/packages/CommunityToolkit.VectorData.Chroma).
It also uses a custom schema for the documents stored in the vector store.
## Prerequisites
diff --git a/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/AgentWithRAG_Step06_ChromaRAG_Ollama.csproj b/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/AgentWithRAG_Step06_ChromaRAG_Ollama.csproj
index fb903c3..ecc2944 100644
--- a/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/AgentWithRAG_Step06_ChromaRAG_Ollama.csproj
+++ b/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/AgentWithRAG_Step06_ChromaRAG_Ollama.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/Program.cs b/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/Program.cs
index 41698d1..cab444c 100644
--- a/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/Program.cs
+++ b/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/Program.cs
@@ -5,7 +5,7 @@
// The TextSearchProvider runs a search against the vector store before each model invocation and injects the results into the model context.
using ChromaDB.Client;
-using ChromaDB.VectorData;
+using CommunityToolkit.VectorData.Chroma;
using Microsoft.Agents.AI;
using Microsoft.Extensions.AI;
using Microsoft.Extensions.VectorData;
diff --git a/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/README.md b/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/README.md
index ff202d2..e676103 100644
--- a/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/README.md
+++ b/samples/AgentWithRAG_Step06_ChromaRAG_Ollama/README.md
@@ -2,7 +2,7 @@
This sample is [RAG with Chroma and a custom schema](../AgentWithRAG_Step06_ChromaRAG/) with models that run locally in [Ollama](https://ollama.com/) instead of Microsoft Foundry.
-It demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with [Chroma](https://www.trychroma.com/) as the vector store. It connects to Chroma through `ChromaVectorStore` from [ChromaDotNet.VectorData](https://www.nuget.org/packages/ChromaDotNet.VectorData).
+It demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with [Chroma](https://www.trychroma.com/) as the vector store. It connects to Chroma through `ChromaVectorStore` from [CommunityToolkit.VectorData.Chroma](https://www.nuget.org/packages/CommunityToolkit.VectorData.Chroma).
It also uses a custom schema for the documents.
## Prerequisites
diff --git a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/AgentWithRAG_Step07_ChromaBasicTextRAG.csproj b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/AgentWithRAG_Step07_ChromaBasicTextRAG.csproj
index b75017b..3b83805 100644
--- a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/AgentWithRAG_Step07_ChromaBasicTextRAG.csproj
+++ b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/AgentWithRAG_Step07_ChromaBasicTextRAG.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/Program.cs b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/Program.cs
index ed73afb..f3bf6e9 100644
--- a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/Program.cs
+++ b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/Program.cs
@@ -8,7 +8,7 @@
using Azure.AI.Projects;
using Azure.Identity;
using ChromaDB.Client;
-using ChromaDB.VectorData;
+using CommunityToolkit.VectorData.Chroma;
using Microsoft.Agents.AI;
using Microsoft.Agents.AI.Samples;
using Microsoft.Extensions.AI;
diff --git a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/README.md b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/README.md
index 95f774b..c8822ef 100644
--- a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/README.md
+++ b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG/README.md
@@ -1,6 +1,6 @@
# Agent Framework Retrieval Augmented Generation (RAG) with Chroma and the TextSearchStore
-This sample demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with [Chroma](https://www.trychroma.com/) as the vector store. It connects to Chroma through `ChromaVectorStore` from [ChromaDotNet.VectorData](https://www.nuget.org/packages/ChromaDotNet.VectorData).
+This sample demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with [Chroma](https://www.trychroma.com/) as the vector store. It connects to Chroma through `ChromaVectorStore` from [CommunityToolkit.VectorData.Chroma](https://www.nuget.org/packages/CommunityToolkit.VectorData.Chroma).
The documents are stored by the `TextSearchStore` from the [Agent Framework sample](https://github.com/microsoft/agent-framework/tree/main/dotnet/samples/02-agents/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG), copied here unchanged. It is a sample store implementation that hardcodes a storage schema. It writes and reads the records as dictionaries.
## Prerequisites
diff --git a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama.csproj b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama.csproj
index 22f28f7..215b70f 100644
--- a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama.csproj
+++ b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/Program.cs b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/Program.cs
index e1a9470..641e79b 100644
--- a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/Program.cs
+++ b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/Program.cs
@@ -6,7 +6,7 @@
// The TextSearchStore is a sample store implementation that hardcodes a storage schema and uses the vector store to store and retrieve documents.
using ChromaDB.Client;
-using ChromaDB.VectorData;
+using CommunityToolkit.VectorData.Chroma;
using Microsoft.Agents.AI;
using Microsoft.Agents.AI.Samples;
using Microsoft.Extensions.AI;
diff --git a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/README.md b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/README.md
index 8ac5443..b5006a6 100644
--- a/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/README.md
+++ b/samples/AgentWithRAG_Step07_ChromaBasicTextRAG_Ollama/README.md
@@ -2,7 +2,7 @@
This sample is [RAG with Chroma and the TextSearchStore](../AgentWithRAG_Step07_ChromaBasicTextRAG/) with models that run locally in [Ollama](https://ollama.com/) instead of Microsoft Foundry.
-It demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with [Chroma](https://www.trychroma.com/) as the vector store. It connects to Chroma through `ChromaVectorStore` from [ChromaDotNet.VectorData](https://www.nuget.org/packages/ChromaDotNet.VectorData).
+It demonstrates how to create and run an agent that uses Retrieval Augmented Generation (RAG) with [Chroma](https://www.trychroma.com/) as the vector store. It connects to Chroma through `ChromaVectorStore` from [CommunityToolkit.VectorData.Chroma](https://www.nuget.org/packages/CommunityToolkit.VectorData.Chroma).
The documents are stored by the `TextSearchStore` from that sample.
## Prerequisites
diff --git a/test/ChromaDB.AgentFramework.Sample.Tests/BasicTextRagTests.cs b/test/ChromaDB.AgentFramework.Sample.Tests/BasicTextRagTests.cs
index 85a70a0..8649f1a 100644
--- a/test/ChromaDB.AgentFramework.Sample.Tests/BasicTextRagTests.cs
+++ b/test/ChromaDB.AgentFramework.Sample.Tests/BasicTextRagTests.cs
@@ -1,5 +1,5 @@
using ChromaDB.Client;
-using ChromaDB.VectorData;
+using CommunityToolkit.VectorData.Chroma;
using Microsoft.Agents.AI;
using Microsoft.Agents.AI.Samples;
using Microsoft.Extensions.AI;
diff --git a/test/ChromaDB.AgentFramework.Sample.Tests/ChromaDB.AgentFramework.Sample.Tests.csproj b/test/ChromaDB.AgentFramework.Sample.Tests/ChromaDB.AgentFramework.Sample.Tests.csproj
index 29b894c..a4e1500 100644
--- a/test/ChromaDB.AgentFramework.Sample.Tests/ChromaDB.AgentFramework.Sample.Tests.csproj
+++ b/test/ChromaDB.AgentFramework.Sample.Tests/ChromaDB.AgentFramework.Sample.Tests.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/test/ChromaDB.AgentFramework.Sample.Tests/ChromaFixture.cs b/test/ChromaDB.AgentFramework.Sample.Tests/ChromaFixture.cs
index 2846304..23e389d 100644
--- a/test/ChromaDB.AgentFramework.Sample.Tests/ChromaFixture.cs
+++ b/test/ChromaDB.AgentFramework.Sample.Tests/ChromaFixture.cs
@@ -1,5 +1,5 @@
using ChromaDB.Client;
-using ChromaDB.VectorData;
+using CommunityToolkit.VectorData.Chroma;
using Testcontainers.Chroma;
namespace ChromaDB.AgentFramework.Sample.Tests;