diff --git a/rename-e-smith-pkg.sh b/rename-e-smith-pkg.sh
index 27cdb64..498a708 100644
--- a/rename-e-smith-pkg.sh
+++ b/rename-e-smith-pkg.sh
@@ -229,7 +229,7 @@ mv "$SOURCEPKG.spec" "$TARGETPKG.spec"
 #Update smeserver-<pkg>.spec
 # - change name to smeserver-<pkg> (%define name)
 
-sed -i "s/^%define name */%define name $TARGETPKG/" "$TARGETPKG.spec"
+sed -i "s/^%define name.*$SOURCEPKG/%define name $TARGETPKG/" "$TARGETPKG.spec"
 
 # - change all Requires: and BuildRequires: e-smith* to smeserver*
 sed -i 's/^Requires:.*e-smith/Requires: smeserver/g' "$TARGETPKG.spec"
@@ -239,7 +239,7 @@ sed -i 's/^BuildRequires:.*e-smith/BuildRequires: smeserver/g' "$TARGETPKG.spec"
 # Bump the release and add changelog
 change-log "$TARGETPKG.spec"
 # and edit in the reason and add by whom
-sed -i "s/fix \[SME: \]/Rename to smeserver-$TARGETPKG \[SME: 12359\]/" "$TARGETPKG.spec"
+sed -i "s/fix \[SME: \]/Rename to $TARGETPKG \[SME: 12359\]/" "$TARGETPKG.spec"
 sed -i 's/ME MYSELF <myemail@koozali.org>/rename-e-smith-pkg.sh aka Trevor Batley <trevor@batley.id.au>/' "$TARGETPKG.spec"
 
 # - add PROVIDES: smeserver-<pkg>
@@ -259,6 +259,6 @@ if [ !e archivefilename ] ; then rm archivefilename ; fi
 # - if there is an e-smith-<pkg>-update event rename to smeserver-<pkg>-update and add symlink
 
 git commit -m "rename-e-smith-pkg script (#12359)"
-pit push origin master
+git push origin master
 
 #Convert repository to a Regular Repository (rather than fork)