diff --git a/Makefile b/Makefile
index 7730843..a36f88a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# Makefile for source rpm: e-smith-formmagick
+# Makefile for source rpm: smeserver-formmagick
 # $Id: Makefile,v 1.1 2016/02/05 23:01:22 stephdl Exp $
-NAME := e-smith-formmagick
+NAME := smeserver-formmagick
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
diff --git a/README.md b/README.md
index 66e4bb2..85f8e7e 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
-# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> e-smith-formmagick
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-formmagick
 
-SMEServer Koozali developed git repo for e-smith-formmagick smeserver
+SMEServer Koozali developed git repo for smeserver-formmagick smeserver
 
 ## Wiki
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-formmagick&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
+Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-formmagick&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
+And a list of outstanding Legacy bugs: (e-smith-formmagick) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-formmagick&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
 
 ## Description
 
diff --git a/e-smith-formmagick.spec b/smeserver-formmagick.spec
similarity index 98%
rename from e-smith-formmagick.spec
rename to smeserver-formmagick.spec
index f20555d..d503528 100644
--- a/e-smith-formmagick.spec
+++ b/smeserver-formmagick.spec
@@ -1,10 +1,10 @@
 # $Id: e-smith-formmagick.spec,v 1.6 2021/04/17 02:05:55 jpp Exp $
 
-Summary: e-smith-formmagick Perl modules for web manager i18n
-%define name e-smith-formmagick
+Summary: smeserver-formmagick Perl modules for web manager i18n
+%define name smeserver-formmagick
 Name: %{name}
 %define version 2.6.0
-%define release 7
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -21,6 +21,9 @@ BuildRequires: e-smith-devtools >= 1.6.6
 BuildArchitectures: noarch
 
 %changelog
+* Mon Mar 11 2024 rename-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 2.6.0-8.sme
+- Rename to smeserver-formmagick [SME: 12359]
+
 * Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.6.0-7.sme
 - Roll up patches and move to git repo [SME: 12338]
 
@@ -535,8 +538,9 @@ BuildArchitectures: noarch
 * Mon Feb 18 2002 Kirrily Robert <skud@e-smith.com>
 - [0.1.0-01]
 - Initial release of 0.1.0.
+Provides: e-smith-formmagick
 %description
-e-smith-formmagick provides a set of Perl modules containing various 
+smeserver-formmagick provides a set of Perl modules containing various 
 convenience functions used to create SMEServer server-manager panels.
 
 %prep