diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index d356f212b2..371dbbab8b 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -287,14 +287,14 @@
   <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-TextRag/">
     <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-TextRag/HostedTextRag.csproj" />
   </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/HostedWorkflows.csproj" />
+  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/">
+    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/HostedWorkflowSimple.csproj" />
   </Folder>
   <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Using-Samples/">
     <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Using-Samples/SimpleAgent/SimpleAgent.csproj" />
   </Folder>
-  <Folder Name="/Samples/04-hosting/FoundryResponsesHosting/">
-    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/HostedWorkflowHandoff.csproj" />
+  <Folder Name="/Samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/">
+    <Project Path="samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/HostedWorkflowHandoff.csproj" />
   </Folder>
   <Folder Name="/Samples/04-hosting/DurableAgents/" />
   <Folder Name="/Samples/04-hosting/DurableAgents/AzureFunctions/">
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/.env.example b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/.env.example
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/.env.example
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/.env.example
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/HostedWorkflowHandoff.csproj b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/HostedWorkflowHandoff.csproj
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/HostedWorkflowHandoff.csproj
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/HostedWorkflowHandoff.csproj
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/Pages.cs b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/Pages.cs
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/Pages.cs
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/Pages.cs
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/Program.cs b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/Program.cs
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/Program.cs
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/Program.cs
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/ResponseStreamValidator.cs b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/ResponseStreamValidator.cs
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-WorkflowHandoff/ResponseStreamValidator.cs
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Handoff/ResponseStreamValidator.cs
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/.env.example b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/.env.example
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/.env.example
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/.env.example
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/Dockerfile b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/Dockerfile
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/Dockerfile
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/Dockerfile
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/Dockerfile.contributor b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/Dockerfile.contributor
similarity index 72%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/Dockerfile.contributor
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/Dockerfile.contributor
index b8dae44c2b..17a924237f 100644
--- a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/Dockerfile.contributor
+++ b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/Dockerfile.contributor
@@ -5,8 +5,8 @@
 # Pre-publish the app targeting the container runtime and copy the output:
 #
 #   dotnet publish -c Debug -f net10.0 -r linux-musl-x64 --self-contained false -o out
-#   docker build -f Dockerfile.contributor -t hosted-workflows .
-#   docker run --rm -p 8088:8088 -e AGENT_NAME=hosted-workflows -e AZURE_BEARER_TOKEN=$AZURE_BEARER_TOKEN --env-file .env hosted-workflows
+#   docker build -f Dockerfile.contributor -t hosted-workflow-simple .
+#   docker run --rm -p 8088:8088 -e AGENT_NAME=hosted-workflow-simple -e AZURE_BEARER_TOKEN=$AZURE_BEARER_TOKEN --env-file .env hosted-workflow-simple
 #
 # For end-users consuming the NuGet package (not ProjectReference), use the standard
 # Dockerfile which performs a full dotnet restore + publish inside the container.
@@ -15,4 +15,4 @@ WORKDIR /app
 COPY out/ .
 EXPOSE 8088
 ENV ASPNETCORE_URLS=http://+:8088
-ENTRYPOINT ["dotnet", "HostedWorkflows.dll"]
+ENTRYPOINT ["dotnet", "HostedWorkflowSimple.dll"]
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/HostedWorkflows.csproj b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/HostedWorkflowSimple.csproj
similarity index 92%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/HostedWorkflows.csproj
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/HostedWorkflowSimple.csproj
index 2f210a18d8..a5460564a9 100644
--- a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/HostedWorkflows.csproj
+++ b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/HostedWorkflowSimple.csproj
@@ -5,8 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-    <RootNamespace>HostedWorkflows</RootNamespace>
-    <AssemblyName>HostedWorkflows</AssemblyName>
+    <RootNamespace>HostedWorkflowSimple</RootNamespace>
+    <AssemblyName>HostedWorkflowSimple</AssemblyName>
     <NoWarn>$(NoWarn);</NoWarn>
   </PropertyGroup>
 
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/Program.cs b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/Program.cs
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/Program.cs
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/Program.cs
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/README.md b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/README.md
similarity index 91%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/README.md
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/README.md
index 2a669b7957..7312df31de 100644
--- a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/README.md
+++ b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/README.md
@@ -1,4 +1,4 @@
-# Hosted-Workflows
+# Hosted-Workflow-Simple
 
 A hosted agent that demonstrates **multi-agent workflow orchestration**. Three translation agents are composed into a sequential pipeline: English → French → Spanish → English, showing how agents can be chained as workflow executors using `WorkflowBuilder`.
 
@@ -30,7 +30,7 @@ AZURE_AI_MODEL_DEPLOYMENT_NAME=gpt-4o
 ## Running directly (contributors)
 
 ```bash
-cd dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows
+cd dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple
 AGENT_NAME=hosted-workflows dotnet run
 ```
 
@@ -49,7 +49,7 @@ Or with curl:
 ```bash
 curl -X POST http://localhost:8088/responses \
   -H "Content-Type: application/json" \
-  -d '{"input": "The quick brown fox jumps over the lazy dog", "model": "hosted-workflows"}'
+  -d '{"input": "The quick brown fox jumps over the lazy dog", "model": "hosted-workflow-simple"}'
 ```
 
 The text will be translated through the chain: English → French → Spanish → English.
@@ -65,7 +65,7 @@ dotnet publish -c Debug -f net10.0 -r linux-musl-x64 --self-contained false -o o
 ### 2. Build the Docker image
 
 ```bash
-docker build -f Dockerfile.contributor -t hosted-workflows .
+docker build -f Dockerfile.contributor -t hosted-workflow-simple .
 ```
 
 ### 3. Run the container
@@ -74,7 +74,7 @@ docker build -f Dockerfile.contributor -t hosted-workflows .
 export AZURE_BEARER_TOKEN=$(az account get-access-token --resource https://ai.azure.com --query accessToken -o tsv)
 
 docker run --rm -p 8088:8088 \
-  -e AGENT_NAME=hosted-workflows \
+  -e AGENT_NAME=hosted-workflow-simple \
   -e AZURE_BEARER_TOKEN=$AZURE_BEARER_TOKEN \
   --env-file .env \
   hosted-workflows
@@ -106,4 +106,4 @@ Each agent in the chain receives the output of the previous agent. The final res
 
 ## NuGet package users
 
-Use the standard `Dockerfile` instead of `Dockerfile.contributor`. See the commented section in `HostedWorkflows.csproj` for the `PackageReference` alternative.
+Use the standard `Dockerfile` instead of `Dockerfile.contributor`. See the commented section in `HostedWorkflowSimple.csproj` for the `PackageReference` alternative.
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/agent.manifest.yaml b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/agent.manifest.yaml
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/agent.manifest.yaml
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/agent.manifest.yaml
diff --git a/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/agent.yaml b/dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/agent.yaml
similarity index 100%
rename from dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflows/agent.yaml
rename to dotnet/samples/04-hosting/FoundryHostedAgents/responses/Hosted-Workflow-Simple/agent.yaml