diff --git a/Makefile b/Makefile
index 1352a0f..4d56876 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# Makefile for source rpm: e-smith-email
+# Makefile for source rpm: smeserver-email
 # $Id: Makefile,v 1.1 2016/02/04 23:55:00 vip-ire Exp $
-NAME := e-smith-email
+NAME := smeserver-email
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
diff --git a/README.md b/README.md
index 854146c..6e26e54 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-email
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-email
 
-SMEServer Koozali developed git repo for e-smith-email smeserver
+SMEServer Koozali developed git repo for smeserver-email smeserver
 
 ## Wiki
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-email&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-email&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-email) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-email&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
 
@@ -14,4 +15,4 @@ Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?compo
 *Once it has been checked, then this comment will be deleted*
 <br />
 
-e-smith-email is a powerful email software package that provides a comprehensive set of tools to manage email for corporate and private users. It has a powerful web-based interface for managing users, domains, and aliases. It also supports a wide range of mail protocols such as POP3, SMTP, IMAP, MIME, and SSL. It is also flexible enough to integrate with other email programs, such as Outlook and Thunderbird, making it an ideal choice for those who need a sophisticated email solution. With e-smith-email, users can easily manage, search, and organize emails in a secure and efficient manner.
+smeserver-email is a powerful email software package that provides a comprehensive set of tools to manage email for corporate and private users. It has a powerful web-based interface for managing users, domains, and aliases. It also supports a wide range of mail protocols such as POP3, SMTP, IMAP, MIME, and SSL. It is also flexible enough to integrate with other email programs, such as Outlook and Thunderbird, making it an ideal choice for those who need a sophisticated email solution. With smeserver-email, users can easily manage, search, and organize emails in a secure and efficient manner.
diff --git a/e-smith-email.spec b/smeserver-email.spec
similarity index 99%
rename from e-smith-email.spec
rename to smeserver-email.spec
index 51cfcf6..03c162d 100644
--- a/e-smith-email.spec
+++ b/smeserver-email.spec
@@ -1,10 +1,10 @@
 # $Id: e-smith-email.spec,v 1.20 2022/08/01 18:04:52 jpp Exp $
 
-Summary: e-smith server and gateway - email module
-%define name e-smith-email
+Summary: smeserver server and gateway - email module
+%define name smeserver-email
 Name: %{name}
 %define version 5.6.0
-%define release 20
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -73,10 +73,14 @@ if [ $1 -gt 1 ] ; then
   fi
 fi
 
+Provides: e-smith-email
 %description
-e-smith server and gateway software - email module.
+smeserver server and gateway software - email module.
 
 %changelog
+* Mon Mar 11 2024 rename-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 5.6.0-21.sme
+- Rename to smeserver-email [SME: 12359]
+
 * Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 5.6.0-20.sme
 - Roll up patches and move to git repo [SME: 12338]