diff --git a/.gitignore b/.gitignore
index 780815a..ca04d13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ modified_src/
 application_generated_data_files/
 reports/
 *.pyc
-/sPyNNaker8NewModelTemplate.egg-info/
+/sPyNNakerNewModelTemplate.egg-info/
 __pycache__
 .pytest_cache
 .settings/
diff --git a/.ratexcludes b/.ratexcludes
index 7256fc1..76acdf5 100644
--- a/.ratexcludes
+++ b/.ratexcludes
@@ -14,7 +14,7 @@
 **/*.elf
 **/IntroLab/**
 **/PACMAN/**
-**/PyNN8Examples/**
+**/PyNNExamples/**
 **/spalloc/**
 **/spinnaker_tools/**
 **/SpiNNFrontEndCommon/**
diff --git a/CITATION.cff b/CITATION.cff
index 941bd6e..db37f39 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -90,7 +90,7 @@ title: Support for adding new neuron models to the PyNN 0.8 and PyNN0.9 Implemen
   for executing on SpiNNaker machines.
 authors:
     - name: SpiNNaker Software Team
-      alias: For a list of contributors see https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate/graphs/contributors or for a combined list see https://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors
+      alias: For a list of contributors see https://github.com/SpiNNakerManchester/sPyNNakerNewModelTemplate/graphs/contributors or for a combined list see https://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors
       address: University of Manchester, Oxford Road
       city: Manchester
       country: GB
@@ -106,4 +106,4 @@ contact:
   name: SpiNNaker Software Team
   post-code: M13 9PL
 license: Apache-2.0
-repository: https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate
+repository: https://github.com/SpiNNakerManchester/sPyNNakerNewModelTemplate
diff --git a/LICENSE_POLICY.md b/LICENSE_POLICY.md
index 61360c3..5d73f1f 100644
--- a/LICENSE_POLICY.md
+++ b/LICENSE_POLICY.md
@@ -17,7 +17,7 @@ See: [here](https://spinnakermanchester.github.io/latest/LicenseAgreement.html#m
 
 For up to date information on Contributors see the graphs/contributors pages on each project.
 
-For example [https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate/graphs/contributors](https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate/graphs/contributors)
+For example [https://github.com/SpiNNakerManchester/sPyNNakerNewModelTemplate/graphs/contributors](https://github.com/SpiNNakerManchester/sPyNNakerNewModelTemplate/graphs/contributors)
 
 [Combined list](https://spinnakermanchester.github.io/latest/LicenseAgreement.html#contributors)
 
diff --git a/README.md b/README.md
index f0970d8..c98d13d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![Python Build Status](https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate/workflows/Python%20Actions/badge.svg?branch=master)](https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate/actions?query=workflow%3A%22Python+Actions%22+branch%3Amaster)
-[![C Build Status](https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate/workflows/C%20Actions/badge.svg?branch=master)](https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate/actions?query=workflow%3A%22C+Actions%22+branch%3Amaster)-
+[![Python Build Status](https://github.com/SpiNNakerManchester/sPyNNakerNewModelTemplate/workflows/Python%20Actions/badge.svg?branch=master)](https://github.com/SpiNNakerManchester/sPyNNakerNewModelTemplate/actions?query=workflow%3A%22Python+Actions%22+branch%3Amaster)
+[![C Build Status](https://github.com/SpiNNakerManchester/sPyNNakerNewModelTemplate/workflows/C%20Actions/badge.svg?branch=master)](https://github.com/SpiNNakerManchester/sPyNNakerNewModelTemplate/actions?query=workflow%3A%22C+Actions%22+branch%3Amaster)-
 
 # sPyNNaker New Model Template
 
diff --git a/c_models/makefiles/Makefile.common b/c_models/makefiles/Makefile.common
index 9f12e6d..d1243c2 100644
--- a/c_models/makefiles/Makefile.common
+++ b/c_models/makefiles/Makefile.common
@@ -1,4 +1,4 @@
 # THIS FILE WAS USED IN AN OLDER MAKE STYLE
 # Make now has to convert c files before building
 # SEE https://spinnakermanchester.github.io/latest/Makefiles.html
-$(error inclusion of sPyNNaker8NewModelTemplate/c_models/makefiles/Makefile.common)
+$(error inclusion of sPyNNakerNewModelTemplate/c_models/makefiles/Makefile.common)
diff --git a/setup.cfg b/setup.cfg
index f974ccf..24ad153 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 [metadata]
-name = sPyNNaker8NewModelTemplate
+name = sPyNNakerNewModelTemplate
 version = attr: python_models8._version.__version__
 description = SpiNNaker Template for New Models
 long_description = file: README.md
diff --git a/setup.py b/setup.py
index 74a91dc..eed99f3 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
         if os.path.isdir(build_dir):
             shutil.rmtree(build_dir)
         egg_dir = os.path.join(
-            this_dir, "sPyNNaker8NewModelTemplate.egg-info")
+            this_dir, "sPyNNakerNewModelTemplate.egg-info")
         if os.path.isdir(egg_dir):
             shutil.rmtree(egg_dir)
     setup()