diff --git a/.cake-scripts/parameters.cake b/.cake-scripts/parameters.cake
index 978e9a6c4..60c0cf092 100644
--- a/.cake-scripts/parameters.cake
+++ b/.cake-scripts/parameters.cake
@@ -32,7 +32,7 @@ internal sealed class BuildParameters
   public static BuildParameters Instance(ICakeContext context)
   {
     const string propertiesFilePath = "Directory.Build.props";
-    const string solutionFilePath = "DotNet.Testcontainers.sln";
+    const string solutionFilePath = "Testcontainers.sln";
 
     var buildInformation = BuildInformation.Instance(context, propertiesFilePath);
 
diff --git a/.cake-scripts/projects.cake b/.cake-scripts/projects.cake
index 12ebccea8..a9b3e4216 100644
--- a/.cake-scripts/projects.cake
+++ b/.cake-scripts/projects.cake
@@ -18,7 +18,7 @@ internal sealed class BuildProjects
       All = allProjects,
       NoneTests = allProjects.Where(project => !project.Name.EndsWith("Tests")).ToList(),
       OnlyTests = allProjects.Where(project => project.Name.EndsWith("Tests")).ToList(),
-      Testcontainers = allProjects.Single(project => "DotNet.Testcontainers".Equals(project.Name))
+      Testcontainers = allProjects.Single(project => "Testcontainers".Equals(project.Name))
     };
   }
 }
diff --git a/.editorconfig b/.editorconfig
index 19e609103..d6a6d46b5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -467,8 +467,8 @@ resharper_arrange_object_creation_when_type_evident_highlighting = do_not_show
 resharper_convert_to_using_declaration_highlighting = do_not_show
 
 ##########################################
-# DotNet.Testcontainers.Tests
+# Testcontainers.Tests
 ##########################################
 
-[tests/DotNet.Testcontainers.Tests/**/*.cs]
+[tests/Testcontainers.Tests/**/*.cs]
 dotnet_code_quality.CA1711.allowed_suffixes = Exception
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 271ba631a..34f822f91 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-You are thinking about contributing to .NET Testcontainers? Awesome, it’s absolutely appreciated. When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the owners of this repository before making a change. Or pick an already existing issue.
+You are thinking about contributing to Testcontainers? Awesome, it’s absolutely appreciated. When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the owners of this repository before making a change. Or pick an already existing issue.
 
 ## Guidelines
 
@@ -8,7 +8,7 @@ You are thinking about contributing to .NET Testcontainers? Awesome, it’s abso
 
 To build the project just run the provided Cake script, `dotnet cake --target=Build`.
 
-1. Fork the .NET Testcontainers repository.
+1. Fork the Testcontainers repository.
 2. Create a branch to work with and use `feature/` or `bugfix/` as a prefix.
 3. Do not forget the unit tests and keep the SonarCloud statistics in mind.
 4. If you are finished rebase and create a pull request.
diff --git a/Directory.Build.props b/Directory.Build.props
index e23774c23..41962ed08 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <SolutionDir Condition=" '$(SolutionDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), DotNet.Testcontainers.sln))/</SolutionDir>
+    <SolutionDir Condition=" '$(SolutionDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), Testcontainers.sln))/</SolutionDir>
     <BuildDir>$(SolutionDir)build/</BuildDir>
     <BaseIntermediateOutputPath>$(BuildDir)obj/$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
@@ -14,19 +14,19 @@
     <Version>1.7.0</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
-    <Product>.NET Testcontainers</Product>
+    <Product>Testcontainers</Product>
     <Copyright>Copyright (c) 2019 - 2021 Andre Hofmeister and other authors</Copyright>
     <Authors>Andre Hofmeister and contributors</Authors>
     <Company>Andre Hofmeister</Company>
     <Description>A lightweight library to run tests with throwaway instances of Docker containers.</Description>
-    <Summary>.NET Testcontainers makes it easy to run tests with Docker containers. Create reliable and fast environments within seconds and throw them away if not needed anymore.</Summary>
+    <Summary>Testcontainers makes it easy to run tests with Docker containers. Create reliable and fast environments within seconds and throw them away if not needed anymore.</Summary>
     <PackageIcon>Logo.png</PackageIcon>
-    <PackageIconUrl>https://github.com/HofmeisterAn/dotnet-testcontainers/raw/develop/docs/Logo.png</PackageIconUrl>
+    <PackageIconUrl>https://github.com/testcontainers/testcontainers-dotnet/raw/develop/docs/Logo.png</PackageIconUrl>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageProjectUrl>https://github.com/HofmeisterAn/dotnet-testcontainers</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/testcontainers/testcontainers-dotnet</PackageProjectUrl>
     <PackageTags>.NET;Docker;Container;Test</PackageTags>
     <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/HofmeisterAn/dotnet-testcontainers</RepositoryUrl>
+    <RepositoryUrl>https://github.com/testcontainers/testcontainers-dotnet</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -40,7 +40,7 @@
   </ItemGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>DotNet.Testcontainers.Tests</_Parameter1>
+      <_Parameter1>Testcontainers.Tests</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
index a5eba2824..da57813ee 100755
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ To configure a container, use the `TestcontainersBuilder<TestcontainersContainer
 - `WithName` sets the container name e.g. `--name nginx`.
 - `WithHostname` sets the container hostname e.g. `--hostname my-nginx`.
 - `WithEnvironment` sets an environment variable in the container e.g. `-e, --env "test=containers"`.
-- `WithLabel` applies metadata to the container e.g. `-l, --label dotnet.testcontainers=awesome`.
+- `WithLabel` applies metadata to the container e.g. `-l, --label testcontainers=awesome`.
 - `WithExposedPort` exposes a port inside the container e.g. `--expose=80`.
 - `WithPortBinding` publishes the container port to the host e.g. `-p, --publish 80:80`.
 - `WithBindMount` binds a path of a file or directory into the container e.g. `-v, --volume .:/tmp`.
@@ -172,8 +172,8 @@ Many thanks to [JetBrains](https://www.jetbrains.com/?from=testcontainers-dotnet
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
 
-[1]: https://github.com/testcontainers/testcontainers-dotnet/blob/develop/tests/DotNet.Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerTest.cs
-[2]: https://github.com/testcontainers/testcontainers-dotnet/blob/develop/tests/DotNet.Testcontainers.Tests/Unit/Containers/Unix/Modules/Databases
-[3]: https://github.com/testcontainers/testcontainers-dotnet/blob/develop/tests/DotNet.Testcontainers.Tests/Unit/Containers/Unix/Modules/MessageBrokers
+[1]: https://github.com/testcontainers/testcontainers-dotnet/blob/develop/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerTest.cs
+[2]: https://github.com/testcontainers/testcontainers-dotnet/blob/develop/tests/Testcontainers.Tests/Unit/Containers/Unix/Modules/Databases
+[3]: https://github.com/testcontainers/testcontainers-dotnet/blob/develop/tests/Testcontainers.Tests/Unit/Containers/Unix/Modules/MessageBrokers
 [moby-ryuk]: https://github.com/testcontainers/moby-ryuk
 [xunit]: https://xunit.net
diff --git a/build.cake b/build.cake
index 3a3428679..21f20fe0c 100644
--- a/build.cake
+++ b/build.cake
@@ -17,7 +17,7 @@ Setup(context =>
     toClean.Add("build");
   }
 
-  Information("Building version {0} of .NET Testcontainers ({1}@{2})", param.Version, param.Branch, param.Sha);
+  Information("Building version {0} of Testcontainers ({1}@{2})", param.Version, param.Branch, param.Sha);
 });
 
 Teardown(context =>
@@ -110,7 +110,7 @@ Task("Sonar-Begin")
     Version = param.Version.Substring(0, 5),
     PullRequestProvider = "GitHub",
     PullRequestGithubEndpoint = "https://api.github.com/",
-    PullRequestGithubRepository = "HofmeisterAn/dotnet-testcontainers",
+    PullRequestGithubRepository = "testcontainers/testcontainers-dotnet",
     PullRequestKey = param.IsPullRequest && System.Int32.TryParse(param.PullRequestId, out var id) ? id : (int?)null,
     PullRequestBranch = param.SourceBranch,
     PullRequestBase = param.TargetBranch,