diff --git a/Makefile b/Makefile
index 0a8dbed..f0d5e7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# Makefile for source rpm: e-smith-ibays
+# Makefile for source rpm: smeserver-ibays
 # $Id: Makefile,v 1.1 2016/02/05 22:53:13 stephdl Exp $
-NAME := e-smith-ibays
+NAME := smeserver-ibays
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
diff --git a/README.md b/README.md
index ef1c375..7f7267d 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-ibays
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-ibays
 
-SMEServer Koozali developed git repo for e-smith-ibays smeserver
+SMEServer Koozali developed git repo for smeserver-ibays smeserver
 
 ## Wiki
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-ibays&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-ibays&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-ibays) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-ibays&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-iBays is a powerful and versatile software package developed by e-smith. It provides users with the ability to easily create and manage virtual file systems on their Linux-based systems. This allows users to securely store their data and files in a virtual environment with a high degree of control. The software is easy to use and allows users to manage their files and data using a simple, intuitive web based interface. E-Smith-iBays also offers advanced features such as backup and restore, encryption, and access control for users. Additionally, the software provides an extensive library of plugins which can be used to customize the system to the user's needs. Overall, E-Smith-iBays is a great choice for users looking for a reliable and secure file system management solution.
+E-Smith-iBays is a powerful and versatile software package developed by smeserver. It provides users with the ability to easily create and manage virtual file systems on their Linux-based systems. This allows users to securely store their data and files in a virtual environment with a high degree of control. The software is easy to use and allows users to manage their files and data using a simple, intuitive web based interface. E-Smith-iBays also offers advanced features such as backup and restore, encryption, and access control for users. Additionally, the software provides an extensive library of plugins which can be used to customize the system to the user's needs. Overall, E-Smith-iBays is a great choice for users looking for a reliable and secure file system management solution.
diff --git a/e-smith-ibays.spec b/smeserver-ibays.spec
similarity index 98%
rename from e-smith-ibays.spec
rename to smeserver-ibays.spec
index 5e4bf57..8c1e8eb 100644
--- a/e-smith-ibays.spec
+++ b/smeserver-ibays.spec
@@ -1,10 +1,10 @@
 # $Id: e-smith-ibays.spec,v 1.21 2022/05/27 02:02:31 jpp Exp $
 
-Summary: e-smith server and gateway - ibays module
-%define name e-smith-ibays
+Summary: smeserver server and gateway - ibays module
+%define name smeserver-ibays
 Name: %{name}
 %define version 2.6.0
-%define release 20
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -23,10 +23,14 @@ BuildRequires: e-smith-devtools >= 1.11.0-03
 AutoReqProv: no
 
 
+Provides: e-smith-ibays
 %description
-e-smith server and gateway software - ibays module.
+smeserver server and gateway software - ibays module.
 
 %changelog
+* Mon Mar 11 2024 rename-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 2.6.0-21.sme
+- Rename to smeserver-ibays [SME: 12359]
+
 * Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.6.0-20.sme
 - Roll up patches and move to git repo [SME: 12338]