diff --git a/Makefile b/Makefile
index ce88370..815a979 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# Makefile for source rpm: e-smith-base
+# Makefile for source rpm: smeserver-base
 # $Id: Makefile,v 1.1 2016/02/04 23:18:11 vip-ire Exp $
-NAME := e-smith-base
+NAME := smeserver-base
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
diff --git a/README.md b/README.md
index 649d1ff..f07f9d2 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-base
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-base
 
-SMEServer Koozali developed git repo for e-smith-base smeserver
+SMEServer Koozali developed git repo for smeserver-base smeserver
 
 ## Wiki
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-base&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-base&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-base) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-base&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-base.spec b/smeserver-base.spec
similarity index 99%
rename from e-smith-base.spec
rename to smeserver-base.spec
index bcddc0e..55afd60 100644
--- a/e-smith-base.spec
+++ b/smeserver-base.spec
@@ -1,10 +1,10 @@
 # $Id: e-smith-base.spec,v 1.153 2023/08/14 18:55:09 jpp Exp $
 
-Summary: e-smith server and gateway - base module
-%define name e-smith-base
+Summary: smeserver server and gateway - base module
+%define name smeserver-base
 Name: %{name}
 %define version 5.8.1
-%define release 30
+%define release 31
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -66,8 +66,9 @@ Requires: gdisk
 %define dbfiles accounts configuration domains hosts networks
 AutoReqProv: no
 
+Provides: e-smith-base
 %description
-e-smith server and gateway software - base module.
+smeserver server and gateway software - base module.
 
 %prep
 %setup
@@ -179,6 +180,9 @@ fi
 
 
 %changelog
+* Mon Mar 11 2024 rename-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 5.8.1-31.sme
+- Rename to smeserver-base [SME: 12359]
+
 * Thu Oct 26 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 5.8.1-30.sme
 - Roll up patches and move to git repo [SME: 12338]