diff --git a/README.md b/README.md
index 88bb58a..b56ae4d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## Todo application with ASP.NET Core
 
-[![CI](https://github.com/davidfowl/TodoApi/actions/workflows/ci.yaml/badge.svg)](https://github.com/davidfowl/TodoApi/actions/workflows/ci.yaml)
+[![CI](https://github.com/davidfowl/TodoApp/actions/workflows/ci.yaml/badge.svg)](https://github.com/davidfowl/TodoApi/actions/workflows/ci.yaml)
 
 This is a Todo application that features:
 - [**Todo.Web**](Todo.Web) - An ASP.NET Core hosted Blazor WASM front end application
@@ -32,7 +32,7 @@ It showcases:
 
 ### Running the application
 
-To run the application, run the [TodoApi.AppHost](TodoApi.AppHost) project. This uses .NET Aspire to run both the [Todo.Web/Server](Todo.Web/Server) and [TodoApi](TodoApi).
+To run the application, run the [TodoApp.AppHost](TodoApp.AppHost) project. This uses .NET Aspire to run both the [Todo.Web/Server](Todo.Web/Server) and [Todo.Api](Todo.Api).
 
 ## Optional
 
@@ -131,5 +131,5 @@ Learn more about the Auth0 .NET SDK [here](https://github.com/auth0/auth0-aspnet
 
 ### OpenTelemetry
 
-TodoApi uses OpenTelemetry to collect logs, metrics and spans. You can see this
+This app uses OpenTelemetry to collect logs, metrics and spans. You can see this
 using the [Aspire Dashboard](https://aspiredashboard.com/).
diff --git a/Todo.Api/Todo.Api.csproj b/Todo.Api/Todo.Api.csproj
index 9e77805..c284e5a 100644
--- a/Todo.Api/Todo.Api.csproj
+++ b/Todo.Api/Todo.Api.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TodoApi.ServiceDefaults\TodoApi.ServiceDefaults.csproj" />
+    <ProjectReference Include="..\TodoApp.ServiceDefaults\TodoApp.ServiceDefaults.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Todo.Web/Server/Todo.Web.Server.csproj b/Todo.Web/Server/Todo.Web.Server.csproj
index 7ba10bd..d31a15d 100644
--- a/Todo.Web/Server/Todo.Web.Server.csproj
+++ b/Todo.Web/Server/Todo.Web.Server.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\TodoApi.ServiceDefaults\TodoApi.ServiceDefaults.csproj" />
+    <ProjectReference Include="..\..\TodoApp.ServiceDefaults\TodoApp.ServiceDefaults.csproj" />
     <ProjectReference Include="..\Client\Todo.Web.Client.csproj" />
     <ProjectReference Include="..\Shared\Todo.Web.Shared.csproj" />
   </ItemGroup>
diff --git a/TodoApi.AppHost/Extensions.cs b/TodoApp.AppHost/Extensions.cs
similarity index 100%
rename from TodoApi.AppHost/Extensions.cs
rename to TodoApp.AppHost/Extensions.cs
diff --git a/TodoApi.AppHost/Program.cs b/TodoApp.AppHost/Program.cs
similarity index 100%
rename from TodoApi.AppHost/Program.cs
rename to TodoApp.AppHost/Program.cs
diff --git a/TodoApi.AppHost/Properties/launchSettings.json b/TodoApp.AppHost/Properties/launchSettings.json
similarity index 100%
rename from TodoApi.AppHost/Properties/launchSettings.json
rename to TodoApp.AppHost/Properties/launchSettings.json
diff --git a/TodoApi.AppHost/TodoApi.AppHost.csproj b/TodoApp.AppHost/TodoApp.AppHost.csproj
similarity index 100%
rename from TodoApi.AppHost/TodoApi.AppHost.csproj
rename to TodoApp.AppHost/TodoApp.AppHost.csproj
diff --git a/TodoApi.AppHost/appsettings.Development.json b/TodoApp.AppHost/appsettings.Development.json
similarity index 100%
rename from TodoApi.AppHost/appsettings.Development.json
rename to TodoApp.AppHost/appsettings.Development.json
diff --git a/TodoApi.AppHost/appsettings.json b/TodoApp.AppHost/appsettings.json
similarity index 100%
rename from TodoApi.AppHost/appsettings.json
rename to TodoApp.AppHost/appsettings.json
diff --git a/TodoApi.ServiceDefaults/Extensions.cs b/TodoApp.ServiceDefaults/Extensions.cs
similarity index 100%
rename from TodoApi.ServiceDefaults/Extensions.cs
rename to TodoApp.ServiceDefaults/Extensions.cs
diff --git a/TodoApi.ServiceDefaults/TodoApi.ServiceDefaults.csproj b/TodoApp.ServiceDefaults/TodoApp.ServiceDefaults.csproj
similarity index 100%
rename from TodoApi.ServiceDefaults/TodoApi.ServiceDefaults.csproj
rename to TodoApp.ServiceDefaults/TodoApp.ServiceDefaults.csproj
diff --git a/TodoApi.sln b/TodoApp.sln
similarity index 95%
rename from TodoApi.sln
rename to TodoApp.sln
index c7c19c9..7d35db8 100644
--- a/TodoApi.sln
+++ b/TodoApp.sln
@@ -22,9 +22,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Todo.Web.Client", "Todo.Web
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Todo.Web.Shared", "Todo.Web\Shared\Todo.Web.Shared.csproj", "{272942F6-94E8-4D6B-8AD8-C4CCA305836D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApi.AppHost", "TodoApi.AppHost\TodoApi.AppHost.csproj", "{4ECB456A-BC4A-4F99-A1D5-FE2DF1C4EA1D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApp.AppHost", "TodoApp.AppHost\TodoApp.AppHost.csproj", "{4ECB456A-BC4A-4F99-A1D5-FE2DF1C4EA1D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApi.ServiceDefaults", "TodoApi.ServiceDefaults\TodoApi.ServiceDefaults.csproj", "{67B571B3-F4FB-46AA-888E-17A5A773610C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApp.ServiceDefaults", "TodoApp.ServiceDefaults\TodoApp.ServiceDefaults.csproj", "{67B571B3-F4FB-46AA-888E-17A5A773610C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject