diff --git a/.github/workflows/release-changelog-template.md b/.github/workflows/release-changelog-template.md
index 9a7c8527..9ab8260c 100644
--- a/.github/workflows/release-changelog-template.md
+++ b/.github/workflows/release-changelog-template.md
@@ -19,7 +19,7 @@ check out [_Timefold Solver Enterprise Edition_](https://timefold.ai/pricing).
 
 To see Timefold Solver in action, check out [the quickstarts](https://github.com/TimefoldAI/timefold-quickstarts).
 
-Add `timefold-solver=={{projectVersion}}` to your `requirements.txt` or `pip install timefold-solver=={{projectVersion}}` file to get started.
+Add `timefold=={{projectVersion}}` to your `requirements.txt` or `pip install timefold=={{projectVersion}}` file to get started.
 
 # Additional notes
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 291e97a7..741e51af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: pypi
-      url: https://pypi.org/p/timefold-solver
+      url: https://pypi.org/p/timefold
     permissions:
       contents: write  # IMPORTANT: required for action to create release branch
       pull-requests: write # IMPORTANT: so release PR can be created
diff --git a/README.md b/README.md
index e0b88715..a984b9a6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Timefold Solver for Python
 
-[![PyPI](https://img.shields.io/pypi/v/timefold-solver?style=for-the-badge& "PyPI")](https://pypi.org/project/timefold-solver/)
+[![PyPI](https://img.shields.io/pypi/v/timefold?style=for-the-badge& "PyPI")](https://pypi.org/project/timefold/)
 [![License](https://img.shields.io/github/license/TimefoldAI/timefold-solver-python?style=for-the-badge&logo=apache)](https://www.apache.org/licenses/LICENSE-2.0)
 [![JVM support](https://img.shields.io/badge/Java-17+-brightgreen.svg?style=for-the-badge)](https://sdkman.io)
 [![Python support](https://img.shields.io/badge/Python-3.10+-brightgreen.svg?style=for-the-badge)](https://www.python.org/downloads)
diff --git a/setup.py b/setup.py
index d27e4a98..ccd897b1 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,7 @@ def find_stub_files(stub_root: str):
 timefold_solver_python_version = '999-dev0'
 
 setup(
-    name='timefold-solver',
+    name='timefold',
     version=timefold_solver_python_version,
     license='Apache License Version 2.0',
     license_file='LICENSE.txt',
diff --git a/timefold-solver-python-core/src/main/python/config/_config.py b/timefold-solver-python-core/src/main/python/config/_config.py
index a64f12d5..fa714cfb 100644
--- a/timefold-solver-python-core/src/main/python/config/_config.py
+++ b/timefold-solver-python-core/src/main/python/config/_config.py
@@ -167,10 +167,10 @@ class MoveThreadCount(Enum):
 
 class RequiresEnterpriseError(EnvironmentError):
     def __init__(self, feature):
-        super().__init__(f'Feature {feature} requires timefold-solver-enterprise to be installed. '
+        super().__init__(f'Feature {feature} requires timefold-enterprise to be installed. '
                          f'See https://docs.timefold.ai/timefold-solver/latest/enterprise-edition/'
                          f'enterprise-edition#switchToEnterpriseEdition for instructions on how to '
-                         f'install timefold-solver-enterprise.')
+                         f'install timefold-enterprise.')
 
 
 Solution_ = TypeVar('Solution_')